aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-09-26 05:48:14 +0000
committerGitHub <noreply@github.com>2021-09-25 22:48:14 -0700
commit14f0a417c7de9f71cf83723f4bb5852cdac03ab7 (patch)
tree229178f23200767a13399a08dc6b1fe3e434a306
parent532cfd56ca47e5fdba2d759747dd4ac358e0af3a (diff)
downloadqmk_firmware-14f0a417c7de9f71cf83723f4bb5852cdac03ab7.tar.gz
qmk_firmware-14f0a417c7de9f71cf83723f4bb5852cdac03ab7.zip
GG Keyboards Genesis: Layout Macro update and clean-up (#14606)
* Genesis Hotswap: rename LAYOUT to LAYOUT_tkl_ansi * Genesis Hotswap: delete blank layers from default keymap Results in a smaller compiled firmware size. * Genesis Hotswap: tidy-up via keymap Fixes the visual alignment of keycodes. * Genesis Hotswap: specify Hotswap in info.json * Genesis Hotswap: enable Community Layout support * Genesis Hotswap: remove KBFirmware Parser references * Genesis Hotswap: specify Hotswap in config.h * Genesis Solder: correct keyboard layout * Genesis Solder: rename LAYOUT to LAYOUT_all I don't actually know with certainty that this *is* LAYOUT_all, but in the absence of more concrete information, I'm going with this. * Genesis Solder: delete blank layers from default keymap Results in a smaller compiled firmware size. * Genesis Solder: tidy-up via keymap Fixes the visual alignment of keycodes. * Genesis Solder: specify Hotswap in info.json * Genesis Solder: add LAYOUT_tkl_ansi * Genesis Solder: enable Community Layout support * Genesis Solder: remove KBFirmware Parser references * Genesis Solder: specify Solder in config.h
Diffstat
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/config.h5
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/hotswap.c5
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/hotswap.h5
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/info.json13
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c23
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c15
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/rules.mk3
-rw-r--r--keyboards/ggkeyboards/genesis/solder/config.h6
-rw-r--r--keyboards/ggkeyboards/genesis/solder/info.json261
-rw-r--r--keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c22
-rw-r--r--keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c16
-rw-r--r--keyboards/ggkeyboards/genesis/solder/rules.mk3
-rw-r--r--keyboards/ggkeyboards/genesis/solder/solder.c5
-rw-r--r--keyboards/ggkeyboards/genesis/solder/solder.h19
14 files changed, 234 insertions, 167 deletions
diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h
index 966acc1b4..52f6fc852 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/config.h
+++ b/keyboards/ggkeyboards/genesis/hotswap/config.h
@@ -23,7 +23,7 @@
23#define PRODUCT_ID 0xD4D3 23#define PRODUCT_ID 0xD4D3
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER GG Keyboards 25#define MANUFACTURER GG Keyboards
26#define PRODUCT Genesis 26#define PRODUCT Genesis Hotswap
27 27
28/* key matrix size */ 28/* key matrix size */
29#define MATRIX_ROWS 6 29#define MATRIX_ROWS 6
@@ -45,6 +45,3 @@
45 { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } 45 { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 }
46 46
47#define DIODE_DIRECTION COL2ROW 47#define DIODE_DIRECTION COL2ROW
48
49// generated by KBFirmware JSON to QMK Parser
50// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
index b3b7c6508..e27d117d9 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
@@ -1,4 +1,3 @@
1
2/* Copyright 2021 Steven Phillips (Spooknik) 1/* Copyright 2021 Steven Phillips (Spooknik)
3 * 2 *
4 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
@@ -16,7 +15,3 @@
16 */ 15 */
17 16
18#include "hotswap.h" 17#include "hotswap.h"
19
20// generated by KBFirmware JSON to QMK Parser
21// https://noroadsleft.github.io/kbf_qmk_converter/
22
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
index 4469037ef..51dc2e91a 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
+++ b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
@@ -19,7 +19,7 @@
19#include "quantum.h" 19#include "quantum.h"
20 20
21// clang-format off 21// clang-format off
22#define LAYOUT( \ 22#define LAYOUT_tkl_ansi( \
23 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0F, K0G, K0H, \ 23 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0F, K0G, K0H, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, \ 24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, K3H, \ 25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, K3H, \
@@ -34,6 +34,3 @@
34 { KC_NO, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, KC_NO, KC_NO, KC_NO, K5G, KC_NO }, \ 34 { KC_NO, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, KC_NO, KC_NO, KC_NO, K5G, KC_NO }, \
35 { K60, K61, KC_NO, K63, KC_NO, KC_NO, K66, KC_NO, KC_NO, KC_NO, K6A, K6B, K6C, K6D, KC_NO, K6F, K6G, K6H } \ 35 { K60, K61, KC_NO, K63, KC_NO, KC_NO, K66, KC_NO, KC_NO, KC_NO, K6A, K6B, K6C, K6D, KC_NO, K6F, K6G, K6H } \
36} 36}
37
38// generated by KBFirmware JSON to QMK Parser
39// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json
index 566ed71cf..8843b6a4b 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/info.json
+++ b/keyboards/ggkeyboards/genesis/hotswap/info.json
@@ -1,9 +1,12 @@
1{ 1{
2 "keyboard_name": "Genesis", 2 "keyboard_name": "Genesis Hotswap",
3 "url": "", 3 "url": "",
4 "maintainer": "Spooknik", 4 "maintainer": "Spooknik",
5 "layout_aliases": {
6 "LAYOUT": "LAYOUT_tkl_ansi"
7 },
5 "layouts": { 8 "layouts": {
6 "LAYOUT": { 9 "LAYOUT_tkl_ansi": {
7 "layout": [ 10 "layout": [
8 {"label":"K00 (C5,F0)", "x":0, "y":0}, 11 {"label":"K00 (C5,F0)", "x":0, "y":0},
9 {"label":"K01 (C5,F1)", "x":2, "y":0}, 12 {"label":"K01 (C5,F1)", "x":2, "y":0},
@@ -21,6 +24,7 @@
21 {"label":"K0F (C5,A7)", "x":15.25, "y":0}, 24 {"label":"K0F (C5,A7)", "x":15.25, "y":0},
22 {"label":"K0G (C5,C6)", "x":16.25, "y":0}, 25 {"label":"K0G (C5,C6)", "x":16.25, "y":0},
23 {"label":"K0H (C5,C7)", "x":17.25, "y":0}, 26 {"label":"K0H (C5,C7)", "x":17.25, "y":0},
27
24 {"label":"K20 (C4,F0)", "x":0, "y":1.5}, 28 {"label":"K20 (C4,F0)", "x":0, "y":1.5},
25 {"label":"K21 (C4,F1)", "x":1, "y":1.5}, 29 {"label":"K21 (C4,F1)", "x":1, "y":1.5},
26 {"label":"K22 (C4,F2)", "x":2, "y":1.5}, 30 {"label":"K22 (C4,F2)", "x":2, "y":1.5},
@@ -38,6 +42,7 @@
38 {"label":"K2F (C4,A7)", "x":15.25, "y":1.5}, 42 {"label":"K2F (C4,A7)", "x":15.25, "y":1.5},
39 {"label":"K2G (C4,C6)", "x":16.25, "y":1.5}, 43 {"label":"K2G (C4,C6)", "x":16.25, "y":1.5},
40 {"label":"K2H (C4,C7)", "x":17.25, "y":1.5}, 44 {"label":"K2H (C4,C7)", "x":17.25, "y":1.5},
45
41 {"label":"K30 (C3,F0)", "x":0, "y":2.5, "w":1.5}, 46 {"label":"K30 (C3,F0)", "x":0, "y":2.5, "w":1.5},
42 {"label":"K31 (C3,F1)", "x":1.5, "y":2.5}, 47 {"label":"K31 (C3,F1)", "x":1.5, "y":2.5},
43 {"label":"K32 (C3,F2)", "x":2.5, "y":2.5}, 48 {"label":"K32 (C3,F2)", "x":2.5, "y":2.5},
@@ -55,6 +60,7 @@
55 {"label":"K3F (C3,A7)", "x":15.25, "y":2.5}, 60 {"label":"K3F (C3,A7)", "x":15.25, "y":2.5},
56 {"label":"K3G (C3,C6)", "x":16.25, "y":2.5}, 61 {"label":"K3G (C3,C6)", "x":16.25, "y":2.5},
57 {"label":"K3H (C3,C7)", "x":17.25, "y":2.5}, 62 {"label":"K3H (C3,C7)", "x":17.25, "y":2.5},
63
58 {"label":"K40 (C2,F0)", "x":0, "y":3.5, "w":1.75}, 64 {"label":"K40 (C2,F0)", "x":0, "y":3.5, "w":1.75},
59 {"label":"K42 (C2,F2)", "x":1.75, "y":3.5}, 65 {"label":"K42 (C2,F2)", "x":1.75, "y":3.5},
60 {"label":"K43 (C2,F3)", "x":2.75, "y":3.5}, 66 {"label":"K43 (C2,F3)", "x":2.75, "y":3.5},
@@ -68,6 +74,7 @@
68 {"label":"K4B (C2,A3)", "x":10.75, "y":3.5}, 74 {"label":"K4B (C2,A3)", "x":10.75, "y":3.5},
69 {"label":"K4C (C2,A4)", "x":11.75, "y":3.5}, 75 {"label":"K4C (C2,A4)", "x":11.75, "y":3.5},
70 {"label":"K4D (C2,A5)", "x":12.75, "y":3.5, "w":2.25}, 76 {"label":"K4D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
77
71 {"label":"K51 (C1,F1)", "x":0, "y":4.5, "w":2.25}, 78 {"label":"K51 (C1,F1)", "x":0, "y":4.5, "w":2.25},
72 {"label":"K52 (C1,F2)", "x":2.25, "y":4.5}, 79 {"label":"K52 (C1,F2)", "x":2.25, "y":4.5},
73 {"label":"K53 (C1,F3)", "x":3.25, "y":4.5}, 80 {"label":"K53 (C1,F3)", "x":3.25, "y":4.5},
@@ -81,6 +88,7 @@
81 {"label":"K5B (C1,A3)", "x":11.25, "y":4.5}, 88 {"label":"K5B (C1,A3)", "x":11.25, "y":4.5},
82 {"label":"K5C (C1,A4)", "x":12.25, "y":4.5, "w":2.75}, 89 {"label":"K5C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
83 {"label":"K5G (C1,C6)", "x":16.25, "y":4.5}, 90 {"label":"K5G (C1,C6)", "x":16.25, "y":4.5},
91
84 {"label":"K60 (C0,F0)", "x":0, "y":5.5, "w":1.25}, 92 {"label":"K60 (C0,F0)", "x":0, "y":5.5, "w":1.25},
85 {"label":"K61 (C0,F1)", "x":1.25, "y":5.5, "w":1.25}, 93 {"label":"K61 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
86 {"label":"K63 (C0,F3)", "x":2.5, "y":5.5, "w":1.25}, 94 {"label":"K63 (C0,F3)", "x":2.5, "y":5.5, "w":1.25},
@@ -95,5 +103,4 @@
95 ] 103 ]
96 } 104 }
97 } 105 }
98 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
99} 106}
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
index ab009ae58..afe94141e 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
@@ -13,11 +13,11 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_tkl_ansi(
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
22 KC_GRV, 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_INS, KC_HOME, KC_PGUP, 22 KC_GRV, 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_INS, KC_HOME, KC_PGUP,
23 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_DEL, KC_END, KC_PGDN, 23 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_DEL, KC_END, KC_PGDN,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, 25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 [1] = LAYOUT( 28 [1] = LAYOUT_tkl_ansi(
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -33,21 +33,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
35 ), 35 ),
36 [2] = LAYOUT(
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
43 ),
44 [3] = LAYOUT(
45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
51 ),
52
53}; 36};
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
index dd680a839..5647447a8 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
@@ -14,11 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17
18#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
19 18
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 [0] = LAYOUT( 20 [0] = LAYOUT_tkl_ansi(
22 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
23 KC_GRV, 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_INS, KC_HOME, KC_PGUP, 22 KC_GRV, 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_INS, KC_HOME, KC_PGUP,
24 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_DEL, KC_END, KC_PGDN, 23 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_DEL, KC_END, KC_PGDN,
@@ -26,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, 25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
28 ), 27 ),
29 [1] = LAYOUT( 28 [1] = LAYOUT_tkl_ansi(
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -34,20 +33,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
36 ), 35 ),
37 [2] = LAYOUT( 36 [2] = LAYOUT_tkl_ansi(
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
44 ), 43 ),
45 [3] = LAYOUT( 44 [3] = LAYOUT_tkl_ansi(
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
52 ), 51 ),
53}; \ No newline at end of file 52};
diff --git a/keyboards/ggkeyboards/genesis/hotswap/rules.mk b/keyboards/ggkeyboards/genesis/hotswap/rules.mk
index 3dcae2d78..c5db93997 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/rules.mk
+++ b/keyboards/ggkeyboards/genesis/hotswap/rules.mk
@@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22 22
23# generated by KBFirmware JSON to QMK Parser 23LAYOUTS = tkl_ansi
24# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h
index 74a098f41..6bfeaf9a5 100644
--- a/keyboards/ggkeyboards/genesis/solder/config.h
+++ b/keyboards/ggkeyboards/genesis/solder/config.h
@@ -23,7 +23,7 @@
23#define PRODUCT_ID 0xD4D2 23#define PRODUCT_ID 0xD4D2
24#define DEVICE_VER 0x0001 24#define DEVICE_VER 0x0001
25#define MANUFACTURER GG Keyboards 25#define MANUFACTURER GG Keyboards
26#define PRODUCT Genesis 26#define PRODUCT Genesis Solder
27 27
28/* key matrix size */ 28/* key matrix size */
29#define MATRIX_ROWS 6 29#define MATRIX_ROWS 6
@@ -43,7 +43,3 @@
43#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } 43#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 }
44 44
45#define DIODE_DIRECTION COL2ROW 45#define DIODE_DIRECTION COL2ROW
46
47
48// generated by KBFirmware JSON to QMK Parser
49// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json
index 11db10c4c..a316ad019 100644
--- a/keyboards/ggkeyboards/genesis/solder/info.json
+++ b/keyboards/ggkeyboards/genesis/solder/info.json
@@ -1,9 +1,12 @@
1{ 1{
2 "keyboard_name": "Genesis", 2 "keyboard_name": "Genesis Solder",
3 "url": "", 3 "url": "",
4 "maintainer": "Spooknik", 4 "maintainer": "Spooknik",
5 "layout_aliases": {
6 "LAYOUT": "LAYOUT_all"
7 },
5 "layouts": { 8 "layouts": {
6 "LAYOUT": { 9 "LAYOUT_all": {
7 "layout": [ 10 "layout": [
8 {"label":"K00 (C5,F0)", "x":0, "y":0}, 11 {"label":"K00 (C5,F0)", "x":0, "y":0},
9 {"label":"K01 (C5,F1)", "x":2, "y":0}, 12 {"label":"K01 (C5,F1)", "x":2, "y":0},
@@ -18,84 +21,184 @@
18 {"label":"K0A (C5,A2)", "x":12, "y":0}, 21 {"label":"K0A (C5,A2)", "x":12, "y":0},
19 {"label":"K0B (C5,A3)", "x":13, "y":0}, 22 {"label":"K0B (C5,A3)", "x":13, "y":0},
20 {"label":"K0C (C5,A4)", "x":14, "y":0}, 23 {"label":"K0C (C5,A4)", "x":14, "y":0},
21 {"label":"K0E (C5,A6)", "x":15, "y":0}, 24 {"label":"K0E (C5,A6)", "x":15.25, "y":0},
22 {"label":"K0F (C5,A7)", "x":16, "y":0}, 25 {"label":"K0F (C5,A7)", "x":16.25, "y":0},
23 {"label":"K0G (C5,C6)", "x":17, "y":0}, 26 {"label":"K0G (C5,C6)", "x":17.25, "y":0},
24 {"label":"K10 (C4,F0)", "x":0, "y":1}, 27
25 {"label":"K11 (C4,F1)", "x":1, "y":1}, 28 {"label":"K10 (C4,F0)", "x":0, "y":1.5},
26 {"label":"K12 (C4,F2)", "x":2, "y":1}, 29 {"label":"K11 (C4,F1)", "x":1, "y":1.5},
27 {"label":"K13 (C4,F3)", "x":3, "y":1}, 30 {"label":"K12 (C4,F2)", "x":2, "y":1.5},
28 {"label":"K14 (C4,F4)", "x":4, "y":1}, 31 {"label":"K13 (C4,F3)", "x":3, "y":1.5},
29 {"label":"K15 (C4,F5)", "x":5, "y":1}, 32 {"label":"K14 (C4,F4)", "x":4, "y":1.5},
30 {"label":"K16 (C4,F6)", "x":6, "y":1}, 33 {"label":"K15 (C4,F5)", "x":5, "y":1.5},
31 {"label":"K17 (C4,F7)", "x":7, "y":1}, 34 {"label":"K16 (C4,F6)", "x":6, "y":1.5},
32 {"label":"K18 (C4,A0)", "x":8, "y":1}, 35 {"label":"K17 (C4,F7)", "x":7, "y":1.5},
33 {"label":"K19 (C4,A1)", "x":9, "y":1}, 36 {"label":"K18 (C4,A0)", "x":8, "y":1.5},
34 {"label":"K1A (C4,A2)", "x":10, "y":1}, 37 {"label":"K19 (C4,A1)", "x":9, "y":1.5},
35 {"label":"K1B (C4,A3)", "x":11, "y":1}, 38 {"label":"K1A (C4,A2)", "x":10, "y":1.5},
36 {"label":"K1C (C4,A4)", "x":12, "y":1}, 39 {"label":"K1B (C4,A3)", "x":11, "y":1.5},
37 {"label":"K1D (C4,A5)", "x":13, "y":1}, 40 {"label":"K1C (C4,A4)", "x":12, "y":1.5},
38 {"label":"K0D (C5,A5)", "x":14, "y":1}, 41 {"label":"K1D (C4,A5)", "x":13, "y":1.5},
39 {"label":"K1E (C4,A6)", "x":15, "y":1}, 42 {"label":"K0D (C5,A5)", "x":14, "y":1.5},
40 {"label":"K1F (C4,A7)", "x":16, "y":1}, 43 {"label":"K1E (C4,A6)", "x":15.25, "y":1.5},
41 {"label":"K1G (C4,C6)", "x":17, "y":1}, 44 {"label":"K1F (C4,A7)", "x":16.25, "y":1.5},
42 {"label":"K20 (C3,F0)", "x":0, "y":2, "w":1.5}, 45 {"label":"K1G (C4,C6)", "x":17.25, "y":1.5},
43 {"label":"K21 (C3,F1)", "x":1.5, "y":2}, 46
44 {"label":"K22 (C3,F2)", "x":2.5, "y":2}, 47 {"label":"K20 (C3,F0)", "x":0, "y":2.5, "w":1.5},
45 {"label":"K23 (C3,F3)", "x":3.5, "y":2}, 48 {"label":"K21 (C3,F1)", "x":1.5, "y":2.5},
46 {"label":"K24 (C3,F4)", "x":4.5, "y":2}, 49 {"label":"K22 (C3,F2)", "x":2.5, "y":2.5},
47 {"label":"K25 (C3,F5)", "x":5.5, "y":2}, 50 {"label":"K23 (C3,F3)", "x":3.5, "y":2.5},
48 {"label":"K26 (C3,F6)", "x":6.5, "y":2}, 51 {"label":"K24 (C3,F4)", "x":4.5, "y":2.5},
49 {"label":"K27 (C3,F7)", "x":7.5, "y":2}, 52 {"label":"K25 (C3,F5)", "x":5.5, "y":2.5},
50 {"label":"K28 (C3,A0)", "x":8.5, "y":2}, 53 {"label":"K26 (C3,F6)", "x":6.5, "y":2.5},
51 {"label":"K29 (C3,A1)", "x":9.5, "y":2}, 54 {"label":"K27 (C3,F7)", "x":7.5, "y":2.5},
52 {"label":"K2A (C3,A2)", "x":10.5, "y":2}, 55 {"label":"K28 (C3,A0)", "x":8.5, "y":2.5},
53 {"label":"K2B (C3,A3)", "x":11.5, "y":2}, 56 {"label":"K29 (C3,A1)", "x":9.5, "y":2.5},
54 {"label":"K2C (C3,A4)", "x":12.5, "y":2}, 57 {"label":"K2A (C3,A2)", "x":10.5, "y":2.5},
55 {"label":"K2D (C3,A5)", "x":13.5, "y":2, "w":1.5}, 58 {"label":"K2B (C3,A3)", "x":11.5, "y":2.5},
56 {"label":"K2E (C3,A6)", "x":15, "y":2}, 59 {"label":"K2C (C3,A4)", "x":12.5, "y":2.5},
57 {"label":"K2F (C3,A7)", "x":16, "y":2}, 60 {"label":"K2D (C3,A5)", "x":13.5, "y":2.5, "w":1.5},
58 {"label":"K2G (C3,C6)", "x":17, "y":2}, 61 {"label":"K2E (C3,A6)", "x":15.25, "y":2.5},
59 {"label":"K30 (C2,F0)", "x":0, "y":3, "w":1.75}, 62 {"label":"K2F (C3,A7)", "x":16.25, "y":2.5},
60 {"label":"K31 (C2,F1)", "x":1.75, "y":3}, 63 {"label":"K2G (C3,C6)", "x":17.25, "y":2.5},
61 {"label":"K32 (C2,F2)", "x":2.75, "y":3}, 64
62 {"label":"K33 (C2,F3)", "x":3.75, "y":3}, 65 {"label":"K30 (C2,F0)", "x":0, "y":3.5, "w":1.75},
63 {"label":"K34 (C2,F4)", "x":4.75, "y":3}, 66 {"label":"K31 (C2,F1)", "x":1.75, "y":3.5},
64 {"label":"K35 (C2,F5)", "x":5.75, "y":3}, 67 {"label":"K32 (C2,F2)", "x":2.75, "y":3.5},
65 {"label":"K36 (C2,F6)", "x":6.75, "y":3}, 68 {"label":"K33 (C2,F3)", "x":3.75, "y":3.5},
66 {"label":"K37 (C2,F7)", "x":7.75, "y":3}, 69 {"label":"K34 (C2,F4)", "x":4.75, "y":3.5},
67 {"label":"K38 (C2,A0)", "x":8.75, "y":3}, 70 {"label":"K35 (C2,F5)", "x":5.75, "y":3.5},
68 {"label":"K39 (C2,A1)", "x":9.75, "y":3}, 71 {"label":"K36 (C2,F6)", "x":6.75, "y":3.5},
69 {"label":"K3A (C2,A2)", "x":10.75, "y":3}, 72 {"label":"K37 (C2,F7)", "x":7.75, "y":3.5},
70 {"label":"K3B (C2,A3)", "x":11.75, "y":3}, 73 {"label":"K38 (C2,A0)", "x":8.75, "y":3.5},
71 {"label":"K3D (C2,A5)", "x":12.75, "y":3, "w":2.25}, 74 {"label":"K39 (C2,A1)", "x":9.75, "y":3.5},
72 {"label":"K40 (C1,F0)", "x":0, "y":4, "w":1.25}, 75 {"label":"K3A (C2,A2)", "x":10.75, "y":3.5},
73 {"label":"K41 (C1,F1)", "x":1.25, "y":4}, 76 {"label":"K3B (C2,A3)", "x":11.75, "y":3.5},
74 {"label":"K42 (C1,F2)", "x":2.25, "y":4}, 77 {"label":"K3D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
75 {"label":"K43 (C1,F3)", "x":3.25, "y":4}, 78
76 {"label":"K44 (C1,F4)", "x":4.25, "y":4}, 79 {"label":"K40 (C1,F0)", "x":0, "y":4.5, "w":1.25},
77 {"label":"K45 (C1,F5)", "x":5.25, "y":4}, 80 {"label":"K41 (C1,F1)", "x":1.25, "y":4.5},
78 {"label":"K46 (C1,F6)", "x":6.25, "y":4}, 81 {"label":"K42 (C1,F2)", "x":2.25, "y":4.5},
79 {"label":"K47 (C1,F7)", "x":7.25, "y":4}, 82 {"label":"K43 (C1,F3)", "x":3.25, "y":4.5},
80 {"label":"K48 (C1,A0)", "x":8.25, "y":4}, 83 {"label":"K44 (C1,F4)", "x":4.25, "y":4.5},
81 {"label":"K49 (C1,A1)", "x":9.25, "y":4}, 84 {"label":"K45 (C1,F5)", "x":5.25, "y":4.5},
82 {"label":"K4A (C1,A2)", "x":10.25, "y":4}, 85 {"label":"K46 (C1,F6)", "x":6.25, "y":4.5},
83 {"label":"K4B (C1,A3)", "x":11.25, "y":4}, 86 {"label":"K47 (C1,F7)", "x":7.25, "y":4.5},
84 {"label":"K4C (C1,A4)", "x":12.25, "y":4, "w":2.75}, 87 {"label":"K48 (C1,A0)", "x":8.25, "y":4.5},
85 {"label":"K4F (C1,A7)", "x":16, "y":4}, 88 {"label":"K49 (C1,A1)", "x":9.25, "y":4.5},
86 {"label":"K50 (C0,F0)", "x":0, "y":5, "w":1.25}, 89 {"label":"K4A (C1,A2)", "x":10.25, "y":4.5},
87 {"label":"K51 (C0,F1)", "x":1.25, "y":5, "w":1.25}, 90 {"label":"K4B (C1,A3)", "x":11.25, "y":4.5},
88 {"label":"K52 (C0,F2)", "x":2.5, "y":5, "w":1.25}, 91 {"label":"K4C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
89 {"label":"K56 (C0,F6)", "x":3.75, "y":5, "w":6.25}, 92 {"label":"K4F (C1,A7)", "x":16.25, "y":4.5},
90 {"label":"K5A (C0,A2)", "x":10, "y":5, "w":1.25}, 93
91 {"label":"K5B (C0,A3)", "x":11.25, "y":5, "w":1.25}, 94 {"label":"K50 (C0,F0)", "x":0, "y":5.5, "w":1.25},
92 {"label":"K5C (C0,A4)", "x":12.5, "y":5, "w":1.25}, 95 {"label":"K51 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
93 {"label":"K5D (C0,A5)", "x":13.75, "y":5, "w":1.25}, 96 {"label":"K52 (C0,F2)", "x":2.5, "y":5.5, "w":1.25},
94 {"label":"K5E (C0,A6)", "x":15, "y":5}, 97 {"label":"K56 (C0,F6)", "x":3.75, "y":5.5, "w":6.25},
95 {"label":"K5F (C0,A7)", "x":16, "y":5}, 98 {"label":"K5A (C0,A2)", "x":10, "y":5.5, "w":1.25},
96 {"label":"K5G (C0,C6)", "x":17, "y":5} 99 {"label":"K5B (C0,A3)", "x":11.25, "y":5.5, "w":1.25},
100 {"label":"K5C (C0,A4)", "x":12.5, "y":5.5, "w":1.25},
101 {"label":"K5D (C0,A5)", "x":13.75, "y":5.5, "w":1.25},
102 {"label":"K5E (C0,A6)", "x":15.25, "y":5.5},
103 {"label":"K5F (C0,A7)", "x":16.25, "y":5.5},
104 {"label":"K5G (C0,C6)", "x":17.25, "y":5.5}
105 ]
106 },
107 "LAYOUT_tkl_ansi": {
108 "layout": [
109 {"label":"K00 (C5,F0)", "x":0, "y":0},
110 {"label":"K01 (C5,F1)", "x":2, "y":0},
111 {"label":"K02 (C5,F2)", "x":3, "y":0},
112 {"label":"K03 (C5,F3)", "x":4, "y":0},
113 {"label":"K04 (C5,F4)", "x":5, "y":0},
114 {"label":"K05 (C5,F5)", "x":6.5, "y":0},
115 {"label":"K06 (C5,F6)", "x":7.5, "y":0},
116 {"label":"K07 (C5,F7)", "x":8.5, "y":0},
117 {"label":"K08 (C5,A0)", "x":9.5, "y":0},
118 {"label":"K09 (C5,A1)", "x":11, "y":0},
119 {"label":"K0A (C5,A2)", "x":12, "y":0},
120 {"label":"K0B (C5,A3)", "x":13, "y":0},
121 {"label":"K0C (C5,A4)", "x":14, "y":0},
122 {"label":"K0E (C5,A6)", "x":15.25, "y":0},
123 {"label":"K0F (C5,A7)", "x":16.25, "y":0},
124 {"label":"K0G (C5,C6)", "x":17.25, "y":0},
125
126 {"label":"K10 (C4,F0)", "x":0, "y":1.5},
127 {"label":"K11 (C4,F1)", "x":1, "y":1.5},
128 {"label":"K12 (C4,F2)", "x":2, "y":1.5},
129 {"label":"K13 (C4,F3)", "x":3, "y":1.5},
130 {"label":"K14 (C4,F4)", "x":4, "y":1.5},
131 {"label":"K15 (C4,F5)", "x":5, "y":1.5},
132 {"label":"K16 (C4,F6)", "x":6, "y":1.5},
133 {"label":"K17 (C4,F7)", "x":7, "y":1.5},
134 {"label":"K18 (C4,A0)", "x":8, "y":1.5},
135 {"label":"K19 (C4,A1)", "x":9, "y":1.5},
136 {"label":"K1A (C4,A2)", "x":10, "y":1.5},
137 {"label":"K1B (C4,A3)", "x":11, "y":1.5},
138 {"label":"K1C (C4,A4)", "x":12, "y":1.5},
139 {"label":"K1D (C4,A5)", "x":13, "y":1.5, "w":2},
140 {"label":"K1E (C4,A6)", "x":15.25, "y":1.5},
141 {"label":"K1F (C4,A7)", "x":16.25, "y":1.5},
142 {"label":"K1G (C4,C6)", "x":17.25, "y":1.5},
143
144 {"label":"K20 (C3,F0)", "x":0, "y":2.5, "w":1.5},
145 {"label":"K21 (C3,F1)", "x":1.5, "y":2.5},
146 {"label":"K22 (C3,F2)", "x":2.5, "y":2.5},
147 {"label":"K23 (C3,F3)", "x":3.5, "y":2.5},
148 {"label":"K24 (C3,F4)", "x":4.5, "y":2.5},
149 {"label":"K25 (C3,F5)", "x":5.5, "y":2.5},
150 {"label":"K26 (C3,F6)", "x":6.5, "y":2.5},
151 {"label":"K27 (C3,F7)", "x":7.5, "y":2.5},
152 {"label":"K28 (C3,A0)", "x":8.5, "y":2.5},
153 {"label":"K29 (C3,A1)", "x":9.5, "y":2.5},
154 {"label":"K2A (C3,A2)", "x":10.5, "y":2.5},
155 {"label":"K2B (C3,A3)", "x":11.5, "y":2.5},
156 {"label":"K2C (C3,A4)", "x":12.5, "y":2.5},
157 {"label":"K2D (C3,A5)", "x":13.5, "y":2.5, "w":1.5},
158 {"label":"K2E (C3,A6)", "x":15.25, "y":2.5},
159 {"label":"K2F (C3,A7)", "x":16.25, "y":2.5},
160 {"label":"K2G (C3,C6)", "x":17.25, "y":2.5},
161
162 {"label":"K30 (C2,F0)", "x":0, "y":3.5, "w":1.75},
163 {"label":"K31 (C2,F1)", "x":1.75, "y":3.5},
164 {"label":"K32 (C2,F2)", "x":2.75, "y":3.5},
165 {"label":"K33 (C2,F3)", "x":3.75, "y":3.5},
166 {"label":"K34 (C2,F4)", "x":4.75, "y":3.5},
167 {"label":"K35 (C2,F5)", "x":5.75, "y":3.5},
168 {"label":"K36 (C2,F6)", "x":6.75, "y":3.5},
169 {"label":"K37 (C2,F7)", "x":7.75, "y":3.5},
170 {"label":"K38 (C2,A0)", "x":8.75, "y":3.5},
171 {"label":"K39 (C2,A1)", "x":9.75, "y":3.5},
172 {"label":"K3A (C2,A2)", "x":10.75, "y":3.5},
173 {"label":"K3B (C2,A3)", "x":11.75, "y":3.5},
174 {"label":"K3D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
175
176 {"label":"K40 (C1,F0)", "x":0, "y":4.5, "w":2.25},
177 {"label":"K42 (C1,F2)", "x":2.25, "y":4.5},
178 {"label":"K43 (C1,F3)", "x":3.25, "y":4.5},
179 {"label":"K44 (C1,F4)", "x":4.25, "y":4.5},
180 {"label":"K45 (C1,F5)", "x":5.25, "y":4.5},
181 {"label":"K46 (C1,F6)", "x":6.25, "y":4.5},
182 {"label":"K47 (C1,F7)", "x":7.25, "y":4.5},
183 {"label":"K48 (C1,A0)", "x":8.25, "y":4.5},
184 {"label":"K49 (C1,A1)", "x":9.25, "y":4.5},
185 {"label":"K4A (C1,A2)", "x":10.25, "y":4.5},
186 {"label":"K4B (C1,A3)", "x":11.25, "y":4.5},
187 {"label":"K4C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
188 {"label":"K4F (C1,A7)", "x":16.25, "y":4.5},
189
190 {"label":"K50 (C0,F0)", "x":0, "y":5.5, "w":1.25},
191 {"label":"K51 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
192 {"label":"K52 (C0,F2)", "x":2.5, "y":5.5, "w":1.25},
193 {"label":"K56 (C0,F6)", "x":3.75, "y":5.5, "w":6.25},
194 {"label":"K5A (C0,A2)", "x":10, "y":5.5, "w":1.25},
195 {"label":"K5B (C0,A3)", "x":11.25, "y":5.5, "w":1.25},
196 {"label":"K5C (C0,A4)", "x":12.5, "y":5.5, "w":1.25},
197 {"label":"K5D (C0,A5)", "x":13.75, "y":5.5, "w":1.25},
198 {"label":"K5E (C0,A6)", "x":15.25, "y":5.5},
199 {"label":"K5F (C0,A7)", "x":16.25, "y":5.5},
200 {"label":"K5G (C0,C6)", "x":17.25, "y":5.5}
97 ] 201 ]
98 } 202 }
99 } 203 }
100 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
101} 204}
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
index 98d778f1d..4e7a2fd1f 100644
--- a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_all(
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
22 KC_GRV, 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_SPC, KC_INS, KC_HOME, KC_PGUP, 22 KC_GRV, 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_SPC, KC_INS, KC_HOME, KC_PGUP,
23 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_DEL, KC_END, KC_PGDN, 23 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_DEL, KC_END, KC_PGDN,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, 25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 [1] = LAYOUT( 28 [1] = LAYOUT_all(
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -33,21 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
35 ), 35 ),
36 [2] = LAYOUT(
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
43 ),
44 [3] = LAYOUT(
45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
51 ),
52 36
53}; \ No newline at end of file 37};
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
index 1084a6e22..1d22fbe31 100644
--- a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT( 20 [0] = LAYOUT_all(
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
22 KC_GRV, 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_SPC, KC_INS, KC_HOME, KC_PGUP, 22 KC_GRV, 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_SPC, KC_INS, KC_HOME, KC_PGUP,
23 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_DEL, KC_END, KC_PGDN, 23 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_DEL, KC_END, KC_PGDN,
@@ -25,29 +25,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, 25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 [1] = LAYOUT( 28 [1] = LAYOUT_all(
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
35 ), 35 ),
36 [2] = LAYOUT( 36 [2] = LAYOUT_all(
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
43 ), 43 ),
44 [3] = LAYOUT( 44 [3] = LAYOUT_all(
45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 48 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
51 ), 51 ),
52 52
53}; \ No newline at end of file 53};
diff --git a/keyboards/ggkeyboards/genesis/solder/rules.mk b/keyboards/ggkeyboards/genesis/solder/rules.mk
index 3dcae2d78..c5db93997 100644
--- a/keyboards/ggkeyboards/genesis/solder/rules.mk
+++ b/keyboards/ggkeyboards/genesis/solder/rules.mk
@@ -20,5 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22 22
23# generated by KBFirmware JSON to QMK Parser 23LAYOUTS = tkl_ansi
24# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/solder/solder.c b/keyboards/ggkeyboards/genesis/solder/solder.c
index 9e1bdeb0f..647455051 100644
--- a/keyboards/ggkeyboards/genesis/solder/solder.c
+++ b/keyboards/ggkeyboards/genesis/solder/solder.c
@@ -1,4 +1,3 @@
1
2/* Copyright 2021 Steven Phillips (Spooknik) 1/* Copyright 2021 Steven Phillips (Spooknik)
3 * 2 *
4 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
@@ -16,7 +15,3 @@
16 */ 15 */
17 16
18#include "solder.h" 17#include "solder.h"
19
20// generated by KBFirmware JSON to QMK Parser
21// https://noroadsleft.github.io/kbf_qmk_converter/
22
diff --git a/keyboards/ggkeyboards/genesis/solder/solder.h b/keyboards/ggkeyboards/genesis/solder/solder.h
index a5a96adf8..b95da8a59 100644
--- a/keyboards/ggkeyboards/genesis/solder/solder.h
+++ b/keyboards/ggkeyboards/genesis/solder/solder.h
@@ -18,7 +18,7 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define LAYOUT( \ 21#define LAYOUT_all( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \ 22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, \ 23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ 24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
@@ -34,5 +34,18 @@
34 { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G, KC_NO }, \ 34 { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G, KC_NO }, \
35} 35}
36 36
37// generated by KBFirmware JSON to QMK Parser 37#define LAYOUT_tkl_ansi( \
38// https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file 38 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
39 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
40 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
41 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
42 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4F, \
43 K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
44) { \
45 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G, KC_NO }, \
46 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, KC_NO }, \
47 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, KC_NO }, \
48 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, KC_NO, KC_NO, KC_NO }, \
49 { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, KC_NO, K4F, KC_NO, KC_NO }, \
50 { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G, KC_NO }, \
51}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 16:34:08 +0000