From 14f0a417c7de9f71cf83723f4bb5852cdac03ab7 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 26 Sep 2021 05:48:14 +0000
Subject: 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
---
keyboards/ggkeyboards/genesis/hotswap/config.h | 5 +----
keyboards/ggkeyboards/genesis/hotswap/hotswap.c | 5 -----
keyboards/ggkeyboards/genesis/hotswap/hotswap.h | 5 +----
keyboards/ggkeyboards/genesis/hotswap/info.json | 13 +++++++++---
.../genesis/hotswap/keymaps/default/keymap.c | 23 +++-------------------
.../genesis/hotswap/keymaps/via/keymap.c | 15 +++++++-------
keyboards/ggkeyboards/genesis/hotswap/rules.mk | 3 +--
7 files changed, 23 insertions(+), 46 deletions(-)
(limited to 'keyboards/ggkeyboards/genesis/hotswap')
diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h
index 966acc1b49..52f6fc8524 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/config.h
+++ b/keyboards/ggkeyboards/genesis/hotswap/config.h
@@ -23,7 +23,7 @@
#define PRODUCT_ID 0xD4D3
#define DEVICE_VER 0x0001
#define MANUFACTURER GG Keyboards
-#define PRODUCT Genesis
+#define PRODUCT Genesis Hotswap
/* key matrix size */
#define MATRIX_ROWS 6
@@ -45,6 +45,3 @@
{ F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 }
#define DIODE_DIRECTION COL2ROW
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
index b3b7c6508c..e27d117d9a 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
@@ -1,4 +1,3 @@
-
/* Copyright 2021 Steven Phillips (Spooknik)
*
* This program is free software: you can redistribute it and/or modify
@@ -16,7 +15,3 @@
*/
#include "hotswap.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
-
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
index 4469037efe..51dc2e91a1 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
+++ b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
@@ -19,7 +19,7 @@
#include "quantum.h"
// clang-format off
-#define LAYOUT( \
+#define LAYOUT_tkl_ansi( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0F, K0G, K0H, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, K3H, \
@@ -34,6 +34,3 @@
{ KC_NO, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, KC_NO, KC_NO, KC_NO, K5G, KC_NO }, \
{ 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 } \
}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json
index 566ed71cfc..8843b6a4bc 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/info.json
+++ b/keyboards/ggkeyboards/genesis/hotswap/info.json
@@ -1,9 +1,12 @@
{
- "keyboard_name": "Genesis",
+ "keyboard_name": "Genesis Hotswap",
"url": "",
"maintainer": "Spooknik",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_tkl_ansi"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_tkl_ansi": {
"layout": [
{"label":"K00 (C5,F0)", "x":0, "y":0},
{"label":"K01 (C5,F1)", "x":2, "y":0},
@@ -21,6 +24,7 @@
{"label":"K0F (C5,A7)", "x":15.25, "y":0},
{"label":"K0G (C5,C6)", "x":16.25, "y":0},
{"label":"K0H (C5,C7)", "x":17.25, "y":0},
+
{"label":"K20 (C4,F0)", "x":0, "y":1.5},
{"label":"K21 (C4,F1)", "x":1, "y":1.5},
{"label":"K22 (C4,F2)", "x":2, "y":1.5},
@@ -38,6 +42,7 @@
{"label":"K2F (C4,A7)", "x":15.25, "y":1.5},
{"label":"K2G (C4,C6)", "x":16.25, "y":1.5},
{"label":"K2H (C4,C7)", "x":17.25, "y":1.5},
+
{"label":"K30 (C3,F0)", "x":0, "y":2.5, "w":1.5},
{"label":"K31 (C3,F1)", "x":1.5, "y":2.5},
{"label":"K32 (C3,F2)", "x":2.5, "y":2.5},
@@ -55,6 +60,7 @@
{"label":"K3F (C3,A7)", "x":15.25, "y":2.5},
{"label":"K3G (C3,C6)", "x":16.25, "y":2.5},
{"label":"K3H (C3,C7)", "x":17.25, "y":2.5},
+
{"label":"K40 (C2,F0)", "x":0, "y":3.5, "w":1.75},
{"label":"K42 (C2,F2)", "x":1.75, "y":3.5},
{"label":"K43 (C2,F3)", "x":2.75, "y":3.5},
@@ -68,6 +74,7 @@
{"label":"K4B (C2,A3)", "x":10.75, "y":3.5},
{"label":"K4C (C2,A4)", "x":11.75, "y":3.5},
{"label":"K4D (C2,A5)", "x":12.75, "y":3.5, "w":2.25},
+
{"label":"K51 (C1,F1)", "x":0, "y":4.5, "w":2.25},
{"label":"K52 (C1,F2)", "x":2.25, "y":4.5},
{"label":"K53 (C1,F3)", "x":3.25, "y":4.5},
@@ -81,6 +88,7 @@
{"label":"K5B (C1,A3)", "x":11.25, "y":4.5},
{"label":"K5C (C1,A4)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K5G (C1,C6)", "x":16.25, "y":4.5},
+
{"label":"K60 (C0,F0)", "x":0, "y":5.5, "w":1.25},
{"label":"K61 (C0,F1)", "x":1.25, "y":5.5, "w":1.25},
{"label":"K63 (C0,F3)", "x":2.5, "y":5.5, "w":1.25},
@@ -95,5 +103,4 @@
]
}
}
- ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
index ab009ae58a..afe94141ec 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
@@ -13,11 +13,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_tkl_ansi(
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,
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,
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] = {
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,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
+ [1] = LAYOUT_tkl_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -33,21 +33,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [2] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [3] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
};
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
index dd680a8391..5647447a80 100644
--- a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
@@ -14,11 +14,10 @@
* along with this program. If not, see .
*/
-
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_tkl_ansi(
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,
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,
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] = {
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,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
+ [1] = LAYOUT_tkl_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -34,20 +33,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [2] = LAYOUT(
+ [2] = LAYOUT_tkl_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [3] = LAYOUT(
+ [3] = LAYOUT_tkl_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
-};
\ No newline at end of file
+};
diff --git a/keyboards/ggkeyboards/genesis/hotswap/rules.mk b/keyboards/ggkeyboards/genesis/hotswap/rules.mk
index 3dcae2d781..c5db939979 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
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-# generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/
+LAYOUTS = tkl_ansi
--
cgit v1.2.3