Browse Source

`mt/mt84`: move RGB Matrix config to data driven (#24090)

Ryan 2 years ago
parent
commit
3d10171e2c
3 changed files with 91 additions and 25 deletions
  1. 0 2
      keyboards/mt/mt84/config.h
  2. 91 0
      keyboards/mt/mt84/keyboard.json
  3. 0 23
      keyboards/mt/mt84/mt84.c

+ 0 - 2
keyboards/mt/mt84/config.h

@@ -18,8 +18,6 @@
 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
 #define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
 
-#define RGB_MATRIX_LED_COUNT 84
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

+ 91 - 0
keyboards/mt/mt84/keyboard.json

@@ -57,6 +57,97 @@
             "animation": "cycle_all"
         },
         "driver": "is31fl3737",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 45, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 119, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 134, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 149, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 164, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 179, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 194, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 209, "y": 0, "flags": 1},
+            {"matrix": [4, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 30, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 45, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 60, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 90, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 119, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 134, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 149, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 164, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 179, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 202, "y": 13, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 13, "flags": 1},
+
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 67, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 82, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 97, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 112, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 142, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 157, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 172, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 187, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 205, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 41, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 56, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 71, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 86, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 116, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 131, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 146, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 161, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 175, "y": 38, "flags": 4},
+            {"matrix": [3, 12], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+
+            {"matrix": [4, 0], "x": 9, "y": 51, "flags": 1},
+            {"matrix": [4, 1], "x": 34, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 49, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 63, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 78, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 93, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 108, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 123, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 138, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 153, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 168, "y": 51, "flags": 4},
+            {"matrix": [4, 11], "x": 189, "y": 51, "flags": 4},
+            {"matrix": [4, 12], "x": 209, "y": 51, "flags": 4},
+            {"matrix": [4, 13], "x": 224, "y": 51, "flags": 1},
+
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 21, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 64, "flags": 1},
+            {"matrix": [5, 5], "x": 95, "y": 64, "flags": 4},
+            {"matrix": [5, 9], "x": 149, "y": 64, "flags": 1},
+            {"matrix": [5, 10], "x": 164, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 179, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 194, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 209, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 224, "y": 64, "flags": 4}
+        ],
         "led_flush_limit": 26,
         "led_process_limit": 20,
         "max_brightness": 200

+ 0 - 23
keyboards/mt/mt84/mt84.c

@@ -114,27 +114,4 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
    {1, SW4_CS10,  SW5_CS10,  SW6_CS10},
    {1, SW7_CS10,   SW8_CS10,   SW9_CS10}
 };
-
-led_config_t g_led_config = {{
-    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14 },
-    { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,  28, 29 },
-    { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 },
-    { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,  55, 56, 57, 58 },
-    { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 },
-    {74, 75, 76, 77, 78, 79, 80, 81, 82, 83 }
-}, {
-    {   0,  0 }, {  15,  0 }, {  30,  0 }, {  45,  0 }, {  60,  0 }, { 75,  0 }, { 90,  0 }, { 105,  0 }, { 120,  0 }, { 135,  0 }, { 150,  0 }, { 165,  0 }, { 180,  0 }, { 195,  0 }, { 210,  0 }, { 224,  0 },
-    {   0,  13 }, {  15,  13 }, {  30,  13 }, {  45,  13 }, {  60,  13 }, { 75,  13 }, { 90,  13 }, { 105,  13 }, { 120,  13 }, { 135,  13 }, { 150,  13 }, { 165,  13 }, { 180,  13 }, { 205,  13 }, { 224,  13 },
-    {   3, 26 }, {  18, 26 }, {  33, 26 }, {  48, 26 }, {  63, 26 }, { 78, 26 }, { 93, 26 }, { 108, 26 }, { 123, 26 }, { 138, 26 }, { 153, 26 }, { 168, 26 }, { 183,  26 }, { 205,  26 },{ 224,  26 },
-    {   6, 39 }, {  20, 39 }, {  36, 39 }, {  52, 39 }, {  68, 39 }, { 84, 39 }, { 100, 39 }, { 116, 39 }, { 132, 39 }, { 148, 39 }, { 164, 39 }, { 180, 39 }, { 212,  39 }, { 224,  39 },
-    {   9, 52 }, {  27, 52 }, {  43, 52 }, {  59, 52 }, {  75, 52 }, { 91, 52 }, { 107, 52 }, { 123, 52 }, { 139, 52 }, { 155, 52 }, { 171, 52 }, { 187, 52 }, { 212,  52 }, { 224,  52 },
-{   2, 64 }, {  18, 64 }, {  33, 64 },                 {  93, 64 },                                                                              { 150, 64 }, { 165,  64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 }
-}, {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1,         4,              1, 1, 1, 4, 4, 4,
-}};
 #endif