summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-05-22 04:44:51 +0000
committerQMK Bot <hello@qmk.fm>2021-05-22 04:44:51 +0000
commit31130b9031af1e4f712e443aee69d24baacc04f1 (patch)
tree3eefc8c7cb04df2b2396f3be09d409c141211424
parent8e96c5a060896c4aa5ed181d9c86c4e66bb78cfc (diff)
parent0be53004b38b97599f8244bfb7a0b5e43f2151c5 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/alfredslab/swift65/solder/config.h68
-rw-r--r--keyboards/alfredslab/swift65/solder/info.json81
-rw-r--r--keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c35
-rw-r--r--keyboards/alfredslab/swift65/solder/keymaps/default/readme.md3
-rw-r--r--keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c49
-rw-r--r--keyboards/alfredslab/swift65/solder/keymaps/via/readme.md3
-rw-r--r--keyboards/alfredslab/swift65/solder/keymaps/via/rules.mk1
-rw-r--r--keyboards/alfredslab/swift65/solder/readme.md20
-rw-r--r--keyboards/alfredslab/swift65/solder/rules.mk22
-rw-r--r--keyboards/alfredslab/swift65/solder/solder.c17
-rw-r--r--keyboards/alfredslab/swift65/solder/solder.h33
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/config.h49
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/hotswap.c22
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/hotswap.h39
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/info.json101
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c53
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c53
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/keymaps/via/rules.mk1
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/readme.md15
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/rules.mk25
-rw-r--r--keyboards/ggkeyboards/genesis/solder/config.h49
-rw-r--r--keyboards/ggkeyboards/genesis/solder/info.json103
-rw-r--r--keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c53
-rw-r--r--keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c53
-rw-r--r--keyboards/ggkeyboards/genesis/solder/keymaps/via/rules.mk1
-rw-r--r--keyboards/ggkeyboards/genesis/solder/readme.md15
-rw-r--r--keyboards/ggkeyboards/genesis/solder/rules.mk25
-rw-r--r--keyboards/ggkeyboards/genesis/solder/solder.c22
-rw-r--r--keyboards/ggkeyboards/genesis/solder/solder.h38
29 files changed, 1049 insertions, 0 deletions
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
new file mode 100644
index 0000000000..509aae6a89
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -0,0 +1,68 @@
+
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBBEB
+#define PRODUCT_ID 0xD4C3
+#define DEVICE_VER 0x0001
+#define MANUFACTURER AlfredsLab
+#define PRODUCT Swift65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B1, B2, B3, D4, D6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1, D0 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN D2
+#ifdef RGB_DI_PIN
+ #define RGBLED_NUM 14
+ #define RGBLIGHT_HUE_STEP 8
+ #define RGBLIGHT_SAT_STEP 8
+ #define RGBLIGHT_VAL_STEP 8
+ #define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */
+ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+ #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+// #define RGBLIGHT_EFFECT_BREATHING
+// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+// #define RGBLIGHT_EFFECT_SNAKE
+// #define RGBLIGHT_EFFECT_KNIGHT
+// #define RGBLIGHT_EFFECT_CHRISTMAS
+// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+// #define RGBLIGHT_EFFECT_RGB_TEST
+// #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
new file mode 100644
index 0000000000..a04de1cc14
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -0,0 +1,81 @@
+{
+ "keyboard_name": "Swift65",
+ "url": "https://swiftcables.net/",
+ "maintainer": "Spooknik",
+ "width": 16.25,
+ "height": 5,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00 (B1,F7)", "x":0, "y":0},
+ {"label":"K01 (B1,F6)", "x":1, "y":0},
+ {"label":"K02 (B1,F5)", "x":2, "y":0},
+ {"label":"K03 (B1,F4)", "x":3, "y":0},
+ {"label":"K04 (B1,F1)", "x":4, "y":0},
+ {"label":"K05 (B1,F0)", "x":5, "y":0},
+ {"label":"K06 (B1,C7)", "x":6, "y":0},
+ {"label":"K07 (B1,C6)", "x":7, "y":0},
+ {"label":"K08 (B1,B6)", "x":8, "y":0},
+ {"label":"K09 (B1,B5)", "x":9, "y":0},
+ {"label":"K0A (B1,B4)", "x":10, "y":0},
+ {"label":"K0B (B1,D7)", "x":11, "y":0},
+ {"label":"K0C (B1,D5)", "x":12, "y":0},
+ {"label":"K0D (B1,D3)", "x":13, "y":0},
+ {"label":"K0F (B1,D0)", "x":14, "y":0},
+ {"label":"K0E (B1,D1)", "x":15.25, "y":0},
+ {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
+ {"label":"K11 (B2,F6)", "x":1.5, "y":1},
+ {"label":"K12 (B2,F5)", "x":2.5, "y":1},
+ {"label":"K13 (B2,F4)", "x":3.5, "y":1},
+ {"label":"K14 (B2,F1)", "x":4.5, "y":1},
+ {"label":"K15 (B2,F0)", "x":5.5, "y":1},
+ {"label":"K16 (B2,C7)", "x":6.5, "y":1},
+ {"label":"K17 (B2,C6)", "x":7.5, "y":1},
+ {"label":"K18 (B2,B6)", "x":8.5, "y":1},
+ {"label":"K19 (B2,B5)", "x":9.5, "y":1},
+ {"label":"K1A (B2,B4)", "x":10.5, "y":1},
+ {"label":"K1B (B2,D7)", "x":11.5, "y":1},
+ {"label":"K1C (B2,D5)", "x":12.5, "y":1},
+ {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
+ {"label":"K1E (B2,D1)", "x":15.25, "y":1},
+ {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
+ {"label":"K21 (B3,F6)", "x":1.75, "y":2},
+ {"label":"K22 (B3,F5)", "x":2.75, "y":2},
+ {"label":"K23 (B3,F4)", "x":3.75, "y":2},
+ {"label":"K24 (B3,F1)", "x":4.75, "y":2},
+ {"label":"K25 (B3,F0)", "x":5.75, "y":2},
+ {"label":"K26 (B3,C7)", "x":6.75, "y":2},
+ {"label":"K27 (B3,C6)", "x":7.75, "y":2},
+ {"label":"K28 (B3,B6)", "x":8.75, "y":2},
+ {"label":"K29 (B3,B5)", "x":9.75, "y":2},
+ {"label":"K2A (B3,B4)", "x":10.75, "y":2},
+ {"label":"K2B (B3,D7)", "x":11.75, "y":2},
+ {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
+ {"label":"K2E (B3,D1)", "x":15.25, "y":2},
+ {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
+ {"label":"K32 (D4,F5)", "x":2.25, "y":3},
+ {"label":"K33 (D4,F4)", "x":3.25, "y":3},
+ {"label":"K34 (D4,F1)", "x":4.25, "y":3},
+ {"label":"K35 (D4,F0)", "x":5.25, "y":3},
+ {"label":"K36 (D4,C7)", "x":6.25, "y":3},
+ {"label":"K37 (D4,C6)", "x":7.25, "y":3},
+ {"label":"K38 (D4,B6)", "x":8.25, "y":3},
+ {"label":"K39 (D4,B5)", "x":9.25, "y":3},
+ {"label":"K3A (D4,B4)", "x":10.25, "y":3},
+ {"label":"K3B (D4,D7)", "x":11.25, "y":3},
+ {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
+ {"label":"K3D (D4,D3)", "x":14, "y":3},
+ {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
+ {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
+ {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
+ {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25},
+ {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25},
+ {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25},
+ {"label":"K4C (D6,D5)", "x":13, "y":4},
+ {"label":"K4D (D6,D3)", "x":14, "y":4},
+ {"label":"K4E (D6,D1)", "x":15, "y":4}
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c b/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..274809bb11
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Steven Phillips (spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+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_GRV, KC_BSPC, KC_HOME,
+ 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ 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, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_GRV, 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_DEL, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+ ),
+
+}; \ No newline at end of file
diff --git a/keyboards/alfredslab/swift65/solder/keymaps/default/readme.md b/keyboards/alfredslab/swift65/solder/keymaps/default/readme.md
new file mode 100644
index 0000000000..74de146080
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Swift65 Solder Layout
+
+![](https://i.imgur.com/7Capi8W.png)
diff --git a/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c b/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9936becce6
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 Steven Phillips (spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+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_GRV, KC_BSPC, KC_HOME,
+ 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ 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, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_GRV, 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_DEL, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+ ),
+ [2] = LAYOUT(
+ 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, 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
+ ),
+ [3] = LAYOUT(
+ 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, 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
+ ),
+
+};
diff --git a/keyboards/alfredslab/swift65/solder/keymaps/via/readme.md b/keyboards/alfredslab/swift65/solder/keymaps/via/readme.md
new file mode 100644
index 0000000000..74de146080
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Default Swift65 Solder Layout
+
+![](https://i.imgur.com/7Capi8W.png)
diff --git a/keyboards/alfredslab/swift65/solder/keymaps/via/rules.mk b/keyboards/alfredslab/swift65/solder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/alfredslab/swift65/solder/readme.md b/keyboards/alfredslab/swift65/solder/readme.md
new file mode 100644
index 0000000000..b477438199
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/readme.md
@@ -0,0 +1,20 @@
+# Swift65
+
+A 65% Keyboard from Swiftcables
+
+* Keyboard Maintainer: [Steven Phillips (spoonik)](https://github.com/keyboardcollective)
+* Hardware Supported: Swift65 Solder
+* Hardware Availability: Soom from Swiftcables
+
+To enter bootloader for flashing firmware, press layer change key (MO(1)) and Right Shift simultaneously.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make alfredslab/swift65/solder:default
+
+Flashing example for this keyboard:
+
+ make alfredslab/swift65/solder:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/alfredslab/swift65/solder/rules.mk b/keyboards/alfredslab/swift65/solder/rules.mk
new file mode 100644
index 0000000000..2c2853b57f
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/alfredslab/swift65/solder/solder.c b/keyboards/alfredslab/swift65/solder/solder.c
new file mode 100644
index 0000000000..4dd021ba7c
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/solder.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Steven Phillips (spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "solder.h"
diff --git a/keyboards/alfredslab/swift65/solder/solder.h b/keyboards/alfredslab/swift65/solder/solder.h
new file mode 100644
index 0000000000..7629379f59
--- /dev/null
+++ b/keyboards/alfredslab/swift65/solder/solder.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Steven Phillips (spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0E, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+ K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, KC_NO }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, KC_NO }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO }, \
+ { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, KC_NO }, \
+}
diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h
new file mode 100644
index 0000000000..d435612f17
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBB00
+#define PRODUCT_ID 0xD4D3
+#define DEVICE_VER 0x0001
+#define MANUFACTURER GG Keyboards
+#define PRODUCT Genesis
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 18
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { C5, C4, C3, C2, C1, C0 }
+#define MATRIX_COL_PINS { 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/ \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
new file mode 100644
index 0000000000..b3b7c6508c
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c
@@ -0,0 +1,22 @@
+
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#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
new file mode 100644
index 0000000000..a5ff78cca7
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/hotswap.h
@@ -0,0 +1,39 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ 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, \
+ K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, \
+ K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5G, \
+ K60, K61, K63, K66, K6A, K6B, K6C, K6D, K6F, K6G, K6H \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, KC_NO, K0F, K0G, K0H }, \
+ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F, K2G, K2H }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F, K3G, K3H }, \
+ { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, KC_NO, KC_NO, KC_NO }, \
+ { 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/ \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json
new file mode 100644
index 0000000000..dfb68ce0b5
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/info.json
@@ -0,0 +1,101 @@
+{
+ "keyboard_name": "Genesis",
+ "url": "",
+ "maintainer": "Spooknik",
+ "width": 18.25,
+ "height": 6.5,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00 (C5,F0)", "x":0, "y":0},
+ {"label":"K01 (C5,F1)", "x":2, "y":0},
+ {"label":"K02 (C5,F2)", "x":3, "y":0},
+ {"label":"K03 (C5,F3)", "x":4, "y":0},
+ {"label":"K04 (C5,F4)", "x":5, "y":0},
+ {"label":"K05 (C5,F5)", "x":6.5, "y":0},
+ {"label":"K06 (C5,F6)", "x":7.5, "y":0},
+ {"label":"K07 (C5,F7)", "x":8.5, "y":0},
+ {"label":"K08 (C5,A0)", "x":9.5, "y":0},
+ {"label":"K09 (C5,A1)", "x":11, "y":0},
+ {"label":"K0A (C5,A2)", "x":12, "y":0},
+ {"label":"K0B (C5,A3)", "x":13, "y":0},
+ {"label":"K0C (C5,A4)", "x":14, "y":0},
+ {"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},
+ {"label":"K23 (C4,F3)", "x":3, "y":1.5},
+ {"label":"K24 (C4,F4)", "x":4, "y":1.5},
+ {"label":"K25 (C4,F5)", "x":5, "y":1.5},
+ {"label":"K26 (C4,F6)", "x":6, "y":1.5},
+ {"label":"K27 (C4,F7)", "x":7, "y":1.5},
+ {"label":"K28 (C4,A0)", "x":8, "y":1.5},
+ {"label":"K29 (C4,A1)", "x":9, "y":1.5},
+ {"label":"K2A (C4,A2)", "x":10, "y":1.5},
+ {"label":"K2B (C4,A3)", "x":11, "y":1.5},
+ {"label":"K2C (C4,A4)", "x":12, "y":1.5},
+ {"label":"K2D (C4,A5)", "x":13, "y":1.5, "w":2},
+ {"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},
+ {"label":"K33 (C3,F3)", "x":3.5, "y":2.5},
+ {"label":"K34 (C3,F4)", "x":4.5, "y":2.5},
+ {"label":"K35 (C3,F5)", "x":5.5, "y":2.5},
+ {"label":"K36 (C3,F6)", "x":6.5, "y":2.5},
+ {"label":"K37 (C3,F7)", "x":7.5, "y":2.5},
+ {"label":"K38 (C3,A0)", "x":8.5, "y":2.5},
+ {"label":"K39 (C3,A1)", "x":9.5, "y":2.5},
+ {"label":"K3A (C3,A2)", "x":10.5, "y":2.5},
+ {"label":"K3B (C3,A3)", "x":11.5, "y":2.5},
+ {"label":"K3C (C3,A4)", "x":12.5, "y":2.5},
+ {"label":"K3D (C3,A5)", "x":13.5, "y":2.5, "w":1.5},
+ {"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},
+ {"label":"K44 (C2,F4)", "x":3.75, "y":3.5},
+ {"label":"K45 (C2,F5)", "x":4.75, "y":3.5},
+ {"label":"K46 (C2,F6)", "x":5.75, "y":3.5},
+ {"label":"K47 (C2,F7)", "x":6.75, "y":3.5},
+ {"label":"K48 (C2,A0)", "x":7.75, "y":3.5},
+ {"label":"K49 (C2,A1)", "x":8.75, "y":3.5},
+ {"label":"K4A (C2,A2)", "x":9.75, "y":3.5},
+ {"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},
+ {"label":"K54 (C1,F4)", "x":4.25, "y":4.5},
+ {"label":"K55 (C1,F5)", "x":5.25, "y":4.5},
+ {"label":"K56 (C1,F6)", "x":6.25, "y":4.5},
+ {"label":"K57 (C1,F7)", "x":7.25, "y":4.5},
+ {"label":"K58 (C1,A0)", "x":8.25, "y":4.5},
+ {"label":"K59 (C1,A1)", "x":9.25, "y":4.5},
+ {"label":"K5A (C1,A2)", "x":10.25, "y":4.5},
+ {"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},
+ {"label":"K66 (C0,F6)", "x":3.75, "y":5.5, "w":6.25},
+ {"label":"K6A (C0,A2)", "x":10, "y":5.5, "w":1.25},
+ {"label":"K6B (C0,A3)", "x":11.25, "y":5.5, "w":1.25},
+ {"label":"K6C (C0,A4)", "x":12.5, "y":5.5, "w":1.25},
+ {"label":"K6D (C0,A5)", "x":13.75, "y":5.5, "w":1.25},
+ {"label":"K6F (C0,A7)", "x":15.25, "y":5.5},
+ {"label":"K6G (C0,C6)", "x":16.25, "y":5.5},
+ {"label":"K6H (C0,C7)", "x":17.25, "y":5.5}
+ ]
+ }
+ }
+ ,"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
new file mode 100644
index 0000000000..ab009ae58a
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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,
+ 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_ENT,
+ 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(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+};
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..dd680a8391
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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,
+ 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_ENT,
+ 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(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+}; \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/rules.mk b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/hotswap/readme.md b/keyboards/ggkeyboards/genesis/hotswap/readme.md
new file mode 100644
index 0000000000..c93aab1af4
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/readme.md
@@ -0,0 +1,15 @@
+# GG Keyboards Hotswap PCB
+
+A Top mount TKL keyboard from GG Keyboards.
+
+* Keyboard Maintainer: [Stevem Phillips (spooknik)](https://github.com/spooknik)
+* Hardware Supported: Hotswap PCB Rev 1
+* Hardware Availability: Coming Soon!
+
+To enter bootloader for flashing firmware, press layer change key (MO(1)) and "R" Key simultaneously.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ggkeyboards/genesis/hotswap:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ggkeyboards/genesis/hotswap/rules.mk b/keyboards/ggkeyboards/genesis/hotswap/rules.mk
new file mode 100644
index 0000000000..0de06a3443
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/hotswap/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h
new file mode 100644
index 0000000000..76586262ab
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBB00
+#define PRODUCT_ID 0xD4D2
+#define DEVICE_VER 0x0001
+#define MANUFACTURER GG Keyboards
+#define PRODUCT Genesis
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 18
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { C5, C4, C3, C2, C1, C0 }
+#define MATRIX_COL_PINS { 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/ \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json
new file mode 100644
index 0000000000..918f4c2e1b
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/info.json
@@ -0,0 +1,103 @@
+{
+ "keyboard_name": "Genesis",
+ "url": "",
+ "maintainer": "Spooknik",
+ "width": 17,
+ "height": 6,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00 (C5,F0)", "x":0, "y":0},
+ {"label":"K01 (C5,F1)", "x":2, "y":0},
+ {"label":"K02 (C5,F2)", "x":3, "y":0},
+ {"label":"K03 (C5,F3)", "x":4, "y":0},
+ {"label":"K04 (C5,F4)", "x":5, "y":0},
+ {"label":"K05 (C5,F5)", "x":6.5, "y":0},
+ {"label":"K06 (C5,F6)", "x":7.5, "y":0},
+ {"label":"K07 (C5,F7)", "x":8.5, "y":0},
+ {"label":"K08 (C5,A0)", "x":9.5, "y":0},
+ {"label":"K09 (C5,A1)", "x":11, "y":0},
+ {"label":"K0A (C5,A2)", "x":12, "y":0},
+ {"label":"K0B (C5,A3)", "x":13, "y":0},
+ {"label":"K0C (C5,A4)", "x":14, "y":0},
+ {"label":"K0E (C5,A6)", "x":15, "y":0},
+ {"label":"K0F (C5,A7)", "x":16, "y":0},
+ {"label":"K0G (C5,C6)", "x":17, "y":0},
+ {"label":"K10 (C4,F0)", "x":0, "y":1},
+ {"label":"K11 (C4,F1)", "x":1, "y":1},
+ {"label":"K12 (C4,F2)", "x":2, "y":1},
+ {"label":"K13 (C4,F3)", "x":3, "y":1},
+ {"label":"K14 (C4,F4)", "x":4, "y":1},
+ {"label":"K15 (C4,F5)", "x":5, "y":1},
+ {"label":"K16 (C4,F6)", "x":6, "y":1},
+ {"label":"K17 (C4,F7)", "x":7, "y":1},
+ {"label":"K18 (C4,A0)", "x":8, "y":1},
+ {"label":"K19 (C4,A1)", "x":9, "y":1},
+ {"label":"K1A (C4,A2)", "x":10, "y":1},
+ {"label":"K1B (C4,A3)", "x":11, "y":1},
+ {"label":"K1C (C4,A4)", "x":12, "y":1},
+ {"label":"K1D (C4,A5)", "x":13, "y":1},
+ {"label":"K0D (C5,A5)", "x":14, "y":1},
+ {"label":"K1E (C4,A6)", "x":15, "y":1},
+ {"label":"K1F (C4,A7)", "x":16, "y":1},
+ {"label":"K1G (C4,C6)", "x":17, "y":1},
+ {"label":"K20 (C3,F0)", "x":0, "y":2, "w":1.5},
+ {"label":"K21 (C3,F1)", "x":1.5, "y":2},
+ {"label":"K22 (C3,F2)", "x":2.5, "y":2},
+ {"label":"K23 (C3,F3)", "x":3.5, "y":2},
+ {"label":"K24 (C3,F4)", "x":4.5, "y":2},
+ {"label":"K25 (C3,F5)", "x":5.5, "y":2},
+ {"label":"K26 (C3,F6)", "x":6.5, "y":2},
+ {"label":"K27 (C3,F7)", "x":7.5, "y":2},
+ {"label":"K28 (C3,A0)", "x":8.5, "y":2},
+ {"label":"K29 (C3,A1)", "x":9.5, "y":2},
+ {"label":"K2A (C3,A2)", "x":10.5, "y":2},
+ {"label":"K2B (C3,A3)", "x":11.5, "y":2},
+ {"label":"K2C (C3,A4)", "x":12.5, "y":2},
+ {"label":"K2D (C3,A5)", "x":13.5, "y":2, "w":1.5},
+ {"label":"K2E (C3,A6)", "x":15, "y":2},
+ {"label":"K2F (C3,A7)", "x":16, "y":2},
+ {"label":"K2G (C3,C6)", "x":17, "y":2},
+ {"label":"K30 (C2,F0)", "x":0, "y":3, "w":1.75},
+ {"label":"K31 (C2,F1)", "x":1.75, "y":3},
+ {"label":"K32 (C2,F2)", "x":2.75, "y":3},
+ {"label":"K33 (C2,F3)", "x":3.75, "y":3},
+ {"label":"K34 (C2,F4)", "x":4.75, "y":3},
+ {"label":"K35 (C2,F5)", "x":5.75, "y":3},
+ {"label":"K36 (C2,F6)", "x":6.75, "y":3},
+ {"label":"K37 (C2,F7)", "x":7.75, "y":3},
+ {"label":"K38 (C2,A0)", "x":8.75, "y":3},
+ {"label":"K39 (C2,A1)", "x":9.75, "y":3},
+ {"label":"K3A (C2,A2)", "x":10.75, "y":3},
+ {"label":"K3B (C2,A3)", "x":11.75, "y":3},
+ {"label":"K3D (C2,A5)", "x":12.75, "y":3, "w":2.25},
+ {"label":"K40 (C1,F0)", "x":0, "y":4, "w":1.25},
+ {"label":"K41 (C1,F1)", "x":1.25, "y":4},
+ {"label":"K42 (C1,F2)", "x":2.25, "y":4},
+ {"label":"K43 (C1,F3)", "x":3.25, "y":4},
+ {"label":"K44 (C1,F4)", "x":4.25, "y":4},
+ {"label":"K45 (C1,F5)", "x":5.25, "y":4},
+ {"label":"K46 (C1,F6)", "x":6.25, "y":4},
+ {"label":"K47 (C1,F7)", "x":7.25, "y":4},
+ {"label":"K48 (C1,A0)", "x":8.25, "y":4},
+ {"label":"K49 (C1,A1)", "x":9.25, "y":4},
+ {"label":"K4A (C1,A2)", "x":10.25, "y":4},
+ {"label":"K4B (C1,A3)", "x":11.25, "y":4},
+ {"label":"K4C (C1,A4)", "x":12.25, "y":4, "w":2.75},
+ {"label":"K4F (C1,A7)", "x":16, "y":4},
+ {"label":"K50 (C0,F0)", "x":0, "y":5, "w":1.25},
+ {"label":"K51 (C0,F1)", "x":1.25, "y":5, "w":1.25},
+ {"label":"K52 (C0,F2)", "x":2.5, "y":5, "w":1.25},
+ {"label":"K56 (C0,F6)", "x":3.75, "y":5, "w":6.25},
+ {"label":"K5A (C0,A2)", "x":10, "y":5, "w":1.25},
+ {"label":"K5B (C0,A3)", "x":11.25, "y":5, "w":1.25},
+ {"label":"K5C (C0,A4)", "x":12.5, "y":5, "w":1.25},
+ {"label":"K5D (C0,A5)", "x":13.75, "y":5, "w":1.25},
+ {"label":"K5E (C0,A6)", "x":15, "y":5},
+ {"label":"K5F (C0,A7)", "x":16, "y":5},
+ {"label":"K5G (C0,C6)", "x":17, "y":5}
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+} \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..98d778f1d1
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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_SPC, 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,
+ 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_ENT,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+}; \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1084a6e220
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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_SPC, 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,
+ 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_ENT,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+}; \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/solder/keymaps/via/rules.mk b/keyboards/ggkeyboards/genesis/solder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/ggkeyboards/genesis/solder/readme.md b/keyboards/ggkeyboards/genesis/solder/readme.md
new file mode 100644
index 0000000000..edecaa656b
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/readme.md
@@ -0,0 +1,15 @@
+# GG Keyboards Solder PCB
+
+A Top mount TKL keyboard from GG Keyboards.
+
+* Keyboard Maintainer: [Stevem Phillips (spooknik)](https://github.com/spooknik)
+* Hardware Supported: Solder PCB Rev 1
+* Hardware Availability: Coming Soon!
+
+To enter bootloader for flashing firmware, press layer change key (MO(1)) and "R" Key simultaneously.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ggkeyboards/genesis/solder:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ggkeyboards/genesis/solder/rules.mk b/keyboards/ggkeyboards/genesis/solder/rules.mk
new file mode 100644
index 0000000000..0de06a3443
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ggkeyboards/genesis/solder/solder.c b/keyboards/ggkeyboards/genesis/solder/solder.c
new file mode 100644
index 0000000000..9e1bdeb0ff
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/solder.c
@@ -0,0 +1,22 @@
+
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "solder.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
+
diff --git a/keyboards/ggkeyboards/genesis/solder/solder.h b/keyboards/ggkeyboards/genesis/solder/solder.h
new file mode 100644
index 0000000000..a5a96adf83
--- /dev/null
+++ b/keyboards/ggkeyboards/genesis/solder/solder.h
@@ -0,0 +1,38 @@
+/* Copyright 2021 Steven Phillips (Spooknik)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4F, \
+ K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, KC_NO }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, KC_NO }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, KC_NO, KC_NO, KC_NO }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, KC_NO, K4F, KC_NO, KC_NO }, \
+ { 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 }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file