aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-07-04 23:55:04 +0000
committerQMK Bot <[email protected]>2024-07-04 23:55:04 +0000
commitcd22b8a9458fbe17b68bdd360822db696b559dfe (patch)
tree2f450a13343b5b75046a15eab78e76e94d2a02b2
parent41878d276ed330d754ce8f14fb1354389d53eb1c (diff)
parent031ccd48879d29539ce478cf7d3d33b406ea993c (diff)
downloadqmk_firmware-cd22b8a9458fbe17b68bdd360822db696b559dfe.tar.gz
qmk_firmware-cd22b8a9458fbe17b68bdd360822db696b559dfe.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/salicylic_acid3/setta21/rev1/keyboard.json30
-rw-r--r--keyboards/salicylic_acid3/setta21/rev1/rev1.c21
2 files changed, 29 insertions, 22 deletions
diff --git a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
index 452d0211c3..75517a7d40 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
@@ -41,7 +41,35 @@
"pin": "D3"
},
"rgb_matrix": {
- "driver": "ws2812"
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 4], "x": 0, "y": 13, "flags": 4},
+ {"matrix": [1, 4], "x": 75, "y": 13, "flags": 4},
+ {"matrix": [2, 4], "x": 149, "y": 13, "flags": 4},
+ {"matrix": [3, 4], "x": 224, "y": 13, "flags": 4},
+
+ {"matrix": [2, 3], "x": 149, "y": 26, "flags": 4},
+ {"matrix": [1, 3], "x": 75, "y": 26, "flags": 4},
+ {"matrix": [0, 3], "x": 0, "y": 26, "flags": 4},
+
+ {"matrix": [0, 2], "x": 0, "y": 38, "flags": 4},
+ {"matrix": [1, 2], "x": 75, "y": 38, "flags": 4},
+ {"matrix": [2, 2], "x": 149, "y": 38, "flags": 4},
+ {"matrix": [3, 2], "x": 224, "y": 32, "flags": 4},
+
+ {"matrix": [2, 1], "x": 149, "y": 51, "flags": 4},
+ {"matrix": [1, 1], "x": 75, "y": 51, "flags": 4},
+ {"matrix": [0, 1], "x": 0, "y": 51, "flags": 4},
+
+ {"matrix": [0, 0], "x": 38, "y": 64, "flags": 4},
+ {"matrix": [2, 0], "x": 149, "y": 64, "flags": 4},
+ {"matrix": [3, 0], "x": 224, "y": 58, "flags": 4},
+
+ {"matrix": [3, 5], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [2, 5], "x": 149, "y": 0, "flags": 4},
+ {"matrix": [1, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 0, "y": 0, "flags": 4}
+ ]
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
deleted file mode 100644
index c31fe5c8f3..0000000000
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
- led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 14,13, 7, 6, 0,20 },
- { 12, 8, 5, 1,19 },
- { 15,11, 9, 4, 2,18 },
- { 16, 10, 3,17 }
- }, {
- // LED Index to Physical Position
- { 0, 179 }, { 21, 179 }, { 43, 179 }, { 64, 179 }, { 43, 134 }, { 21, 134 }, { 0, 134 }, { 0, 90 }, { 21, 90 }, { 43, 90 },
- { 64, 112 }, { 43, 45 }, { 21, 45 }, { 0, 45 }, { 11, 0 }, { 43, 0 }, { 64, 23 }, { 64, 224 }, { 43, 224 }, { 21, 224 },
- { 0, 224 }
- }, {
- // LED Index to Flag
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4
-} };
-#endif