Merge remote-tracking branch 'origin/master' into develop

9 files changed, 358 insertions, 0 deletions

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/