ryanskidmore/rskeys100: move RGB Matrix LED config to data driven (q…

…mk#24114)
NewAbbreviations950 · Jul 13, 2024 · a3d938d · a3d938d
1 parent 6dfd7ed
commit a3d938d
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 34 deletions.
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
@@ -25,6 +25,3 @@
  * switch and a diode towards the row. The row is then connected to the AVR as an input. This means
  * the diode direction is COL(umn) to ROW */
 #define DIODE_DIRECTION COL2ROW
-
-/* The number of RGB LEDs connected */
-#define RGB_MATRIX_LED_COUNT 105
diff --git a/keyboards/ryanskidmore/rskeys100/keyboard.json b/keyboards/ryanskidmore/rskeys100/keyboard.json
@@ -28,6 +28,131 @@
         "animations": {
             "cycle_left_right": true
         },
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+
+            {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 31, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
+
+            {"matrix": [0, 5], "x": 68, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 78, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 89, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 99, "y": 0, "flags": 4},
+
+            {"matrix": [0, 9], "x": 115, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 125, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 135, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 146, "y": 0, "flags": 4},
+
+            {"matrix": [0, 14], "x": 159, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 180, "y": 0, "flags": 1},
+
+            {"matrix": [1, 20], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [1, 19], "x": 214, "y": 15, "flags": 4},
+            {"matrix": [1, 18], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 193, "y": 15, "flags": 4},
+
+            {"matrix": [1, 16], "x": 180, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 169, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 159, "y": 15, "flags": 1},
+
+            {"matrix": [1, 13], "x": 141, "y": 15, "flags": 1},
+            {"matrix": [1, 12], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 115, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 94, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 31, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 21, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 10, "y": 15, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4},
+
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [2, 1], "x": 16, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 47, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 57, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 68, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 78, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 89, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 99, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 109, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 120, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 130, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 145, "y": 34, "flags": 1},
+
+            {"matrix": [2, 14], "x": 159, "y": 27, "flags": 1},
+            {"matrix": [2, 15], "x": 169, "y": 27, "flags": 1},
+            {"matrix": [2, 16], "x": 180, "y": 27, "flags": 1},
+
+            {"matrix": [2, 17], "x": 193, "y": 27, "flags": 4},
+            {"matrix": [2, 18], "x": 203, "y": 27, "flags": 4},
+            {"matrix": [2, 19], "x": 214, "y": 27, "flags": 4},
+            {"matrix": [2, 20], "x": 224, "y": 34, "flags": 4},
+
+            {"matrix": [3, 19], "x": 214, "y": 40, "flags": 4},
+            {"matrix": [3, 18], "x": 203, "y": 40, "flags": 4},
+            {"matrix": [3, 17], "x": 193, "y": 40, "flags": 4},
+
+            {"matrix": [3, 12], "x": 133, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 122, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 112, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 102, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 91, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 81, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 49, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 39, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 29, "y": 40, "flags": 4},
+            {"matrix": [3, 1], "x": 18, "y": 40, "flags": 4},
+            {"matrix": [3, 0], "x": 4, "y": 40, "flags": 1},
+
+            {"matrix": [4, 0], "x": 1, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 13, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 23, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 44, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 65, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 76, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 96, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 117, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 137, "y": 52, "flags": 1},
+
+            {"matrix": [4, 15], "x": 169, "y": 52, "flags": 4},
+
+            {"matrix": [4, 17], "x": 193, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 203, "y": 52, "flags": 4},
+            {"matrix": [4, 19], "x": 214, "y": 52, "flags": 4},
+            {"matrix": [4, 20], "x": 224, "y": 58, "flags": 1},
+
+            {"matrix": [5, 19], "x": 214, "y": 64, "flags": 4},
+            {"matrix": [5, 17], "x": 198, "y": 64, "flags": 4},
+
+            {"matrix": [5, 16], "x": 180, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 169, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 159, "y": 64, "flags": 4},
+
+            {"matrix": [5, 13], "x": 145, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 132, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 119, "y": 64, "flags": 1},
+            {"matrix": [5, 10], "x": 105, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 66, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 27, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 14, "y": 64, "flags": 1},
+            {"matrix": [5, 0], "x": 1, "y": 64, "flags": 1}
+        ],
         "driver": "ws2812",
         "max_brightness": 110
     },

diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.c b/keyboards/ryanskidmore/rskeys100/rskeys100.c