[Keyboard] Split RGB Matrix Zygomorph support (#11083)

3 files changed, 49 insertions, 71 deletions

diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
index 78969ad7a4..d7d50e1378 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
@@ -8,11 +8,13 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_ANIMATIONS = yes   # LED animations
-RGBLIGHT_SPLIT_ENABLE = yes # Split RGBLight Support
-RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGBLIGHT_ENABLE = no        # Enable global lighting effects. Do not enable with RGB Matrix
+RGBLIGHT_ANIMATIONS = no    # LED animations
+RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
+RGB_MATRIX_ENABLE = yes  	# Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
+SPLIT_RGB_MATRIX_ENABLE = yes # For split RGB Matrix support
 RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
 UNICODE_ENABLE = no         # Unicode
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
@@ -40,3 +42,7 @@ endif
 ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
     OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
 endif
+
+ifeq ($(strip $(SPLIT_RGB_MATRIX_ENABLE)), yes)
+    OPT_DEFS += -DSPLIT_TRANSPORT_MIRROR
+endif
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 667b68f731..190a8bbe3e 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -55,7 +55,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_NUM 60
     #define RGBLED_SPLIT { 30, 30 }
 #endif
-#define DRIVER_LED_TOTAL 30
+
+#define DRIVER_LED_TOTAL 60
+#define RGB_MATRIX_SPLIT { 30, 30 }
 
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c
index 3edf48c5d5..1fb1716a09 100644
--- a/keyboards/rgbkb/zygomorph/rev1/rev1.c
+++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c
@@ -2,72 +2,42 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_LEFT_HAND    { { 0 | ( 5 << 4) }, { 102,  0 }, 4}, \
-    { { 0 | ( 4 << 4) }, {  81,  0 }, 4}, \
-    { { 0 | ( 3 << 4) }, {  61,  0 }, 4}, \
-    { { 0 | ( 2 << 4) }, {  41,  0 }, 4}, \
-    { { 0 | ( 1 << 4) }, {  20,  0 }, 4}, \
-    { { 0 | ( 0 << 4) }, {   0,  0 }, 1}, \
-    { { 1 | ( 5 << 4) }, { 102, 16 }, 4}, \
-    { { 1 | ( 4 << 4) }, {  81, 16 }, 4}, \
-    { { 1 | ( 3 << 4) }, {  61, 16 }, 4}, \
-    { { 1 | ( 2 << 4) }, {  41, 16 }, 4}, \
-    { { 1 | ( 1 << 4) }, {  20, 16 }, 4}, \
-    { { 1 | ( 0 << 4) }, {   0, 16 }, 1}, \
-    { { 2 | ( 5 << 4) }, { 102, 32 }, 4}, \
-    { { 2 | ( 4 << 4) }, {  81, 32 }, 4}, \
-    { { 2 | ( 3 << 4) }, {  61, 32 }, 4}, \
-    { { 2 | ( 2 << 4) }, {  41, 32 }, 4}, \
-    { { 2 | ( 1 << 4) }, {  20, 32 }, 4}, \
-    { { 2 | ( 0 << 4) }, {   0, 32 }, 1}, \
-    { { 3 | ( 5 << 4) }, { 102, 48 }, 4}, \
-    { { 3 | ( 4 << 4) }, {  81, 48 }, 4}, \
-    { { 3 | ( 3 << 4) }, {  61, 48 }, 4}, \
-    { { 3 | ( 2 << 4) }, {  41, 48 }, 4}, \
-    { { 3 | ( 1 << 4) }, {  20, 48 }, 4}, \
-    { { 3 | ( 0 << 4) }, {   0, 48 }, 1}, \
-    { { 4 | ( 5 << 4) }, { 102, 64 }, 1}, \
-    { { 4 | ( 4 << 4) }, {  81, 64 }, 1}, \
-    { { 4 | ( 3 << 4) }, {  61, 64 }, 1}, \
-    { { 4 | ( 2 << 4) }, {  41, 64 }, 1}, \
-    { { 4 | ( 1 << 4) }, {  20, 64 }, 1}, \
-    { { 4 | ( 0 << 4) }, {   0, 64 }, 1}
-
-#define RGB_RIGHT_HAND    { { 0 | (11 << 4) }, { 224,  0 }, 1}, \
-    { { 0 | (10 << 4) }, { 204,  0 }, 4}, \
-    { { 0 | ( 9 << 4) }, { 183,  0 }, 4}, \
-    { { 0 | ( 8 << 4) }, { 163,  0 }, 4}, \
-    { { 0 | ( 7 << 4) }, { 143,  0 }, 4}, \
-    { { 0 | ( 6 << 4) }, { 122,  0 }, 4}, \
-    { { 1 | (11 << 4) }, { 224, 16 }, 1}, \
-    { { 1 | (10 << 4) }, { 204, 16 }, 4}, \
-    { { 1 | ( 9 << 4) }, { 183, 16 }, 4}, \
-    { { 1 | ( 8 << 4) }, { 163, 16 }, 4}, \
-    { { 1 | ( 7 << 4) }, { 143, 16 }, 4}, \
-    { { 1 | ( 6 << 4) }, { 122, 16 }, 4}, \
-    { { 2 | (11 << 4) }, { 224, 32 }, 1}, \
-    { { 2 | (10 << 4) }, { 204, 32 }, 4}, \
-    { { 2 | ( 9 << 4) }, { 183, 32 }, 4}, \
-    { { 2 | ( 8 << 4) }, { 163, 32 }, 4}, \
-    { { 2 | ( 7 << 4) }, { 143, 32 }, 4}, \
-    { { 2 | ( 6 << 4) }, { 122, 32 }, 4}, \
-    { { 3 | (11 << 4) }, { 224, 48 }, 1}, \
-    { { 3 | (10 << 4) }, { 204, 48 }, 4}, \
-    { { 3 | ( 9 << 4) }, { 183, 48 }, 4}, \
-    { { 3 | ( 8 << 4) }, { 163, 48 }, 4}, \
-    { { 3 | ( 7 << 4) }, { 143, 48 }, 4}, \
-    { { 3 | ( 6 << 4) }, { 122, 48 }, 4}, \
-    { { 4 | (11 << 4) }, { 224, 64 }, 1}, \
-    { { 4 | (10 << 4) }, { 204, 64 }, 1}, \
-    { { 4 | ( 9 << 4) }, { 183, 64 }, 1}, \
-    { { 4 | ( 8 << 4) }, { 163, 64 }, 1}, \
-    { { 4 | ( 7 << 4) }, { 143, 64 }, 1}, \
-    { { 4 | ( 6 << 4) }, { 122, 64 }, 1}
-
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+led_config_t g_led_config = { {
+    {      5,      4,      3,      2,      1,      0 },
+    {     11,     10,      9,      8,      7,      6 },
+    {     17,     16,     15,     14,     13,     12 },
+    {     23,     22,     21,     20,     19,     18 },
+    {     29,     28,     27,     26,     25,     24 },
+    {     35,     34,     33,     32,     31,     30 },
+    {     41,     40,     39,     38,     37,     36 },
+    {     47,     46,     45,     44,     43,     42 },
+    {     53,     52,     51,     50,     49,     48 },
+    {     59,     58,     57,     56,     55,     54 }
+}, {
+// Left Hand
+    { 102,   0 }, {  81,   0 }, {  61,   0 }, {  41,   0 }, {  20,   0 }, {   0,   0 },
+    { 102,  16 }, {  81,  16 }, {  61,  16 }, {  41,  16 }, {  20,  16 }, {   0,  16 },
+    { 102,  32 }, {  81,  32 }, {  61,  32 }, {  41,  32 }, {  20,  32 }, {   0,  32 },
+    { 102,  48 }, {  81,  48 }, {  61,  48 }, {  41,  48 }, {  20,  48 }, {   0,  48 },
+    { 102,  64 }, {  81,  64 }, {  61,  64 }, {  41,  64 }, {  20,  64 }, {   0,  64 },
+// Right Hand
+    { 224,   0 }, { 204,   0 }, { 183,   0 }, { 163,   0 }, { 143,   0 }, { 122,   0 },
+    { 224,  16 }, { 204,  16 }, { 183,  16 }, { 163,  16 }, { 143,  16 }, { 122,  16 },
+    { 224,  32 }, { 204,  32 }, { 183,  32 }, { 163,  32 }, { 143,  32 }, { 122,  32 },
+    { 224,  48 }, { 204,  48 }, { 183,  48 }, { 163,  48 }, { 143,  48 }, { 122,  48 },
+    { 224,  64 }, { 204,  64 }, { 183,  64 }, { 163,  64 }, { 143,  64 }, { 122,  64 }
+}, {
 // Left Hand
-RGB_LEFT_HAND
+    4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 1,
+    4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1,
 // Right Hand
-//RGB_RIGHT_HAND
-};
+    4, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4,
+    1, 1, 1, 1, 1, 1
+} };
 #endif