Merge branch 'develop'

5 files changed, 92 insertions, 133 deletions

diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json
index 74a49c57e3..7b87c2b713 100644
--- a/keyboards/spiderisland/split78/info.json
+++ b/keyboards/spiderisland/split78/info.json
@@ -12,93 +12,107 @@
         "pin": "D4",
         "breathing": true
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "debounce": 50,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.25, "w": 2},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25},
-                {"x": 14.5, "y": 2.25, "w": 1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [2, 0], "x": 3, "y": 0},
+                {"matrix": [3, 0], "x": 4, "y": 0},
+                {"matrix": [4, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [1, 7], "x": 9.5, "y": 0},
+                {"matrix": [2, 7], "x": 10.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 12, "y": 0},
+                {"matrix": [4, 7], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+                {"matrix": [5, 1], "x": 5, "y": 1.25},
+                {"matrix": [5, 5], "x": 6, "y": 1.25},
+
+                {"matrix": [0, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 1.25},
+                {"matrix": [3, 8], "x": 11, "y": 1.25},
+                {"matrix": [4, 8], "x": 12, "y": 1.25},
+                {"matrix": [5, 8], "x": 13, "y": 1.25},
+                {"matrix": [6, 8], "x": 14, "y": 1.25, "w": 2},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [0, 9], "x": 7.5, "y": 2.25},
+                {"matrix": [1, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 9], "x": 13.5, "y": 2.25},
+                {"matrix": [0, 12], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.25},
+
+                {"matrix": [0, 10], "x": 7.75, "y": 3.25},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.25},
+                {"matrix": [2, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 10], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 10], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 10], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [1, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [2, 4], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [5, 4], "x": 6.25, "y": 4.25},
 
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 2.25},
+                {"matrix": [0, 11], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 11], "x": 9.25, "y": 4.25},
+                {"matrix": [2, 11], "x": 10.25, "y": 4.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [5, 11], "x": 14, "y": 4.25},
+                {"matrix": [6, 11], "x": 15, "y": 4.25},
 
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 1.75},
-                {"x": 14, "y": 4.25},
-                {"x": 15, "y": 4.25},
+                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 2.25},
 
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 1.25},
-                {"x": 5, "y": 5.25, "w": 2.25},
-                {"x": 8.25, "y": 5.25, "w": 2.25},
-                {"x": 10.5, "y": 5.25, "w": 1.25},
-                {"x": 11.75, "y": 5.25, "w": 1.25},
-                {"x": 13, "y": 5.25},
-                {"x": 14, "y": 5.25},
-                {"x": 15, "y": 5.25}
+                {"matrix": [1, 12], "x": 8.25, "y": 5.25, "w": 2.25},
+                {"matrix": [2, 12], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 5.25},
+                {"matrix": [5, 12], "x": 14, "y": 5.25},
+                {"matrix": [6, 12], "x": 15, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/spiderisland/split78/matrix.c b/keyboards/spiderisland/split78/matrix.c
index 71e154e5b7..31ee29eaab 100644
--- a/keyboards/spiderisland/split78/matrix.c
+++ b/keyboards/spiderisland/split78/matrix.c
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include "quantum.h"
 #include "i2c_master.h"
-#include "split78.h"
 
 #define RIGHT_HALF
 
diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk
index 0f27d32c81..e77cf060be 100644
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
 DEBOUNCE_TYPE = sym_eager_pr
 
 # custom matrix setup
diff --git a/keyboards/spiderisland/split78/split78.c b/keyboards/spiderisland/split78/split78.c
deleted file mode 100644
index 0301012749..0000000000
--- a/keyboards/spiderisland/split78/split78.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 unrelenting.technology
- *
- * 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 "split78.h"
diff --git a/keyboards/spiderisland/split78/split78.h b/keyboards/spiderisland/split78/split78.h
deleted file mode 100644
index 2f6252f0c9..0000000000
--- a/keyboards/spiderisland/split78/split78.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 unrelenting.technology
- *
- * 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( \
-    l00,      l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, \
-    l06, l07, l08, l09, l10, l11, l12, r07, r08, r09, r10, r11, r12, r13, \
-    l13, l14, l15, l16, l17, l18, r14, r15, r16, r17, r18, r19, r20, r21, \
-    l19, l20, l21, l22, l23, l24, r22, r23, r24, r25, r26, r27,      r28, \
-    l25,      l26, l27, l28, l29, l30, r29, r30, r31, r32, r33, r34, r35, \
-    l31, l32, l33, l34,      l35,      r36,      r37, r38, r39, r40, r41 \
-) { \
-    {   l00,   l06,   l13,   l19,   l25,   l31, KC_NO,   r00,   r07, r14, r22, r29, r21 },  \
-    {   l01,   l07,   l14,   l20,   l26,   l32, KC_NO,   r01,   r08, r15, r23, r30, r36 },  \
-    {   l02,   l08,   l15,   l21,   l27,   l33, KC_NO,   r02,   r09, r16, r24, r31, r37 },  \
-    {   l03,   l09,   l16,   l22,   l28,   l34, KC_NO,   r03,   r10, r17, r25, r32, r38 },  \
-    {   l04,   l10,   l17,   l23,   l29,   l35, KC_NO,   r04,   r11, r18, r27, r33, r39 },  \
-    {   l05,   l11,   l18,   l24,   l30,   l12, KC_NO,   r05,   r12, r19, r26, r34, r40 },  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,   r06,   r13, r20, r28, r35, r41 },  \
-}