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

5 files changed, 209 insertions, 0 deletions

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