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

11 files changed, 429 insertions, 0 deletions

diff --git a/keyboards/gray_studio/apollo80/apollo80.c b/keyboards/gray_studio/apollo80/apollo80.c
new file mode 100644
index 0000000000..842a63f318
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/apollo80.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * 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 "apollo80.h"
+
+
diff --git a/keyboards/gray_studio/apollo80/apollo80.h b/keyboards/gray_studio/apollo80/apollo80.h
new file mode 100644
index 0000000000..be3a3ee54d
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/apollo80.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * 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,      K02, K03, K04, K05,    K07, K08, K09, K0A,    K0B, K0C, K0D,K06,  K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,  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,     K4D,       K4F,       \
+    K50,  K51,  K52,              K56,                K5A,  K5B,  K5C,  K5D,    K5E, K5F, K5G   \
+) { \
+    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   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,   KC_NO, K3D,   K3E,   KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   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   }, \
+}
+
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
new file mode 100644
index 0000000000..f00550fb65
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -0,0 +1,71 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+
+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       0x4753
+#define PRODUCT_ID      0x3001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Graystudio
+#define PRODUCT         apollo80
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * 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 { D1, D0, B3, B0, B2, B1 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 22
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+
+    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+    /*== 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
+    #define RGBLIGHT_EFFECT_TWINKLE
+#endif
+
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
new file mode 100644
index 0000000000..c0e3efdb88
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "apollo 80",
+    "url": "https://graystudio.club/products/gb-space80-apollo",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D1,F0)", "x":0, "y":0},
+                {"label":"K02 (D1,F4)", "x":2, "y":0},
+                {"label":"K03 (D1,F5)", "x":3, "y":0},
+                {"label":"K04 (D1,F6)", "x":4, "y":0},
+                {"label":"K05 (D1,F7)", "x":5, "y":0},
+                {"label":"K06 (D1,C7)", "x":6.5, "y":0},
+                {"label":"K07 (D1,C6)", "x":7.5, "y":0},
+                {"label":"K08 (D1,B6)", "x":8.5, "y":0},
+                {"label":"K09 (D1,B5)", "x":9.5, "y":0},
+                {"label":"K0A (D1,B4)", "x":11, "y":0},
+                {"label":"K0B (D1,D7)", "x":12, "y":0},
+                {"label":"K0C (D1,D4)", "x":13, "y":0},
+                {"label":"K0D (D1,D6)", "x":14, "y":0},
+                {"label":"K0E (D1,D2)", "x":15.25, "y":0},
+                {"label":"K0F (D1,D3)", "x":16.25, "y":0},
+                {"label":"K0G (D1,D5)", "x":17.25, "y":0},
+                {"label":"K10 (D0,F0)", "x":0, "y":1.5},
+                {"label":"K11 (D0,F1)", "x":1, "y":1.5},
+                {"label":"K12 (D0,F4)", "x":2, "y":1.5},
+                {"label":"K13 (D0,F5)", "x":3, "y":1.5},
+                {"label":"K14 (D0,F6)", "x":4, "y":1.5},
+                {"label":"K15 (D0,F7)", "x":5, "y":1.5},
+                {"label":"K16 (D0,C7)", "x":6, "y":1.5},
+                {"label":"K17 (D0,C6)", "x":7, "y":1.5},
+                {"label":"K18 (D0,B6)", "x":8, "y":1.5},
+                {"label":"K19 (D0,B5)", "x":9, "y":1.5},
+                {"label":"K1A (D0,B4)", "x":10, "y":1.5},
+                {"label":"K1B (D0,D7)", "x":11, "y":1.5},
+                {"label":"K1C (D0,D4)", "x":12, "y":1.5},
+                {"label":"K1D (D0,D6)", "x":13, "y":1.5},
+                {"label":"K3E (B0,D2)", "x":14, "y":1.5},
+                {"label":"K1E (D0,D2)", "x":15.25, "y":1.5},
+                {"label":"K1F (D0,D3)", "x":16.25, "y":1.5},
+                {"label":"K1G (D0,D5)", "x":17.25, "y":1.5},
+                {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B3,F1)", "x":1.5, "y":2.5},
+                {"label":"K22 (B3,F4)", "x":2.5, "y":2.5},
+                {"label":"K23 (B3,F5)", "x":3.5, "y":2.5},
+                {"label":"K24 (B3,F6)", "x":4.5, "y":2.5},
+                {"label":"K25 (B3,F7)", "x":5.5, "y":2.5},
+                {"label":"K26 (B3,C7)", "x":6.5, "y":2.5},
+                {"label":"K27 (B3,C6)", "x":7.5, "y":2.5},
+                {"label":"K28 (B3,B6)", "x":8.5, "y":2.5},
+                {"label":"K29 (B3,B5)", "x":9.5, "y":2.5},
+                {"label":"K2A (B3,B4)", "x":10.5, "y":2.5},
+                {"label":"K2B (B3,D7)", "x":11.5, "y":2.5},
+                {"label":"K2C (B3,D4)", "x":12.5, "y":2.5},
+                {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K2E (B3,D2)", "x":15.25, "y":2.5},
+                {"label":"K2F (B3,D3)", "x":16.25, "y":2.5},
+                {"label":"K2G (B3,D5)", "x":17.25, "y":2.5},
+                {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B0,F1)", "x":1.75, "y":3.5},
+                {"label":"K32 (B0,F4)", "x":2.75, "y":3.5},
+                {"label":"K33 (B0,F5)", "x":3.75, "y":3.5},
+                {"label":"K34 (B0,F6)", "x":4.75, "y":3.5},
+                {"label":"K35 (B0,F7)", "x":5.75, "y":3.5},
+                {"label":"K36 (B0,C7)", "x":6.75, "y":3.5},
+                {"label":"K37 (B0,C6)", "x":7.75, "y":3.5},
+                {"label":"K38 (B0,B6)", "x":8.75, "y":3.5},
+                {"label":"K39 (B0,B5)", "x":9.75, "y":3.5},
+                {"label":"K3A (B0,B4)", "x":10.75, "y":3.5},
+                {"label":"K3B (B0,D7)", "x":11.75, "y":3.5},
+                {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25},
+                {"label":"K41 (B2,F1)", "x":1.25, "y":4.5},
+                {"label":"K42 (B2,F4)", "x":2.25, "y":4.5},
+                {"label":"K43 (B2,F5)", "x":3.25, "y":4.5},
+                {"label":"K44 (B2,F6)", "x":4.25, "y":4.5},
+                {"label":"K45 (B2,F7)", "x":5.25, "y":4.5},
+                {"label":"K46 (B2,C7)", "x":6.25, "y":4.5},
+                {"label":"K47 (B2,C6)", "x":7.25, "y":4.5},
+                {"label":"K48 (B2,B6)", "x":8.25, "y":4.5},
+                {"label":"K49 (B2,B5)", "x":9.25, "y":4.5},
+                {"label":"K4A (B2,B4)", "x":10.25, "y":4.5},
+                {"label":"K4B (B2,D7)", "x":11.25, "y":4.5},
+                {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"K4D (B2,D6)", "x":14, "y":4.5},
+                {"label":"K4F (B2,D3)", "x":16.25, "y":4.5},
+                {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25},
+                {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25},
+                {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"K5E (B1,D2)", "x":15.25, "y":5.5},
+                {"label":"K5F (B1,D3)", "x":16.25, "y":5.5},
+                {"label":"K5G (B1,D5)", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/gray_studio/apollo80/keymaps/default/config.h b/keyboards/gray_studio/apollo80/keymaps/default/config.h
new file mode 100644
index 0000000000..68ad650de4
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+
+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 RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/gray_studio/apollo80/keymaps/default/keymap.c b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b4eb52630e
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * 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_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_NUBS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        KC_RSFT,             KC_UP,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   MO(1),     KC_RGUI,   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______, NK_TOGG, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+
+};
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0,4, HSV_WHITE}
+);     
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/config.h b/keyboards/gray_studio/apollo80/keymaps/via/config.h
new file mode 100644
index 0000000000..68ad650de4
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+
+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 RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/keymap.c b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..27f0a2c2c0
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * 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_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_NUBS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        KC_RSFT,             KC_UP,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   MO(1),     KC_RGUI,   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______, NK_TOGG, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+    [2] = LAYOUT(
+       _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______,           _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+
+};
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0,4, HSV_WHITE}
+);     
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/rules.mk b/keyboards/gray_studio/apollo80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gray_studio/apollo80/readme.md b/keyboards/gray_studio/apollo80/readme.md
new file mode 100644
index 0000000000..e70e104ef3
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/readme.md
@@ -0,0 +1,26 @@
+# APOLLO 80
+
+80% / TKL keyboard with a 5.5 degree angle ran by Airpotter. PCB Manufactured by DEMO Studio and Keyboard manufactured by Gray Studio.
+
+-   Keyboard Maintainer: [Chris Beswick](https://github.com/ChrisBeswick/)
+-   Hardware Supported: Stock / Default Apollo80 PCB
+-   Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=110033.0)
+-   Group Buy Location: [Graystudio.club](https://graystudio.club/products/gb-space80-apollo)
+
+How to build this firmware using QMK MSYS
+
+    qmk compile -kb gray_studio/apollo80 -km default
+
+Make example for this keyboard (after setting up your build environment using make):
+
+    make gray_studio/apollo80: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+-   **Physical reset button**: Bridge the pads labelled 'RE' underneath the Space Bar.
+-   **Keycode in layout**: Hold MO(1) and press ESC (If you've changed bindings from the default, this may not be the case)
diff --git a/keyboards/gray_studio/apollo80/rules.mk b/keyboards/gray_studio/apollo80/rules.mk
new file mode 100644
index 0000000000..cb5238f27d
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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 = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file