From 0da085884a0458a7fe82c5b40e8b6ce61886419f Mon Sep 17 00:00:00 2001 From: kisakey-luxury Date: Fri, 6 Oct 2023 16:27:05 -0700 Subject: [PATCH 1/8] created firmware for keyboard --- keyboards/kisakeyluxury/qtz/config.h | 6 ++ keyboards/kisakeyluxury/qtz/info.json | 64 +++++++++++++++++++ .../qtz/keymaps/default/config.h | 5 ++ .../qtz/keymaps/default/keymap.c | 26 ++++++++ .../qtz/keymaps/default/readme.md | 1 + .../qtz/keymaps/default/rules.mk | 1 + keyboards/kisakeyluxury/qtz/readme.md | 15 +++++ keyboards/kisakeyluxury/qtz/rules.mk | 12 ++++ 8 files changed, 130 insertions(+) create mode 100644 keyboards/kisakeyluxury/qtz/config.h create mode 100644 keyboards/kisakeyluxury/qtz/info.json create mode 100644 keyboards/kisakeyluxury/qtz/keymaps/default/config.h create mode 100644 keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c create mode 100644 keyboards/kisakeyluxury/qtz/keymaps/default/readme.md create mode 100644 keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk create mode 100644 keyboards/kisakeyluxury/qtz/readme.md create mode 100644 keyboards/kisakeyluxury/qtz/rules.mk diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h new file mode 100644 index 000000000000..98eb2100cd63 --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/config.h @@ -0,0 +1,6 @@ +#pragma once + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json new file mode 100644 index 000000000000..8c4e3e2f9a8c --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/info.json @@ -0,0 +1,64 @@ +{ + "keyboard_name": "fraserqaz", + "manufacturer": "iceage", + "maintainer": "kisakey-luxury", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D5", "D4", "D6", "C6"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT_default": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3}, + {"matrix": [3, 5], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + ] + } + } +} \ No newline at end of file diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h new file mode 100644 index 000000000000..4e92aadf6458 --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef COMBO_ENABLE +# define COMBO_TERM 200 +#endif diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c new file mode 100644 index 000000000000..fd3e72803ec2 --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +#include QMK_KEYBOARD_H + +enum layers{ + _BASE +}; + +enum combo_events { + COMBO_ESC +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_default( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_1, KC_2, KC_3, KC_4, KC_SPACE, KC_4, KC_3, KC_2, QK_BOOT + ) +}; + +#ifdef COMBO_ENABLE +const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; + +combo_t key_combos[] = { + [COMBO_ESC] = COMBO(combo_esc,KC_ESC), +}; +#endif \ No newline at end of file diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/readme.md b/keyboards/kisakeyluxury/qtz/keymaps/default/readme.md new file mode 100644 index 000000000000..ebad0595fa32 --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/readme.md @@ -0,0 +1 @@ +# Default Layout diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk b/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk new file mode 100644 index 000000000000..ab1e438182a3 --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk @@ -0,0 +1 @@ +COMBO_ENABLE = yes diff --git a/keyboards/kisakeyluxury/qtz/readme.md b/keyboards/kisakeyluxury/qtz/readme.md new file mode 100644 index 000000000000..9ed6a6c8f47a --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/readme.md @@ -0,0 +1,15 @@ +# qtz + +35% keyboard designed by Iceage + +* Keyboard Maintainer: [kisakey-luxury](https://github.com/kisakey-luxury) +* Hardware Supported: *not released yet* +* Hardware Availability: *not released yet* + +Make example for this keyboard (after setting up your build environment): + + make qtz:default + +Flashing example for this keyboard: + + make qtz:default:flash diff --git a/keyboards/kisakeyluxury/qtz/rules.mk b/keyboards/kisakeyluxury/qtz/rules.mk new file mode 100644 index 000000000000..93dbc033f5a9 --- /dev/null +++ b/keyboards/kisakeyluxury/qtz/rules.mk @@ -0,0 +1,12 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output \ No newline at end of file From a0b61a0becd80f033d802e248195663db869ae7f Mon Sep 17 00:00:00 2001 From: kisakey-luxury Date: Fri, 6 Oct 2023 17:00:48 -0700 Subject: [PATCH 2/8] updated licenses --- keyboards/kisakeyluxury/qtz/config.h | 17 +++++++++++++++++ .../kisakeyluxury/qtz/keymaps/default/config.h | 17 +++++++++++++++++ .../kisakeyluxury/qtz/keymaps/default/keymap.c | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h index 98eb2100cd63..901ed5489cec 100644 --- a/keyboards/kisakeyluxury/qtz/config.h +++ b/keyboards/kisakeyluxury/qtz/config.h @@ -1,3 +1,20 @@ +/* +Copyright 2023 kisakeyluxury + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h index 4e92aadf6458..647ec2232143 100644 --- a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h @@ -1,3 +1,20 @@ +/* +Copyright 2023 kisakeyluxury + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #ifdef COMBO_ENABLE diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c index fd3e72803ec2..5e35ff83eefa 100644 --- a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2023 kisakeyluxury + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #include QMK_KEYBOARD_H enum layers{ From 971acaf4295a8bfdc7cc072264a090159d9b93f5 Mon Sep 17 00:00:00 2001 From: kisakey-luxury Date: Sat, 7 Oct 2023 11:10:06 -0700 Subject: [PATCH 3/8] updated requirements for PR --- keyboards/kisakeyluxury/qtz/config.h | 2 +- keyboards/kisakeyluxury/qtz/info.json | 16 ++++++++++++++-- .../kisakeyluxury/qtz/keymaps/default/keymap.c | 4 ++-- keyboards/kisakeyluxury/qtz/readme.md | 13 +++++++++++-- keyboards/kisakeyluxury/qtz/rules.mk | 13 +------------ 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h index 901ed5489cec..7660e3d7e98e 100644 --- a/keyboards/kisakeyluxury/qtz/config.h +++ b/keyboards/kisakeyluxury/qtz/config.h @@ -20,4 +20,4 @@ along with this program. If not, see . /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE \ No newline at end of file +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json index 8c4e3e2f9a8c..e8568be1eb55 100644 --- a/keyboards/kisakeyluxury/qtz/info.json +++ b/keyboards/kisakeyluxury/qtz/info.json @@ -7,6 +7,18 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "here": true, + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "rgblight": false, + "audio": false, + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D5", "D4", "D6", "C6"] @@ -15,7 +27,7 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT_default": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -61,4 +73,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c index 5e35ff83eefa..d5b0a8d2affb 100644 --- a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c @@ -26,7 +26,7 @@ enum combo_events { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_default( + [_BASE] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, @@ -40,4 +40,4 @@ const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; combo_t key_combos[] = { [COMBO_ESC] = COMBO(combo_esc,KC_ESC), }; -#endif \ No newline at end of file +#endif diff --git a/keyboards/kisakeyluxury/qtz/readme.md b/keyboards/kisakeyluxury/qtz/readme.md index 9ed6a6c8f47a..bce9b1cf80d8 100644 --- a/keyboards/kisakeyluxury/qtz/readme.md +++ b/keyboards/kisakeyluxury/qtz/readme.md @@ -2,14 +2,23 @@ 35% keyboard designed by Iceage +![pcb image](https://i.imgur.com/D2OmIkU.png) + * Keyboard Maintainer: [kisakey-luxury](https://github.com/kisakey-luxury) * Hardware Supported: *not released yet* * Hardware Availability: *not released yet* Make example for this keyboard (after setting up your build environment): - make qtz:default + make kisakeyluxury/qtz:default Flashing example for this keyboard: - make qtz:default:flash + make kisakeyluxury/qtz:default:flash + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset button**: Briefly press the button on the back of the PCB under the "Z" key +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (default is bottom-right most key) \ No newline at end of file diff --git a/keyboards/kisakeyluxury/qtz/rules.mk b/keyboards/kisakeyluxury/qtz/rules.mk index 93dbc033f5a9..0d24fc285796 100644 --- a/keyboards/kisakeyluxury/qtz/rules.mk +++ b/keyboards/kisakeyluxury/qtz/rules.mk @@ -1,12 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file +# intentionally left blank \ No newline at end of file From a6f520f4c96dc959825f19cf19f567d846aa7b83 Mon Sep 17 00:00:00 2001 From: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:09:46 -0700 Subject: [PATCH 4/8] cleaned up info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kisakeyluxury/qtz/info.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json index e8568be1eb55..3e2546195585 100644 --- a/keyboards/kisakeyluxury/qtz/info.json +++ b/keyboards/kisakeyluxury/qtz/info.json @@ -8,16 +8,10 @@ "device_version": "0.0.1" }, "features": { - "here": true, "bootmagic": true, "mousekey": true, "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "backlight": false, - "rgblight": false, - "audio": false, + "nkro": true }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"], From cfb94bd8db575716f7079bcc71375bb9979edbbe Mon Sep 17 00:00:00 2001 From: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:10:16 -0700 Subject: [PATCH 5/8] changed processor/bootloader to development_board in info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kisakeyluxury/qtz/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json index 3e2546195585..ba79fc31a22b 100644 --- a/keyboards/kisakeyluxury/qtz/info.json +++ b/keyboards/kisakeyluxury/qtz/info.json @@ -18,8 +18,7 @@ "rows": ["D5", "D4", "D6", "C6"] }, "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", + "development_board": "promicro", "layouts": { "LAYOUT": { "layout": [ From b5fd891948e2db6f7e06b1fb7a1b8bf6c072d32e Mon Sep 17 00:00:00 2001 From: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:17:02 -0700 Subject: [PATCH 6/8] deleted readme --- keyboards/kisakeyluxury/qtz/keymaps/default/readme.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/kisakeyluxury/qtz/keymaps/default/readme.md diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/readme.md b/keyboards/kisakeyluxury/qtz/keymaps/default/readme.md deleted file mode 100644 index ebad0595fa32..000000000000 --- a/keyboards/kisakeyluxury/qtz/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default Layout From 80db0c3c3ebe2cb7cf806d47c80a17246b177b22 Mon Sep 17 00:00:00 2001 From: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:17:55 -0700 Subject: [PATCH 7/8] updated readme image link Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kisakeyluxury/qtz/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kisakeyluxury/qtz/readme.md b/keyboards/kisakeyluxury/qtz/readme.md index bce9b1cf80d8..813bf10a32d1 100644 --- a/keyboards/kisakeyluxury/qtz/readme.md +++ b/keyboards/kisakeyluxury/qtz/readme.md @@ -2,7 +2,7 @@ 35% keyboard designed by Iceage -![pcb image](https://i.imgur.com/D2OmIkU.png) +![pcb image](https://i.imgur.com/D2OmIkUh.png) * Keyboard Maintainer: [kisakey-luxury](https://github.com/kisakey-luxury) * Hardware Supported: *not released yet* From 31e5c81ccfc120d822e01380798188ff1a0e91d6 Mon Sep 17 00:00:00 2001 From: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:28:59 -0700 Subject: [PATCH 8/8] cleaned up config.h Co-authored-by: Ryan --- keyboards/kisakeyluxury/qtz/keymaps/default/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h index 647ec2232143..7d03c4ddb8e5 100644 --- a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h +++ b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h @@ -17,6 +17,4 @@ along with this program. If not, see . #pragma once -#ifdef COMBO_ENABLE -# define COMBO_TERM 200 -#endif +#define COMBO_TERM 200