Merge branch 'develop'

4 files changed, 168 insertions, 232 deletions

diff --git a/keyboards/chalice/chalice.c b/keyboards/chalice/chalice.c
deleted file mode 100644
index 1d7cc12228..0000000000
--- a/keyboards/chalice/chalice.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 null-ll
- * Copyright 2021 Jels, Josh Johnson
- *
- * 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 "chalice.h"
diff --git a/keyboards/chalice/chalice.h b/keyboards/chalice/chalice.h
deleted file mode 100644
index c55cd4ba0b..0000000000
--- a/keyboards/chalice/chalice.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2020 null-ll
- * Copyright 2021 Jels, Josh Johnson
- *
- * 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 ___ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
-      K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46,      \
-      K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56,      \
-      K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76,           \
-           K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96,      \
-           K80, K91,      K82,      K92,      K83,      K93, K84,      K94, K85, K95  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { K40, K41, K42, K43, K44, K45, K46 }, \
-    { K50, K51, K52, K53, K54, K55, K56 }, \
-    { K60, K61, K62, K63, K64, K65, K66 }, \
-    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { K80, ___, K82, K83, K84, K85, K86 }, \
-    { ___, K91, K92, K93, K94, K95, K96 }  \
-}
-
-#define LAYOUT_split_bs( \
-      K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, K81, \
-      K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56,      \
-      K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76,           \
-           K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96,      \
-           K80, K91,      K82,      K92,      K83,      K93, K84,      K94, K85, K95  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { K40, K41, K42, K43, K44, K45, K46 }, \
-    { K50, K51, K52, K53, K54, K55, K56 }, \
-    { K60, K61, K62, K63, K64, K65, K66 }, \
-    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { K80, K81, K82, K83, K84, K85, K86 }, \
-    { ___, K91, K92, K93, K94, K95, K96 }  \
-}
diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h
index a71d46d6b5..6bbd5af9bf 100644
--- a/keyboards/chalice/config.h
+++ b/keyboards/chalice/config.h
@@ -17,15 +17,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS {F4, D1, D0, F5, D4, F6, B4, B5, B2, B6}
-#define MATRIX_COL_PINS {F7, C6, B1, D2, E6, B3, D7}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-
 #ifdef RGBLIGHT_ENABLE
     #define RGBLED_NUM 14
     #define RGBLIGHT_SLEEP  
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index 35f5c5fb1e..6b447c1fe6 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -8,160 +8,183 @@
         "pid": "0x000C",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "C6", "B1", "D2", "E6", "B3", "D7"],
