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

6 files changed, 163 insertions, 0 deletions

diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h
new file mode 100644
index 0000000000..5e51acea25
--- /dev/null
+++ b/keyboards/lily58/glow_enc/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2017 F_YUUCHI
+Copyright 2020 Ben Roesner (keycapsss.com)
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFC51
+#define PRODUCT_ID      0x0059
+#define DEVICE_VER      0x0100
+#define MANUFACTURER    ORVISEVANS+
+#define PRODUCT         Lily58GlowEnc
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define SOFT_SERIAL_PIN D2
+
+#define RGB_DI_PIN F4
+
+#define RGBLED_NUM 72    // Number of LEDs
+
+#define RGBLED_SPLIT { 36, 36 }
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_LIMIT_VAL 120
+
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { D4 }
+#define ENCODERS_PAD_A_RIGHT { D4 }
+#define ENCODERS_PAD_B_RIGHT { F5 }
diff --git a/keyboards/lily58/glow_enc/glow_enc.c b/keyboards/lily58/glow_enc/glow_enc.c
new file mode 100644
index 0000000000..57a0df93db
--- /dev/null
+++ b/keyboards/lily58/glow_enc/glow_enc.c
@@ -0,0 +1,16 @@
+/*
+Copyright 2020 Ben Roesner (keycapsss.com)
+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 "lily58.h"
+
diff --git a/keyboards/lily58/glow_enc/glow_enc.h b/keyboards/lily58/glow_enc/glow_enc.h
new file mode 100644
index 0000000000..f9cc1c26b8
--- /dev/null
+++ b/keyboards/lily58/glow_enc/glow_enc.h
@@ -0,0 +1,66 @@
+/* Copyright 2022 Liashenko Volodymyr (@LVladymyr)
+ *
+ * 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 "lily58.h"
+
+#include "quantum.h"
+
+
+#ifndef FLIP_HALF
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
+	L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
+	L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
+	L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
+	               L41, L42, L43, L44, R41, R42, R43, R44  \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ L30, L31, L32, L33, L34, L35 }, \
+		{ KC_NO, L41, L42, L43, L44, L45 }, \
+		{ R05, R04, R03, R02, R01, R00 }, \
+		{ R15, R14, R13, R12, R11, R10 }, \
+		{ R25, R24, R23, R22, R21, R20 }, \
+		{ R35, R34, R33, R32, R31, R30 }, \
+		{ KC_NO, R44, R43, R42, R41, R40 } \
+	}
+#else
+// Keymap with right side flipped
+// (TRRS jack on both halves are to the right)
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,      R00, R01, R02, R03, R04, R05, \
+	L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, \
+	L20, L21, L22, L23, L24, L25,      R20, R21, R22, R23, R24, R25, \
+	L30, L31, L32, L33, L34, L35, L45, R30, R31, R32, R33, R34, R35, R45, \
+                   L41, L42, L43, L44,                R41, R42, R43, R44 \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ L30, L31, L32, L33, L34, L35 }, \
+        { KC_NO, L41, L42, L43, L44, L45 }, \
+		{ R00, R01, R02, R03, R04, R05 }, \
+		{ R10, R11, R12, R13, R14, R15 }, \
+		{ R20, R21, R22, R23, R24, R25 }, \
+		{ R30, R31, R32, R33, R34, R35 }, \
+        { KC_NO, R41, R42, R43, R44, R45 } \
+	}
+#endif
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json
new file mode 100644
index 0000000000..503cdaae12
--- /dev/null
+++ b/keyboards/lily58/glow_enc/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Lily58",
+    "url": "https://keycapsss.com",
+    "maintainer": "BenRoe",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
+                {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
+                {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
+                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
+                {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk
new file mode 100644
index 0000000000..3d80190eb2
--- /dev/null
+++ b/keyboards/lily58/glow_enc/rules.mk
@@ -0,0 +1,8 @@
+ENCODER_ENABLE = yes       # ENables the use of one or more encoders
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB light
+LTO_ENABLE = yes 		   # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features
+BOOTMAGIC_ENABLE = no
+RGB_MATRIX_ENABLE = no     # Per key rgb leds
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h
index 4f6f262bbc..c082030032 100644
--- a/keyboards/lily58/lily58.h
+++ b/keyboards/lily58/lily58.h
@@ -4,4 +4,6 @@
     #include "rev1.h"
 #elif KEYBOARD_lily58_light
     #include "light.h"
+#elif KEYBOARD_lily58_glow_enc
+    #include "glow_enc.h"
 #endif