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

10 files changed, 644 insertions, 0 deletions

diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
new file mode 100644
index 0000000000..cce7904b91
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -0,0 +1,86 @@
+/*
+Copyright 2022 @RoyMeetsWorld
+
+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       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Keystone Caps
+#define PRODUCT         Game Roy ADVANCE
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 9
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3 }
+#define MATRIX_COL_PINS { D4, D0, D1, C6, D7, E6, F4, B2, B6 }
+#define MATRIX_ROW_PINS_RIGHT { D7, E6, B4, B5, B6 }
+#define MATRIX_COL_PINS_RIGHT { C6, D4, D0, D1, B1, F7, F4, F5, F6 }
+#define ENCODERS_PAD_A { B5 }
+#define ENCODERS_PAD_B { B4 }
+#define ENCODERS_PAD_A_RIGHT { B3 }
+#define ENCODERS_PAD_B_RIGHT { B2 }
+#define SOFT_SERIAL_PIN D2
+
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 3
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+
+
+#define QMK_KEYS_PER_SCAN 12
+
+#define RGB_DI_PIN C7
+#ifdef RGB_DI_PIN
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 0
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define ENCODER_RESOLUTION 4
+#endif
diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
new file mode 100644
index 0000000000..797f4dba76
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.c
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 @RoyMeetsWorld
+
+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 "gameroyadvance.h"
+
+
+
+#ifdef ENCODER_ENABLE
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+
+    if (!encoder_update_user(index, clockwise)) { return false; }
+
+    if (index == 0) {
+
+        if (clockwise) {
+
+            tap_code_delay(KC_VOLU, 10);
+
+        } else {
+
+            tap_code_delay(KC_VOLD, 10);
+
+        }
+
+    }
+
+    return true;
+
+}
+
+#endif
diff --git a/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h
new file mode 100644
index 0000000000..01cb32b572
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/gameroyadvance.h
@@ -0,0 +1,104 @@
+/*
+Copyright 2022 @RoyMeetsWorld
+
+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"
+
+/**
+ * The layout macro for ANSI boards, with illustrative grid of a typical assignment.
+ *   ┌───┬───┬───┬───┬───┬───┬───┐                              ┌───┬───┬───┬───┬───┬───┬───────┐
+ *   │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │                              │ 7 │ 8 │ 9 │ 0 │ - │ + │ BACK  │
+ * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐        ┌───┬───┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │        │F7 │F8 │  │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤        ├───┼───┤  └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ CAPS │ A │ S │ D │ F │ G │   │F3 │F4 │        │F9 │F10│   │ H │ J │ K │ L │ ; │ ' │  Enter │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤        ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │ LSHIFT │ Z │ X │ C │ V │ B │ │F5 │F6 │        │F11│F12│ │ B │ N │ M │ , │ . │ / │  RSHIFT  │
+ * ├────┬───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘        └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────│
+ * │LCTL│LGUI│LALT│ FN │    │SPC │MUTE│                │MUTE│SPCE│          │RALT│ FN │RGUI│RCTL│
+ * └────┴────┴────┴────┘    └────┼────┤                ├────┼────┘          └────┴────┴────┴────┘
+ *                               │ENTR│                │ENTR│
+ *                               └────┘                └────┘
+ */
+#define LAYOUT(                                                                                            \
+	L00, L01, L02, L03, L04, L05, L06,                        R00, R01, R02, R03, R04, R05,      R07,      \
+	L10, L11, L12, L13, L14, L15, L16, L17, L18,    R10, R11, R12, R13, R14, R15, R16, R17, R18,      R28, \
+	L20, L21, L22, L23, L24, L25,      L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27,      R38,      \
+	L30,      L31, L32, L33, L34, L35, L37, L38,    R30, R31, R32, R33, R34, R35, R36, R37,      R46,      \
+	L40, L41, L42, L43,           L45, L48,              R40, R42,                     R43, R44, R45, R47, \
+	                                   L47,              R41                                               \
+) \
+{ \
+	{ L00,   L01,   L02,   L03,   L04,   L05,   L06,   KC_NO, KC_NO }, \
+	{ L10,   L11,   L12,   L13,   L14,   L15,   L16,   L17,   L18   }, \
+	{ L20,   L21,   L22,   L23,   L24,   L25,   KC_NO, L27,   L28   }, \
+	{ L30,   L31,   L32,   L33,   L34,   L35,   KC_NO, L37,   L38   }, \
+	{ L40,   L41,   L42,   L43,   KC_NO, L45,   KC_NO, L47,   L48   }, \
+	{ R00,   R01,   R02,   R03,   R04,   R05,   KC_NO, R07,   KC_NO }, \
+	{ R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18   }, \
+	{ R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27,   R28   }, \
+	{ R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38   }, \
+	{ R40,   R41,   R42,   R43,   R44,   R45,   R46,   R47,   KC_NO }  \
+}
+
+/**
+ * The layout macro for split-key boards, with illustrative grid of a typical assignment.
+ *
+ * Backspace has two options with three distinct pads:
+ *     - center pad (regular 2u backspace)
+ *     - left pad + right pad (split backspace)
+ *
+ * You may wish to set the unused pad(s) to KC_NO or XXXXXX, as they will be ignored.
+ *                                                                                      ┌───────┐
+ *                                                                                      │ BACK  │   (R07)
+ *                                                                                      └───────┘
+ *                                                                                          | 
+ *   ┌───┬───┬───┬───┬───┬───┬───┐                              ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ *   │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │                              │ 7 │ 8 │ 9 │ 0 │ - │ + │ \ │BCK│ (R06 R08)
+ * ┌─┴───┼───┼───┼───┼───┼───┼───┤┌───┬───┐        ┌───┬───┐  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ TAB │ Q │ W │ E │ R │ T │ Y ││F1 │F2 │        │F7 │F8 │  │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘├───┼───┤        ├───┼───┤  └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ CAPS │ A │ S │ D │ F │ G │   │F3 │F4 │        │F9 │F10│   │ H │ J │ K │ L │ ; │ ' │  Enter │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ├───┼───┤        ├───┼───┤ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │LSFT│ \ │ Z │ X │ C │ V │ B │ │F5 │F6 │        │F11│F12│ │ B │ N │ M │ , │ . │ / │RSHIFT│PSC│
+ * ├────┼───┴┬──┴─┬─┴──┬┴───┼───┴┬┴───┼───┘        └───┼───┴┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───│
+ * │LCTL│LGUI│LALT│ FN │    │SPC │MUTE│                │MUTE│SPCE│          │RALT│ FN │RGUI│RCTL│
+ * └────┴────┴────┴────┘    └────┼────┤                ├────┼────┘          └────┴────┴────┴────┘
+ *                               │ENTR│                │ENTR│
+ *                               └────┘                └────┘
+ */
+#define LAYOUT_all(                                                                                        \
+	L00, L01, L02, L03, L04, L05, L06,                        R00, R01, R02, R03, R04, R05, R06, R07, R08, \
+	L10, L11, L12, L13, L14, L15, L16, L17, L18,    R10, R11, R12, R13, R14, R15, R16, R17, R18,      R28, \
+	L20, L21, L22, L23, L24, L25,      L27, L28,    R20, R21, R22, R23, R24, R25, R26, R27,      R38,      \
+	L30, L44, L31, L32, L33, L34, L35, L37, L38,    R30, R31, R32, R33, R34, R35, R36, R37,      R46, R48, \
+	L40, L41, L42, L43,           L45, L48,              R40, R42,                R43, R44,      R45, R47, \
+	                                   L47,              R41                                               \
+) \
+{ \
+	{ L00,   L01,   L02,   L03,   L04,   L05,   L06,   KC_NO, KC_NO }, \
+	{ L10,   L11,   L12,   L13,   L14,   L15,   L16,   L17,   L18   }, \
+	{ L20,   L21,   L22,   L23,   L24,   L25,   KC_NO, L27,   L28   }, \
+	{ L30,   L31,   L32,   L33,   L34,   L35,   KC_NO, L37,   L38   }, \
+	{ L40,   L41,   L42,   L43,   L44,   L45,   KC_NO, L47,   L48   }, \
+	{ R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08   }, \
+	{ R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18   }, \
+	{ R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27,   R28   }, \
+	{ R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38   }, \
+	{ R40,   R41,   R42,   R43,   R44,   R45,   R46,   R47,   R48   }  \
+}
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
new file mode 100644
index 0000000000..f907de9326
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -0,0 +1,216 @@
+{
+    "keyboard_name": "Game Roy ADVANCE",
+    "maintainer": "@RoyMeetsWorld",
+    "url": "https://keystonecaps.store/?product=game-roy-advance-game-pad-group-buy-preorder",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x": 1,     "y": 0 },
+                { "x": 2,     "y": 0 },
+                { "x": 3,     "y": 0 },
+                { "x": 4,     "y": 0 },
+                { "x": 5,     "y": 0 },
+                { "x": 6,     "y": 0 },
+                { "x": 7,     "y": 0 },
+
+                { "x": 13.75, "y": 0 },
+                { "x": 14.75, "y": 0 },
+                { "x": 15.75, "y": 0 },
+                { "x": 16.75, "y": 0 },
+                { "x": 17.75, "y": 0 },
+                { "x": 18.75, "y": 0 },
+                { "x": 19.75, "y": 0, "w": 2 },
+                
+                { "x": 0.5,   "y": 1, "w": 1.5 },
+                { "x": 2,     "y": 1 },
+                { "x": 3,     "y": 1 },
+                { "x": 4,     "y": 1 },
+                { "x": 5,     "y": 1 },
+                { "x": 6,     "y": 1 },
+                { "x": 7,     "y": 1 },
+
+                { "x": 8.25,  "y": 1 },
+                { "x": 9.25,  "y": 1 },
+
+                { "x": 11,    "y": 1 },
+                { "x": 12,    "y": 1 },
+
+                { "x": 13.75, "y": 1 },
+                { "x": 14.75, "y": 1 },
+                { "x": 15.75, "y": 1 },
+                { "x": 16.75, "y": 1 },
+                { "x": 17.75, "y": 1 },
+                { "x": 18.75, "y": 1 },
+                { "x": 19.75, "y": 1 },
+                { "x": 20.75, "y": 1, "w": 1.5 },
+
+                { "x": 0.5,   "y": 2, "w": 1.75 },
+                { "x": 2.25,  "y": 2 },
+                { "x": 3.25,  "y": 2 },
+                { "x": 4.25,  "y": 2 },
+                { "x": 5.25,  "y": 2 },
+                { "x": 6.25,  "y": 2 },
+
+                { "x": 8.25,  "y": 2 },
+                { "x": 9.25,  "y": 2 },
+
+                { "x": 11,    "y": 2 },
+                { "x": 12,    "y": 2 },
+
+                { "x": 14,    "y": 2 },
+                { "x": 15,    "y": 2 },
+                { "x": 16,    "y": 2 },
+                { "x": 17,    "y": 2 },
+                { "x": 18,    "y": 2 },
+                { "x": 19,    "y": 2 },
+                { "x": 20,    "y": 2, "w": 2.25 },
+
+                { "x": 0.5,   "y": 3, "w": 2.25 },
+                { "x": 2.75,  "y": 3 },
+                { "x": 3.75,  "y": 3 },
+                { "x": 4.75,  "y": 3 },
+                { "x": 5.75,  "y": 3 },
+                { "x": 6.75,  "y": 3 },
+
+                { "x": 8.25,  "y": 3 },
+                { "x": 9.25,  "y": 3 },
+
+                { "x": 11,    "y": 3 },
+                { "x": 12,    "y": 3 },
+
+                { "x": 13.5,  "y": 3 },
+                { "x": 14.5,  "y": 3 },
+                { "x": 15.5,  "y": 3 },
+                { "x": 16.5,  "y": 3 },
+                { "x": 17.5,  "y": 3 },
+                { "x": 18.5,  "y": 3 },
+                { "x": 19.5,  "y": 3, "w": 2.75 },
+
+                { "x": 1,     "y": 4, "w": 1.25 },
+                { "x": 2.25,  "y": 4, "w": 1.25 },
+                { "x": 3.5,   "y": 4, "w": 1.25 },
+                { "x": 4.75,  "y": 4, "w": 1.25 },
+
+                { "x": 7,     "y": 4, "h": 1.5 },
+                { "x": 8,     "y": 4 },
+
+                { "x": 12.25, "y": 4 },
+                { "x": 13.25, "y": 4, "h": 1.5 },
+
+                { "x": 16.75, "y": 4, "w": 1.25 },
+                { "x": 18,    "y": 4, "w": 1.25 },
+                { "x": 19.25, "y": 4, "w": 1.25 },
+                { "x": 20.5,  "y": 4, "w": 1.25 },
+                
+                { "x": 8,     "y": 5, "h": 1.5 },
+                { "x": 12.25, "y": 5, "h": 1.5 }
+            ] },
+        "LAYOUT_all": {
+            "layout": [
+                { "x": 1,     "y": 0 },
+                { "x": 2,     "y": 0 },
+                { "x": 3,     "y": 0 },
+                { "x": 4,     "y": 0 },
+                { "x": 5,     "y": 0 },
+                { "x": 6,     "y": 0 },
+                { "x": 7,     "y": 0 },
+
+                { "x": 13.75, "y": 0 },
+                { "x": 14.75, "y": 0 },
+                { "x": 15.75, "y": 0 },
+                { "x": 16.75, "y": 0 },
+                { "x": 17.75, "y": 0 },
+                { "x": 18.75, "y": 0 },
+                { "x": 19.75, "y": 0 },
+                { "x": 22.75, "y": 0, "w": 2 },
+                { "x": 20.75, "y": 0 },
+
+                { "x": 0.5,   "y": 1, "w": 1.5 },                
+                { "x": 2,     "y": 1 },
+                { "x": 3,     "y": 1 },
+                { "x": 4,     "y": 1 },
+                { "x": 5,     "y": 1 },
+                { "x": 6,     "y": 1 },
+                { "x": 7,     "y": 1 },
+
+                { "x": 8.25,  "y": 1 },
+                { "x": 9.25,  "y": 1 },
+
+                { "x": 11,    "y": 1 },
+                { "x": 12,    "y": 1 },
+
+                { "x": 13.75, "y": 1 },
+                { "x": 14.75, "y": 1 },
+                { "x": 15.75, "y": 1 },
+                { "x": 16.75, "y": 1 },
+                { "x": 17.75, "y": 1 },
+                { "x": 18.75, "y": 1 },
+                { "x": 19.75, "y": 1 },
+                { "x": 20.75, "y": 1, "w": 1.5 },
+
+                { "x": 0.5,   "y": 2, "w": 1.75 },
+                { "x": 2.25,  "y": 2 },
+                { "x": 3.25,  "y": 2 },
+                { "x": 4.25,  "y": 2 },
+                { "x": 5.25,  "y": 2 },
+                { "x": 6.25,  "y": 2 },
+
+                { "x": 8.25,  "y": 2 },
+                { "x": 9.25,  "y": 2 },
+                
+                { "x": 11,    "y": 2 },
+                { "x": 12,    "y": 2 },
+                
+                { "x": 14,    "y": 2 },
+                { "x": 15,    "y": 2 },
+                { "x": 16,    "y": 2 },
+                { "x": 17,    "y": 2 },
+                { "x": 18,    "y": 2 },
+                { "x": 19,    "y": 2 },
+                { "x": 20,    "y": 2, "w": 2.25 },
+
+                { "x": 0.5,   "y": 3, "w": 1.75 },
+                { "x": 1.75,  "y": 3 },
+                { "x": 2.75,  "y": 3 },
+                { "x": 3.75,  "y": 3 },
+                { "x": 4.75,  "y": 3 },
+                { "x": 5.75,  "y": 3 },
+                { "x": 6.75,  "y": 3 },
+                
+                { "x": 8.25,  "y": 3 },
+                { "x": 9.25,  "y": 3 },
+                
+                { "x": 11,    "y": 3 },
+                { "x": 12,    "y": 3 },
+                
+                { "x": 13.5,  "y": 3 },
+                { "x": 14.5,  "y": 3 },
+                { "x": 15.5,  "y": 3 },
+                { "x": 16.5,  "y": 3 },
+                { "x": 17.5,  "y": 3 },
+                { "x": 18.5,  "y": 3 },
+                { "x": 19.5,  "y": 3, "w": 1.75 },
+                { "x": 21.25, "y": 3 },
+
+                { "x": 1,     "y": 4, "w": 1.25 },
+                { "x": 2.25,  "y": 4, "w": 1.25 },
+                { "x": 3.5,   "y": 4, "w": 1.25 },
+                { "x": 4.75,  "y": 4, "w": 1.25 },
+
+                { "x": 7,     "y": 4, "h": 1.5 },
+                { "x": 8,     "y": 4 },
+
+                { "x": 12.25, "y": 4 },
+                { "x": 13.25, "y": 4, "h": 1.5 },
+
+                { "x": 16.75, "y": 4, "w": 1.25 },
+                { "x": 18,    "y": 4, "w": 1.25 },
+                { "x": 19.25, "y": 4, "w": 1.25 },
+                { "x": 20.5,  "y": 4, "w": 1.25 },
+
+                { "x": 8,     "y": 5, "h": 1.5 },
+                { "x": 12.25, "y": 5, "h": 1.5 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h b/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h
new file mode 100644
index 0000000000..693d5684c1
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/keymaps/default/config.h
@@ -0,0 +1,25 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2018 Danny Nguyen <danny@keeb.io>
+
+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
+
+//#define USE_SERIAL
+#define EE_HANDS
\ No newline at end of file
diff --git a/keyboards/keystonecaps/gameroyadvance/keymaps/default/keymap.c b/keyboards/keystonecaps/gameroyadvance/keymaps/default/keymap.c
new file mode 100644
index 0000000000..268a158ee1
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 @RoyMeetsWorld
+
+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
+
+enum layers {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = 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_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_F1,   KC_F2,           KC_F7,   KC_F8,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_F3,   KC_F4,           KC_F9,   KC_F10,  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_F5,   KC_F6,           KC_F11,  KC_F12,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, 
+		KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),                   KC_SPC,  KC_MUTE,                           KC_MUTE, KC_SPC,                             KC_RALT, MO(_FN),          KC_RGUI, KC_RCTL, 
+                                                                       KC_ENT,                            KC_ENT
+ ),
+
+   [_FN] = LAYOUT( 
+		KC_TILD, 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_DEL,
+		KC_TRNS, KC_TRNS, KC_UP,   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_PSCR, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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/keystonecaps/gameroyadvance/keymaps/default_all/config.h b/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/config.h
new file mode 100644
index 0000000000..693d5684c1
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/config.h
@@ -0,0 +1,25 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2018 Danny Nguyen <danny@keeb.io>
+
+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
+
+//#define USE_SERIAL
+#define EE_HANDS
\ No newline at end of file
diff --git a/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/keymap.c b/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/keymap.c
new file mode 100644
index 0000000000..a6adf3f952
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/keymaps/default_all/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 @RoyMeetsWorld
+
+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
+
+enum layers {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_all(
+		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_BSLS, KC_BSPC, KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_F1,   KC_F2,           KC_F7,   KC_F8,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_F3,   KC_F4,           KC_F9,   KC_F10,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F5,   KC_F6,           KC_F11,  KC_F12,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_PSCR,
+		KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),                   KC_SPC,  KC_MUTE,                           KC_MUTE, KC_SPC,                             KC_RALT, MO(_FN),          KC_RGUI, KC_RCTL, 
+                                                                       KC_ENT,                            KC_ENT
+ ),
+
+   [_FN] = LAYOUT_all( 
+		KC_TILD, 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_DEL,
+		KC_TRNS, KC_TRNS, KC_UP,   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_PSCR, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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/keystonecaps/gameroyadvance/readme.md b/keyboards/keystonecaps/gameroyadvance/readme.md
new file mode 100644
index 0000000000..cc733cea46
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/readme.md
@@ -0,0 +1,30 @@
+# Game Roy ADVANCE
+
+![Game Roy ADVANCE](https://i.imgur.com/N6RI4fUh.jpg)
+![GRALAYOUTS](https://i.imgur.com/lHjTRQK.png)
+
+A one-handed, expandable game pad designed to take your pc gaming to the next level. Designed by [Keystone Caps](https://keystonecaps.store).
+
+* Keyboard Maintainer: [RoyMeetsWorld](https://github.com/ROYMEETSWORLD)
+* Hardware Supported: Game Roy ADVANCE
+* Hardware Availability: [keystonecaps.store](https://keystonecaps.store)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keystonecaps/gameroyadvance:default
+
+Flashing example for this keyboard:
+
+    make keystonecaps/gameroyadvance: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` (FN + Escape by default)
+
+Special thanks to @tpstevens for all of his hard work in creating these firmware files from the mess that I had made.
diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk
new file mode 100644
index 0000000000..be3b8b9a61
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina # For Pro Micro
+# BOOTLOADER = qmk-dfu # For Elite-C
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes
+SPLIT_KEYBOARD = yes
\ No newline at end of file