summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/adelais/rgb_led
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin/adelais/rgb_led')
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/config.h21
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/info.json336
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c2
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h77
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/info.json336
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c2
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h77
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/config.h4
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/info.json321
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c2
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h78
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk2
16 files changed, 996 insertions, 272 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h
deleted file mode 100644
index 2ec0afd47b..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-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
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index f668bd88ed..909bc7f83a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -1,9 +1,5 @@
#pragma once
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-
-#define RGB_DI_PIN A7
#define RGB_MATRIX_LED_COUNT 91
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index f098bdbf95..816b9414c1 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -3,6 +3,14 @@
"usb": {
"pid": "0xAEC1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
+ "rows": ["B1", "A0", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
@@ -10,5 +18,333 @@
"caps_lock": "B2",
"num_lock": "C15",
"scroll_lock": "B9"
+ },
+ "ws2812": {
+ "pin": "A7"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
index 490599c43a..5f01f322df 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "adelais.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * 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_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
@@ -1,2 +1 @@
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index d9d75a4b9e..1e549f9a89 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,9 +1,5 @@
#pragma once
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 }
-
-#define RGB_DI_PIN A15
#define RGBLED_NUM 23
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 7dcd0f1765..4ac693f894 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -3,11 +3,22 @@
"usb": {
"pid": "0xAEC2"
},
+ "rgb_matrix": {
+ "driver": "IS31FL3731"
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
+ "rows": ["B1", "A0", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A4", "pin_b": "A3"}
]
},
+ "ws2812": {
+ "pin": "A15"
+ },
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
@@ -15,5 +26,330 @@
"caps_lock": "B2",
"num_lock": "C15",
"scroll_lock": "B9"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [4, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [1, 14], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 20b4b69114..e51e92ed6f 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "adelais.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
deleted file mode 100644
index 45d48fac46..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * 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_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K3E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
index b52c4f9db3..e79b2862e6 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
@@ -1,4 +1,3 @@
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 7457fd50a7..c4f801b40d 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -17,11 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { A4, A3, C13, A1, A2}
-#define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 }
-
#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A7
#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
#define RGBLED_NUM 23
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 3f83750e3a..d1775ccb83 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -3,6 +3,14 @@
"usb": {
"pid": "0xAEC3"
},
+ "rgb_matrix": {
+ "driver": "IS31FL3741"
+ },
+ "matrix_pins": {
+ "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
+ "rows": ["A4", "A3", "C13", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B12", "pin_b": "B13"}
@@ -14,5 +22,318 @@
"caps_lock": "C14",
"num_lock": "A0",
"scroll_lock": "C15"
+ },
+ "ws2812": {
+ "pin": "A7",
+ "driver": "spi"
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_full_rshift": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs_full_rshift": {
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 0, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1},
+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 10], "x": 14.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index ad9c7c4db0..b7e03d0f1e 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev3.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
deleted file mode 100644
index 28c373ad85..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2021 Team Mechlovin
- *
- * 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_alice_split_bs( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K41, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K43, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D,\
- K41, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K43, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3C, K3D, K3E,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_split_bs_full_rshift( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K41, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K43, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_alice_full_rshift( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K41, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K43, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
index 7127485d00..5664ce6844 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
@@ -2,10 +2,8 @@
# change yes to no to disable
#
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes
-WS2812_DRIVER = spi
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:25:37 +0000