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 Z67 PCB with solder and hotswap versions #19465

Merged
merged 34 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
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
updated as required
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
  • Loading branch information
tommyamoszhao committed Dec 22, 2022
commit d49cf8c7fb086570706c54810f43c9743af23d4d
13 changes: 2 additions & 11 deletions keyboards/quarkeys/z60/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
LT(3, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
LT(4, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_UP), MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), RALT_T(KC_LEFT), RGUI_T(KC_DOWN), RCTL_T(KC_RGHT)),

Expand Down Expand Up @@ -60,8 +60,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({23, 1, HSV_RED});

//const rgblight_segment_t PROGMEM my_base_layer[] = RGBLIGHT_LAYER_SEGMENTS({80, 4, HSV_CYAN});

const rgblight_segment_t PROGMEM my_ar_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({42, 2, HSV_WHITE});

const rgblight_segment_t PROGMEM my_symbol_layer[] = RGBLIGHT_LAYER_SEGMENTS({28, 2, HSV_WHITE});
Expand All @@ -70,12 +68,9 @@ const rgblight_segment_t PROGMEM my_other_layer[] = RGBLIGHT_LAYER_SEGMENTS({15,

const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
my_capslock_layer,
//my_base_layer, // Default layer
my_ar_numpad_layer, // Arrow keys & Numpad, Operator keys, reset key, RGB control and media control
my_symbol_layer, // F1-F12 keys & Symbols
my_other_layer // Self-Defined
//my_game_layer // Self-Defined hotkey or macros for a game
//my_empty_layer // Preserved layer for customization
);

void keyboard_post_init_user(void) {
Expand All @@ -87,12 +82,8 @@ bool led_update_user(led_t led_state) {
return true;
}
layer_state_t layer_state_set_user(layer_state_t state) {
// Both layers will light up if both kb layers are active
//rgblight_set_layer_state(0, layer_state_cmp(state, 0));
rgblight_set_layer_state(1, layer_state_cmp(state, 1));
rgblight_set_layer_state(2, layer_state_cmp(state, 2));
rgblight_set_layer_state(3, layer_state_cmp(state, 3));
//rgblight_set_layer_state(4, layer_state_cmp(state, 4));
//rgblight_set_layer_state(5, layer_state_cmp(state, 5));
return state;
}
18 changes: 4 additions & 14 deletions keyboards/quarkeys/z60/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* [0]
/* [0]
* ,--------------------------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | Back | Del |
* |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
Expand All @@ -31,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
LT(3, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
LT(4, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_UP), MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), RALT_T(KC_LEFT), RGUI_T(KC_DOWN), RCTL_T(KC_RGHT)),

Expand All @@ -56,12 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)

};

const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({23, 1, HSV_RED});

//const rgblight_segment_t PROGMEM my_base_layer[] = RGBLIGHT_LAYER_SEGMENTS({80, 4, HSV_CYAN});

const rgblight_segment_t PROGMEM my_ar_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({42, 2, HSV_WHITE});

const rgblight_segment_t PROGMEM my_symbol_layer[] = RGBLIGHT_LAYER_SEGMENTS({28, 2, HSV_WHITE});
Expand All @@ -70,12 +68,9 @@ const rgblight_segment_t PROGMEM my_other_layer[] = RGBLIGHT_LAYER_SEGMENTS({15,

const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
my_capslock_layer,
//my_base_layer, // Default layer
my_ar_numpad_layer, // Arrow keys & Numpad, Operator keys, reset key, RGB control and media control
my_symbol_layer, // F1-F12 keys & Symbols
my_other_layer // Self-Defined
//my_game_layer // Self-Defined hotkey or macros for a game
//my_empty_layer // Preserved layer for customization
);

void keyboard_post_init_user(void) {
Expand All @@ -87,13 +82,8 @@ bool led_update_user(led_t led_state) {
return true;
}
layer_state_t layer_state_set_user(layer_state_t state) {
// Both layers will light up if both kb layers are active
//rgblight_set_layer_state(0, layer_state_cmp(state, 0));
rgblight_set_layer_state(1, layer_state_cmp(state, 1));
rgblight_set_layer_state(2, layer_state_cmp(state, 2));
rgblight_set_layer_state(3, layer_state_cmp(state, 3));
//rgblight_set_layer_state(4, layer_state_cmp(state, 4));
//rgblight_set_layer_state(5, layer_state_cmp(state, 5));
return state;
}