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.

Sign up for GitHub

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

Jump to bottom

[Keyboard] Add Quarkeys Z67 PCB with solder and hotswap versions #19465

Merged
merged 34 commits into from
Feb 2, 2023
Merged

[Keyboard] Add Quarkeys Z67 PCB with solder and hotswap versions #19465

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
1d596f7
[Keyboard] Add Z60 Solder
tommyamoszhao Dec 22, 2022
771c757
License update, and config.h file merged
tommyamoszhao Dec 22, 2022
dbd6e02
[Keyboard] Add Quarkeys Z67 Solder PCB
tommyamoszhao Dec 22, 2022
d49cf8c
updated as required
tommyamoszhao Dec 22, 2022
31d3e38
Update keyboards/quarkeys/z60/config.h
tommyamoszhao Dec 22, 2022
9e4a68c
Update keyboards/quarkeys/z60/config.h
tommyamoszhao Dec 22, 2022
6eb25e0
[Keyboard] Add Z60 Re-organized keyboard directory
tommyamoszhao Dec 22, 2022
5765a17
Update keyboards/quarkeys/z60/readme.md
tommyamoszhao Dec 23, 2022
0f520aa
Update keyboards/quarkeys/z60/readme.md
tommyamoszhao Dec 23, 2022
19b00a4
Update keyboards/quarkeys/z60/readme.md
tommyamoszhao Dec 23, 2022
f1511dd
Update readme.md
tommyamoszhao Dec 23, 2022
a18aa46
[Keyboard] Add Quarkeys Z60 Hotswap
tommyamoszhao Dec 23, 2022
8add7f7
Merge pull request #1 from tommyamoszhao/Add-keyboard-Z60-Hotswap
tommyamoszhao Dec 23, 2022
42514bc
'#ifdef' in Makefile is not needed
tommyamoszhao Dec 24, 2022
4f96ebf
Delete Makefile
tommyamoszhao Dec 24, 2022
16fee53
[Keyboard] Add Quarkeys Z67 Solder & Hotswap
tommyamoszhao Jan 1, 2023
37ccf10
Update readme.md
tommyamoszhao Jan 1, 2023
b5eba8d
Merge branch 'qmk:master' into master
tommyamoszhao Jan 1, 2023
143ddcd
Update keyboards/quarkeys/z67/hotswap/rules.mk
tommyamoszhao Jan 1, 2023
efa8705
Update keyboards/quarkeys/z67/hotswap/rules.mk
tommyamoszhao Jan 1, 2023
aa622cd
Update keyboards/quarkeys/z67/solder/rules.mk
tommyamoszhao Jan 1, 2023
9e9cf4e
[Keymap] keymap updated with empty layouts deleted
tommyamoszhao Jan 1, 2023
9ebe35b
Merge branch 'master' of https://github.com/tommyamoszhao/qmk_firmware
tommyamoszhao Jan 1, 2023
32861e7
Update keyboards/quarkeys/z67/hotswap/rules.mk
tommyamoszhao Jan 4, 2023
bc2be3e
Update keyboards/quarkeys/z67/readme.md
tommyamoszhao Jan 4, 2023
dbcddea
Update keyboards/quarkeys/z67/solder/rules.mk
tommyamoszhao Jan 4, 2023
ed52bca
Update keyboards/quarkeys/z67/solder/rules.mk
tommyamoszhao Jan 4, 2023
5ccf67e
Merge branch 'qmk:master' into master
tommyamoszhao Jan 15, 2023
393544a
Update keyboards/quarkeys/z67/hotswap/config.h
tommyamoszhao Jan 15, 2023
5483223
Update keyboards/quarkeys/z67/solder/rules.mk
tommyamoszhao Jan 15, 2023
e6a3c85
Update keyboards/quarkeys/z67/solder/info.json
tommyamoszhao Jan 15, 2023
9e4e13a
Update keyboards/quarkeys/z67/hotswap/info.json
tommyamoszhao Jan 15, 2023
1e88794
Update keyboards/quarkeys/z67/solder/config.h
tommyamoszhao Jan 15, 2023
5c48a1f
Update keyboards/quarkeys/z67/hotswap/rules.mk
tommyamoszhao Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update readme.md 
Image link deleted
  • Loading branch information
@tommyamoszhao
tommyamoszhao committed Dec 23, 2022
commit f1511ddd13409332419a144549012c74d5f311d3
4 changes: 1 addition & 3 deletions keyboards/quarkeys/z60/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Quarkeys Z60 Keyboard

![Z60](https://static.wixstatic.com/media/72b918_45f82258186646d4bfa57c9d73ccc9bc~mv2.jpeg)

A 60% Gasket keyboard with innovated top enclosure made by Quarkeys, second of out projects.

* Keyboard Maintainer: [Quarkeys Studio](www.quarkeys.com)
Expand All @@ -19,4 +17,4 @@ Flashing example for this keyboard:

**Bootloader:** Press the `QK_BOOT` keycode at ESC position of layer 1.

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).