Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keyboard] Add Quarkeys Z60, reorganized keyboard file directory #19404

Merged
merged 15 commits into from
Jan 1, 2023

Conversation

tommyamoszhao
Copy link
Contributor

@tommyamoszhao tommyamoszhao commented Dec 22, 2022

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

tommyamoszhao and others added 7 commits December 22, 2022 20:39
1. Meaningless defines deleted in config.h
2. Dead codes deleted in both defatul and via keymap.c
3. "LT()" function is deleted in keymap
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Nothing is changed except that the files been moved into 'solder' & 'hotswap' subfolders.
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Dec 22, 2022
@waffle87
Copy link
Member

Please stop closing and opening new PRs with the same content.

keyboards/quarkeys/z60/readme.md Outdated Show resolved Hide resolved
keyboards/quarkeys/z60/readme.md Outdated Show resolved Hide resolved
keyboards/quarkeys/z60/readme.md Outdated Show resolved Hide resolved
tommyamoszhao and others added 3 commits December 23, 2022 16:05
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
keyboards/quarkeys/z60/readme.md Outdated Show resolved Hide resolved
keyboards/quarkeys/z60/hotswap/Makefile Outdated Show resolved Hide resolved
keyboards/quarkeys/z60/hotswap/Makefile Outdated Show resolved Hide resolved
@tommyamoszhao
Copy link
Contributor Author

Hi I'm sorry to bother, just want to ask how do this pr work, seems everything is done according to requests, is there anything else I need to do? or just wait quietly. Normally, how long it takes to merge successfully? This is my first pr attempt, appreciate, TommyZ

@drashna drashna requested a review from a team December 31, 2022 20:42
@tzarc tzarc merged commit c7c44de into qmk:master Jan 1, 2023
jasonisgraham pushed a commit to jasonisgraham/qmk_firmware that referenced this pull request Jan 2, 2023
…#19404)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
omikronik pushed a commit to omikronik/qmk_firmware that referenced this pull request Jan 22, 2023
…#19404)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
ideas32 pushed a commit to ideas32/qmk_firmware that referenced this pull request Jan 25, 2023
…#19404)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
barrettclark added a commit to barrettclark/qmk_firmware that referenced this pull request Mar 6, 2023
* upstream/master: (1825 commits)
  A comma was missing (qmk#19507)
  Bump anothrNick/github-tag-action from 1.56.0 to 1.57.0 (qmk#19502)
  Add SapuSeven MacroPad12 (qmk#19466)
  feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (qmk#19426)
  [Keyboard] Stop LED1 from flashing on layer change (qmk#19427)
  Allow for specifying the number of symbols to output. (qmk#19497)
  Add `qmk mass-compile`, which intends to supercede `qmk multibuild` whilst providing support for filtering as per data-driven definitions. (qmk#18971)
  Bump anothrNick/github-tag-action from 1.55.0 to 1.56.0 (qmk#19494)
  Fix github URL for the atreyu maintainer. (qmk#19476)
  adpenrose/akemipad fixes (qmk#19477)
  [Keymap] Add Neo2-based keymap for Planck keyboard (qmk#19173)
  [Keyboard] Add community layout support to Piantor (qmk#19455)
  Keyboard/fix work louder micro (qmk#18968)
  Add docs to cover recent LAYOUT_all lint checks (qmk#19393)
  WSL `qmk flash firmware.bin` workaround (qmk#19434)
  CLI flashers should allow files outside qmk_firmware folder (qmk#19454)
  [Keyboard] Add Quarkeys Z60, reorganized keyboard file directory (qmk#19404)
  Add KB30 keyboard (qmk#19395)
  Atreyu rev2 (qmk#19443)
  Fixes unicode_map declaration example (qmk#19450)
  ...
jasonisgraham pushed a commit to jasonisgraham/qmk_firmware that referenced this pull request Jun 12, 2023
…#19404)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
jasonisgraham pushed a commit to jasonisgraham/qmk_firmware that referenced this pull request Jun 15, 2023
…#19404)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants