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

20 files changed, 661 insertions, 0 deletions

diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h
new file mode 100644
index 0000000000..e9a6b80b14
--- /dev/null
+++ b/keyboards/studiokestra/galatea/config.h
@@ -0,0 +1,77 @@
+/*
+Copyright 2021 Studio Kestra
+
+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       0x7C10
+#define MANUFACTURER    Studio Kestra
+#define PRODUCT         Galatea
+
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B2, D5 }
+#define MATRIX_ROW_PINS { D1, D0, B0, B7, E6, B3, B6, C6, D6, D7, B4, D3 }
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN B5
+#define LED_SCROLL_LOCK_PIN D2
+#define LED_PIN_ON_STATE 0
+
+#if defined(KEYBOARD_studiokestra_galatea_rev2)
+  #define RGB_DI_PIN D4
+  #define RGBLED_NUM 24
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+   #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
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/studiokestra/galatea/galatea.c b/keyboards/studiokestra/galatea/galatea.c
new file mode 100644
index 0000000000..30e7939159
--- /dev/null
+++ b/keyboards/studiokestra/galatea/galatea.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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 "galatea.h"
diff --git a/keyboards/studiokestra/galatea/galatea.h b/keyboards/studiokestra/galatea/galatea.h
new file mode 100644
index 0000000000..a1f2aa77b5
--- /dev/null
+++ b/keyboards/studiokestra/galatea/galatea.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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"
+
+#if defined(KEYBOARD_studiokestra_galatea_rev1)
+    #include "rev1.h"
+#elif defined(KEYBOARD_studiokestra_galatea_rev2)
+    #include "rev2.h"
+#endif
diff --git a/keyboards/studiokestra/galatea/keymaps/default/keymap.c b/keyboards/studiokestra/galatea/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8224c98751
--- /dev/null
+++ b/keyboards/studiokestra/galatea/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+ /* Copyright 2021 Studio Kestra
+  * 
+  * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 
+
+    [_BASE] = LAYOUT_all(
+    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_F13,                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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,    MO(1),                          KC_UP,          
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT,          KC_RGUI,  KC_APP,   KC_RCTRL,                          KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+    [_FN] = LAYOUT_all(
+    RESET,   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, 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 ),
+};
\ No newline at end of file
diff --git a/keyboards/studiokestra/galatea/keymaps/default/readme.md b/keyboards/studiokestra/galatea/keymaps/default/readme.md
new file mode 100644
index 0000000000..1dbd94b7bf
--- /dev/null
+++ b/keyboards/studiokestra/galatea/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Galatea
diff --git a/keyboards/studiokestra/galatea/keymaps/via/keymap.c b/keyboards/studiokestra/galatea/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6d49b79bef
--- /dev/null
+++ b/keyboards/studiokestra/galatea/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+ /* Copyright 2021 Studio Kestra
+  * 
+  * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT_all(
+       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_F13,                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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,    MO(1),                          KC_UP,          
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT,          KC_RGUI,  KC_APP,   KC_RCTRL,                          KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+    [_FN1] = LAYOUT_all(
+    RESET,   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, 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 ),
+
+    [_FN2] = LAYOUT_all(
+    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, 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/studiokestra/galatea/keymaps/via/readme.md b/keyboards/studiokestra/galatea/keymaps/via/readme.md
new file mode 100644
index 0000000000..a54a78203e
--- /dev/null
+++ b/keyboards/studiokestra/galatea/keymaps/via/readme.md
@@ -0,0 +1 @@
+# Studio Kestra's Galatea keymap for VIA
diff --git a/keyboards/studiokestra/galatea/keymaps/via/rules.mk b/keyboards/studiokestra/galatea/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/studiokestra/galatea/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/studiokestra/galatea/readme.md b/keyboards/studiokestra/galatea/readme.md
new file mode 100644
index 0000000000..1268c596bf
--- /dev/null
+++ b/keyboards/studiokestra/galatea/readme.md
@@ -0,0 +1,27 @@
+# Galatea
+
+TKL H87/88c compatible PCB with support for the most common layouts.
+
+* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/)
+* Hardware Supported: [studiokestra.ca/galatea](https://studiokestra.ca/galatea/)
+* Hardware Availability: In-Stock Sale (Dec 2021)
+* Rev1 firmware is used for Galatea PCBs with no RGB underglow.
+* Rev2 firmware is used for Galatea PCBs with RGB underglow. 
+
+## Bootload Sequence
+
+There are 3 ways to put the board in bootloader mode:
+
+- Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR
+- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR
+- With the default layout, toggle Layer 1 and press the `R` key. 
+
+## Compiling Firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make studiokestra/galatea/rev1:default
+
+If no revision is specified, it will build rev1 firmware by 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/studiokestra/galatea/rev1/config.h b/keyboards/studiokestra/galatea/rev1/config.h
new file mode 100644
index 0000000000..9f8fb44f9a
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev1/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021 Studio Kestra
+
+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 PRODUCT_ID      0x8801
+#define DEVICE_VER      0x0001
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
new file mode 100644
index 0000000000..46e07d7a43
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "Galatea",
+    "url": "https://studiokestra.ca/galatea",
+    "maintainer": "Studio Kestra",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0}, 
+                {"label":"F1", "x":1.25, "y":0}, 
+                {"label":"F2", "x":2.25, "y":0}, 
+                {"label":"F3", "x":3.25, "y":0}, 
+                {"label":"F4", "x":4.25, "y":0}, 
+                {"label":"F5", "x":5.5, "y":0}, 
+                {"label":"F6", "x":6.5, "y":0}, 
+                {"label":"F7", "x":7.5, "y":0}, 
+                {"label":"F8", "x":8.5, "y":0}, 
+                {"label":"F9", "x":9.75, "y":0}, 
+                {"label":"F10", "x":10.75, "y":0}, 
+                {"label":"F11", "x":11.75, "y":0}, 
+                {"label":"F12", "x":12.75, "y":0}, 
+                {"label":"F13", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "y":0}, 
+                {"label":"~", "x":0, "y":1.25}, 
+                {"label":"!", "x":1, "y":1.25}, 
+                {"label":"@", "x":2, "y":1.25}, 
+                {"label":"#", "x":3, "y":1.25}, 
+                {"label":"$", "x":4, "y":1.25}, 
+                {"label":"%", "x":5, "y":1.25}, 
+                {"label":"^", "x":6, "y":1.25}, 
+                {"label":"&", "x":7, "y":1.25}, 
+                {"label":"*", "x":8, "y":1.25}, 
+                {"label":"(", "x":9, "y":1.25}, 
+                {"label":")", "x":10, "y":1.25}, 
+                {"label":"_", "x":11, "y":1.25}, 
+                {"label":"+", "x":12, "y":1.25}, 
+                {"label":"|", "x":13, "y":1.25}, 
+                {"label":"Delete", "x":14, "y":1.25}, 
+                {"label":"Insert", "x":15.25, "y":1.25}, 
+                {"label":"Home", "x":16.25, "y":1.25}, 
+                {"label":"PgUp", "x":17.25, "y":1.25}, 
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
+                {"label":"Q", "x":1.5, "y":2.25}, 
+                {"label":"W", "x":2.5, "y":2.25}, 
+                {"label":"E", "x":3.5, "y":2.25}, 
+                {"label":"R", "x":4.5, "y":2.25}, 
+                {"label":"T", "x":5.5, "y":2.25}, 
+                {"label":"Y", "x":6.5, "y":2.25}, 
+                {"label":"U", "x":7.5, "y":2.25}, 
+                {"label":"I", "x":8.5, "y":2.25}, 
+                {"label":"O", "x":9.5, "y":2.25}, 
+                {"label":"P", "x":10.5, "y":2.25}, 
+                {"label":"{", "x":11.5, "y":2.25}, 
+                {"label":"}", "x":12.5, "y":2.25}, 
+                {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, 
+                {"label":"Delete", "x":15.25, "y":2.25}, 
+                {"label":"End", "x":16.25, "y":2.25}, 
+                {"label":"PgDn", "x":17.25, "y":2.25}, 
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
+                {"label":"A", "x":1.75, "y":3.25}, 
+                {"label":"S", "x":2.75, "y":3.25}, 
+                {"label":"D", "x":3.75, "y":3.25}, 
+                {"label":"F", "x":4.75, "y":3.25}, 
+                {"label":"G", "x":5.75, "y":3.25}, 
+                {"label":"H", "x":6.75, "y":3.25}, 
+                {"label":"J", "x":7.75, "y":3.25}, 
+                {"label":"K", "x":8.75, "y":3.25}, 
+                {"label":"L", "x":9.75, "y":3.25}, 
+                {"label":":", "x":10.75, "y":3.25}, 
+                {"label":"\"", "x":11.75, "y":3.25}, 
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
+                {"label":"|", "x":1.25, "y":4.25}, 
+                {"label":"Z", "x":2.25, "y":4.25}, 
+                {"label":"X", "x":3.25, "y":4.25}, 
+                {"label":"C", "x":4.25, "y":4.25}, 
+                {"label":"V", "x":5.25, "y":4.25}, 
+                {"label":"B", "x":6.25, "y":4.25}, 
+                {"label":"N", "x":7.25, "y":4.25}, 
+                {"label":"M", "x":8.25, "y":4.25}, 
+                {"label":"<", "x":9.25, "y":4.25}, 
+                {"label":">", "x":10.25, "y":4.25}, 
+                {"label":"?", "x":11.25, "y":4.25}, 
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
+                {"label":"\u2191", "x":16.25, "y":4.25}, 
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
+                {"x":3.75, "y":5.25, "w":6.25}, 
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
+                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
+                {"label":"\u2190", "x":15.25, "y":5.25}, 
+                {"label":"\u2193", "x":16.25, "y":5.25}, 
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/studiokestra/galatea/rev1/rev1.c b/keyboards/studiokestra/galatea/rev1/rev1.c
new file mode 100644
index 0000000000..f34f9f9200
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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 "rev1.h"
diff --git a/keyboards/studiokestra/galatea/rev1/rev1.h b/keyboards/studiokestra/galatea/rev1/rev1.h
new file mode 100644
index 0000000000..d393711292
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev1/rev1.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all(\
+    k0000, k0100,        k0001, k0002, k0102, k0003, k0103, k0004, k0104, k0005, k0105, k0006, k0106, k0007,    k0107, k0008, k0108, \
+    k0200, k0300, k0201, k0301, k0202, k0302, k0203, k0303, k0204, k0304, k0205, k0305, k0206, k0306, k0207,    k0307, k0208, k0308, \
+    k0400, k0500, k0401, k0501, k0402, k0502, k0403, k0503, k0404, k0504, k0405, k0505, k0406,        k0407,    k0507, k0408, k0508, \
+    k0600, k0700, k0601, k0701, k0602, k0702, k0603, k0703, k0604, k0704, k0605, k0705, k0606,                                       \
+    k0800, k0900, k0801, k0901, k0802, k0902, k0803, k0903, k0804, k0904, k0805, k0905, k0806,        k0807,           k0808,        \
+    k1000, k1100, k1001,                      k1003,                      k1005, k1105, k1006,        k1007,    k1107, k1008, k1108  \
+) { \
+    { k0000,  k0001,  k0002,  k0003,  k0004,  k0005,  k0006,  k0007,  k0008 }, \
+    { k0100,  KC_NO,  k0102,  k0103,  k0104,  k0105,  k0106,  k0107,  k0108 }, \
+    { k0200,  k0201,  k0202,  k0203,  k0204,  k0205,  k0206,  k0207,  k0208 }, \
+    { k0300,  k0301,  k0302,  k0303,  k0304,  k0305,  k0306,  k0307,  k0308 }, \
+    { k0400,  k0401,  k0402,  k0403,  k0404,  k0405,  k0406,  k0407,  k0408 }, \
+    { k0500,  k0501,  k0502,  k0503,  k0504,  k0505,  KC_NO,  k0507,  k0508 }, \
+    { k0600,  k0601,  k0602,  k0603,  k0604,  k0605,  k0606,  KC_NO,  KC_NO }, \
+    { k0700,  k0701,  k0702,  k0703,  k0704,  k0705,  KC_NO,  KC_NO,  KC_NO }, \
+    { k0800,  k0801,  k0802,  k0803,  k0804,  k0805,  k0806,  k0807,  k0808 }, \
+    { k0900,  k0901,  k0902,  k0903,  k0904,  k0905,  KC_NO,  KC_NO,  KC_NO }, \
+    { k1000,  k1001,  KC_NO,  k1003,  KC_NO,  k1005,  k1006,  k1007,  k1008 }, \
+    { k1100,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k1105,  KC_NO,  k1107,  k1108 } \
+}
diff --git a/keyboards/studiokestra/galatea/rev1/rules.mk b/keyboards/studiokestra/galatea/rev1/rules.mk
new file mode 100644
index 0000000000..3105d59b77
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev1/rules.mk
@@ -0,0 +1,21 @@
+# 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 = 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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h
new file mode 100644
index 0000000000..4e0170a0f9
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev2/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021 Studio Kestra
+
+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 PRODUCT_ID      0x8802
+#define DEVICE_VER      0x0002
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
new file mode 100644
index 0000000000..46e07d7a43
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "Galatea",
+    "url": "https://studiokestra.ca/galatea",
+    "maintainer": "Studio Kestra",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0}, 
+                {"label":"F1", "x":1.25, "y":0}, 
+                {"label":"F2", "x":2.25, "y":0}, 
+                {"label":"F3", "x":3.25, "y":0}, 
+                {"label":"F4", "x":4.25, "y":0}, 
+                {"label":"F5", "x":5.5, "y":0}, 
+                {"label":"F6", "x":6.5, "y":0}, 
+                {"label":"F7", "x":7.5, "y":0}, 
+                {"label":"F8", "x":8.5, "y":0}, 
+                {"label":"F9", "x":9.75, "y":0}, 
+                {"label":"F10", "x":10.75, "y":0}, 
+                {"label":"F11", "x":11.75, "y":0}, 
+                {"label":"F12", "x":12.75, "y":0}, 
+                {"label":"F13", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "y":0}, 
+                {"label":"~", "x":0, "y":1.25}, 
+                {"label":"!", "x":1, "y":1.25}, 
+                {"label":"@", "x":2, "y":1.25}, 
+                {"label":"#", "x":3, "y":1.25}, 
+                {"label":"$", "x":4, "y":1.25}, 
+                {"label":"%", "x":5, "y":1.25}, 
+                {"label":"^", "x":6, "y":1.25}, 
+                {"label":"&", "x":7, "y":1.25}, 
+                {"label":"*", "x":8, "y":1.25}, 
+                {"label":"(", "x":9, "y":1.25}, 
+                {"label":")", "x":10, "y":1.25}, 
+                {"label":"_", "x":11, "y":1.25}, 
+                {"label":"+", "x":12, "y":1.25}, 
+                {"label":"|", "x":13, "y":1.25}, 
+                {"label":"Delete", "x":14, "y":1.25}, 
+                {"label":"Insert", "x":15.25, "y":1.25}, 
+                {"label":"Home", "x":16.25, "y":1.25}, 
+                {"label":"PgUp", "x":17.25, "y":1.25}, 
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
+                {"label":"Q", "x":1.5, "y":2.25}, 
+                {"label":"W", "x":2.5, "y":2.25}, 
+                {"label":"E", "x":3.5, "y":2.25}, 
+                {"label":"R", "x":4.5, "y":2.25}, 
+                {"label":"T", "x":5.5, "y":2.25}, 
+                {"label":"Y", "x":6.5, "y":2.25}, 
+                {"label":"U", "x":7.5, "y":2.25}, 
+                {"label":"I", "x":8.5, "y":2.25}, 
+                {"label":"O", "x":9.5, "y":2.25}, 
+                {"label":"P", "x":10.5, "y":2.25}, 
+                {"label":"{", "x":11.5, "y":2.25}, 
+                {"label":"}", "x":12.5, "y":2.25}, 
+                {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, 
+                {"label":"Delete", "x":15.25, "y":2.25}, 
+                {"label":"End", "x":16.25, "y":2.25}, 
+                {"label":"PgDn", "x":17.25, "y":2.25}, 
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
+                {"label":"A", "x":1.75, "y":3.25}, 
+                {"label":"S", "x":2.75, "y":3.25}, 
+                {"label":"D", "x":3.75, "y":3.25}, 
+                {"label":"F", "x":4.75, "y":3.25}, 
+                {"label":"G", "x":5.75, "y":3.25}, 
+                {"label":"H", "x":6.75, "y":3.25}, 
+                {"label":"J", "x":7.75, "y":3.25}, 
+                {"label":"K", "x":8.75, "y":3.25}, 
+                {"label":"L", "x":9.75, "y":3.25}, 
+                {"label":":", "x":10.75, "y":3.25}, 
+                {"label":"\"", "x":11.75, "y":3.25}, 
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
+                {"label":"|", "x":1.25, "y":4.25}, 
+                {"label":"Z", "x":2.25, "y":4.25}, 
+                {"label":"X", "x":3.25, "y":4.25}, 
+                {"label":"C", "x":4.25, "y":4.25}, 
+                {"label":"V", "x":5.25, "y":4.25}, 
+                {"label":"B", "x":6.25, "y":4.25}, 
+                {"label":"N", "x":7.25, "y":4.25}, 
+                {"label":"M", "x":8.25, "y":4.25}, 
+                {"label":"<", "x":9.25, "y":4.25}, 
+                {"label":">", "x":10.25, "y":4.25}, 
+                {"label":"?", "x":11.25, "y":4.25}, 
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
+                {"label":"\u2191", "x":16.25, "y":4.25}, 
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
+                {"x":3.75, "y":5.25, "w":6.25}, 
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
+                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
+                {"label":"\u2190", "x":15.25, "y":5.25}, 
+                {"label":"\u2193", "x":16.25, "y":5.25}, 
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.c b/keyboards/studiokestra/galatea/rev2/rev2.c
new file mode 100644
index 0000000000..5e7125b0b6
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev2/rev2.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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 "rev2.h"
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.h b/keyboards/studiokestra/galatea/rev2/rev2.h
new file mode 100644
index 0000000000..d393711292
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev2/rev2.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all(\
+    k0000, k0100,        k0001, k0002, k0102, k0003, k0103, k0004, k0104, k0005, k0105, k0006, k0106, k0007,    k0107, k0008, k0108, \
+    k0200, k0300, k0201, k0301, k0202, k0302, k0203, k0303, k0204, k0304, k0205, k0305, k0206, k0306, k0207,    k0307, k0208, k0308, \
+    k0400, k0500, k0401, k0501, k0402, k0502, k0403, k0503, k0404, k0504, k0405, k0505, k0406,        k0407,    k0507, k0408, k0508, \
+    k0600, k0700, k0601, k0701, k0602, k0702, k0603, k0703, k0604, k0704, k0605, k0705, k0606,                                       \
+    k0800, k0900, k0801, k0901, k0802, k0902, k0803, k0903, k0804, k0904, k0805, k0905, k0806,        k0807,           k0808,        \
+    k1000, k1100, k1001,                      k1003,                      k1005, k1105, k1006,        k1007,    k1107, k1008, k1108  \
+) { \
+    { k0000,  k0001,  k0002,  k0003,  k0004,  k0005,  k0006,  k0007,  k0008 }, \
+    { k0100,  KC_NO,  k0102,  k0103,  k0104,  k0105,  k0106,  k0107,  k0108 }, \
+    { k0200,  k0201,  k0202,  k0203,  k0204,  k0205,  k0206,  k0207,  k0208 }, \
+    { k0300,  k0301,  k0302,  k0303,  k0304,  k0305,  k0306,  k0307,  k0308 }, \
+    { k0400,  k0401,  k0402,  k0403,  k0404,  k0405,  k0406,  k0407,  k0408 }, \
+    { k0500,  k0501,  k0502,  k0503,  k0504,  k0505,  KC_NO,  k0507,  k0508 }, \
+    { k0600,  k0601,  k0602,  k0603,  k0604,  k0605,  k0606,  KC_NO,  KC_NO }, \
+    { k0700,  k0701,  k0702,  k0703,  k0704,  k0705,  KC_NO,  KC_NO,  KC_NO }, \
+    { k0800,  k0801,  k0802,  k0803,  k0804,  k0805,  k0806,  k0807,  k0808 }, \
+    { k0900,  k0901,  k0902,  k0903,  k0904,  k0905,  KC_NO,  KC_NO,  KC_NO }, \
+    { k1000,  k1001,  KC_NO,  k1003,  KC_NO,  k1005,  k1006,  k1007,  k1008 }, \
+    { k1100,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k1105,  KC_NO,  k1107,  k1108 } \
+}
diff --git a/keyboards/studiokestra/galatea/rev2/rules.mk b/keyboards/studiokestra/galatea/rev2/rules.mk
new file mode 100644
index 0000000000..98872ee082
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev2/rules.mk
@@ -0,0 +1,21 @@
+# 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 = 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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/studiokestra/galatea/rules.mk b/keyboards/studiokestra/galatea/rules.mk
new file mode 100644
index 0000000000..c60419c59e
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = studiokestra/galatea/rev1