+        "rows": ["F4", "D1", "D0", "F5", "D4", "F6", "B4", "B5", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"`~", "x":1.5, "y":0},
-                {"label":"1!", "x":2.5, "y":0},
-                {"label":"2@", "x":3.5, "y":0},
-                {"label":"3#", "x":4.5, "y":0},
-                {"label":"4$", "x":5.5, "y":0},
-                {"label":"5%", "x":6.5, "y":0},
-                {"label":"6^", "x":7.5, "y":0},
-                {"label":"7&", "x":10.5, "y":0},
-                {"label":"8*", "x":11.5, "y":0},
-                {"label":"9(", "x":12.5, "y":0},
-                {"label":"0)", "x":13.5, "y":0},
-                {"label":"-_", "x":14.5, "y":0},
-                {"label":"=+", "x":15.5, "y":0},
-                {"label":"Backspace", "x":16.5, "y":0, "w":2},
-
-                {"label":"Insert", "x":0, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":10, "y":1},
-                {"label":"U", "x":11, "y":1},
-                {"label":"I", "x":12, "y":1},
-                {"label":"O", "x":13, "y":1},
-                {"label":"P", "x":14, "y":1},
-                {"label":"[{", "x":15, "y":1},
-                {"label":"]}", "x":16, "y":1},
-                {"label":"\\|", "x":17, "y":1, "w":1.5},
-
-                {"label":"Delete", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";:", "x":14.25, "y":2},
-                {"label":"'\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"B", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":",<", "x":12.75, "y":3},
-                {"label":".>", "x":13.75, "y":3},
-                {"label":"/?", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
-                {"label":"Up", "x":17.5, "y":3},
-
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.5, "y":4, "w":1.5},
-                {"label":"Space", "x":6, "y":4, "w":2.25},
-                {"label":"Fn", "x":8.25, "y":4},
-                {"label":"Space", "x":9.75, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.5, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":15, "y":4, "w":1.5},
-                {"label":"Left", "x":16.5, "y":4},
-                {"label":"Down", "x":17.5, "y":4},
-                {"label":"Right", "x":18.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [1, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 10.5, "y": 0},
+                {"matrix": [1, 4], "x": 11.5, "y": 0},
+                {"matrix": [0, 5], "x": 12.5, "y": 0},
+                {"matrix": [1, 5], "x": 13.5, "y": 0},
+                {"matrix": [0, 6], "x": 14.5, "y": 0},
+                {"matrix": [1, 6], "x": 15.5, "y": 0},
+                {"matrix": [4, 6], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [3, 3], "x": 10, "y": 1},
+                {"matrix": [2, 4], "x": 11, "y": 1},
+                {"matrix": [3, 4], "x": 12, "y": 1},
+                {"matrix": [2, 5], "x": 13, "y": 1},
+                {"matrix": [3, 5], "x": 14, "y": 1},
+                {"matrix": [2, 6], "x": 15, "y": 1},
+                {"matrix": [3, 6], "x": 16, "y": 1},
+                {"matrix": [5, 6], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 3.25, "y": 2},
+                {"matrix": [5, 1], "x": 4.25, "y": 2},
+                {"matrix": [4, 2], "x": 5.25, "y": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+                {"matrix": [5, 3], "x": 10.25, "y": 2},
+                {"matrix": [4, 4], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2},
+                {"matrix": [5, 5], "x": 14.25, "y": 2},
+                {"matrix": [6, 6], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 3.75, "y": 3},
+                {"matrix": [6, 1], "x": 4.75, "y": 3},
+                {"matrix": [7, 1], "x": 5.75, "y": 3},
+                {"matrix": [6, 2], "x": 6.75, "y": 3},
+                {"matrix": [7, 2], "x": 7.75, "y": 3},
+
+                {"matrix": [6, 3], "x": 9.75, "y": 3},
+                {"matrix": [7, 3], "x": 10.75, "y": 3},
+                {"matrix": [6, 4], "x": 11.75, "y": 3},
+                {"matrix": [7, 4], "x": 12.75, "y": 3},
+                {"matrix": [6, 5], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 17.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 2], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 8.25, "y": 4},
+
+                {"matrix": [8, 3], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 15, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 16.5, "y": 4},
+                {"matrix": [8, 5], "x": 17.5, "y": 4},
+                {"matrix": [9, 5], "x": 18.5, "y": 4}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"`~", "x":1.5, "y":0},
-                {"label":"1!", "x":2.5, "y":0},
-                {"label":"2@", "x":3.5, "y":0},
-                {"label":"3#", "x":4.5, "y":0},
-                {"label":"4$", "x":5.5, "y":0},
-                {"label":"5%", "x":6.5, "y":0},
-                {"label":"6^", "x":7.5, "y":0},
-                {"label":"7&", "x":10.5, "y":0},
-                {"label":"8*", "x":11.5, "y":0},
-                {"label":"9(", "x":12.5, "y":0},
-                {"label":"0)", "x":13.5, "y":0},
-                {"label":"-_", "x":14.5, "y":0},
-                {"label":"=+", "x":15.5, "y":0},
-                {"label":"Backspace", "x":16.5, "y":0},
-                {"label":"Backspace", "x":17.5, "y":0},
-
-                {"label":"Insert", "x":0, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":10, "y":1},
-                {"label":"U", "x":11, "y":1},
-                {"label":"I", "x":12, "y":1},
-                {"label":"O", "x":13, "y":1},
-                {"label":"P", "x":14, "y":1},
-                {"label":"[{", "x":15, "y":1},
-                {"label":"]}", "x":16, "y":1},
-                {"label":"\\|", "x":17, "y":1, "w":1.5},
-
-                {"label":"Delete", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";:", "x":14.25, "y":2},
-                {"label":"'\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"B", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":",<", "x":12.75, "y":3},
-                {"label":".>", "x":13.75, "y":3},
-                {"label":"/?", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
-                {"label":"Up", "x":17.5, "y":3},
-
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.5, "y":4, "w":1.5},
-                {"label":"Space", "x":6, "y":4, "w":2.25},
-                {"label":"Fn", "x":8.25, "y":4},
-                {"label":"Space", "x":9.75, "y":4, "w":2.75},
-                {"label":"Alt", "x":12.5, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":15, "y":4, "w":1.5},
-                {"label":"Left", "x":16.5, "y":4},
-                {"label":"Down", "x":17.5, "y":4},
-                {"label":"Right", "x":18.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [1, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 10.5, "y": 0},
+                {"matrix": [1, 4], "x": 11.5, "y": 0},
+                {"matrix": [0, 5], "x": 12.5, "y": 0},
+                {"matrix": [1, 5], "x": 13.5, "y": 0},
+                {"matrix": [0, 6], "x": 14.5, "y": 0},
+                {"matrix": [1, 6], "x": 15.5, "y": 0},
+                {"matrix": [4, 6], "x": 16.5, "y": 0},
+                {"matrix": [8, 1], "x": 17.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+
+                {"matrix": [3, 3], "x": 10, "y": 1},
+                {"matrix": [2, 4], "x": 11, "y": 1},
+                {"matrix": [3, 4], "x": 12, "y": 1},
+                {"matrix": [2, 5], "x": 13, "y": 1},
+                {"matrix": [3, 5], "x": 14, "y": 1},
+                {"matrix": [2, 6], "x": 15, "y": 1},
+                {"matrix": [3, 6], "x": 16, "y": 1},
+                {"matrix": [5, 6], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 3.25, "y": 2},
+                {"matrix": [5, 1], "x": 4.25, "y": 2},
+                {"matrix": [4, 2], "x": 5.25, "y": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+
+                {"matrix": [5, 3], "x": 10.25, "y": 2},
+                {"matrix": [4, 4], "x": 11.25, "y": 2},
+                {"matrix": [5, 4], "x": 12.25, "y": 2},
+                {"matrix": [4, 5], "x": 13.25, "y": 2},
+                {"matrix": [5, 5], "x": 14.25, "y": 2},
+                {"matrix": [6, 6], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 3.75, "y": 3},
+                {"matrix": [6, 1], "x": 4.75, "y": 3},
+                {"matrix": [7, 1], "x": 5.75, "y": 3},
+                {"matrix": [6, 2], "x": 6.75, "y": 3},
+                {"matrix": [7, 2], "x": 7.75, "y": 3},
+
+                {"matrix": [6, 3], "x": 9.75, "y": 3},
+                {"matrix": [7, 3], "x": 10.75, "y": 3},
+                {"matrix": [6, 4], "x": 11.75, "y": 3},
+                {"matrix": [7, 4], "x": 12.75, "y": 3},
+                {"matrix": [6, 5], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 17.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 2], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 8.25, "y": 4},
+
+                {"matrix": [8, 3], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 15, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 16.5, "y": 4},
+                {"matrix": [8, 5], "x": 17.5, "y": 4},
+                {"matrix": [9, 5], "x": 18.5, "y": 4}
             ]
         }
     }