aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/owlab
diff options
context:
space:
mode:
authorJack Sangdahl2025-09-09 11:08:42 +0200
committerGitHub2025-09-09 11:08:42 +0200
commitff1900190c166d28f8d903ea7bf723658780d192 (patch)
tree0df8bca5cdc1290d36d378d11d2b119521c800aa /keyboards/owlab
parent2818085d3fffb645e1835326104534ee94b03fdb (diff)
Migrate `g_led_config` to DD (NO) (#25621)
Diffstat (limited to 'keyboards/owlab')
-rw-r--r--keyboards/owlab/voice65/hotswap/hotswap.c23
-rw-r--r--keyboards/owlab/voice65/hotswap/keyboard.json69
-rw-r--r--keyboards/owlab/voice65/soldered/keyboard.json73
-rw-r--r--keyboards/owlab/voice65/soldered/soldered.c23
4 files changed, 142 insertions, 46 deletions
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index 79179d1661..ec27cf9b75 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -86,29 +86,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB65-dn- */
{0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB66-right- */
};
-
-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, NO_LED, 43 },
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
- { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, NO_LED, 65, 66 }
-}, {
- { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 208, 0 }, { 224, 0 },
- { 2, 16 }, { 18, 16 }, { 34, 16 }, { 50, 16 }, { 66, 16 }, { 82, 16 }, { 98, 16 }, { 114, 16 }, { 130, 16 }, { 146, 16 }, { 162, 16 }, { 178, 16 }, { 194, 16 }, { 210, 16 }, { 224, 16 },
- { 4, 32 }, { 20, 32 }, { 36, 32 }, { 52, 32 }, { 68, 32 }, { 84, 32 }, { 100, 32 }, { 116, 32 }, { 132, 32 }, { 148, 32 }, { 164, 32 }, { 180, 32 }, { 196, 32 }, { 224, 32 },
- { 8, 48 }, { 24, 48 }, { 40, 48 }, { 56, 48 }, { 72, 48 }, { 88, 48 }, { 104, 48 }, { 120, 48 }, { 136, 48 }, { 152, 48 }, { 168, 48 }, { 184, 48 }, { 208, 48 }, { 224, 48 },
- { 2, 64 }, { 18, 64 }, { 34, 64 }, { 82, 64 }, { 146, 64 }, { 162, 64 }, { 178, 64 }, { 210, 64 }, { 224, 64 }
-}, {
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1,
- }
-};
-
-
#endif
bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/owlab/voice65/hotswap/keyboard.json b/keyboards/owlab/voice65/hotswap/keyboard.json
index 79ca2a57ed..e31a7b5e65 100644
--- a/keyboards/owlab/voice65/hotswap/keyboard.json
+++ b/keyboards/owlab/voice65/hotswap/keyboard.json
@@ -63,6 +63,75 @@
"val": 128
},
"driver": "is31fl3741",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 208, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 2, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 18, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 50, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 66, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 114, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 130, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 146, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 162, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 178, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 194, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 210, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 4, "y": 32, "flags": 0},
+ {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 36, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 68, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 84, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 100, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 132, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 148, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 164, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 180, "y": 32, "flags": 4},
+ {"matrix": [2, 12], "x": 196, "y": 32, "flags": 1},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 8, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 24, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 40, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 56, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 72, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 88, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 104, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 120, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 136, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 152, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 168, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 184, "y": 48, "flags": 1},
+ {"matrix": [3, 13], "x": 208, "y": 48, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 18, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 34, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 82, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 146, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 162, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 178, "y": 64, "flags": 1},
+ {"matrix": [4, 13], "x": 210, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ],
"led_flush_limit": 26,
"led_process_limit": 4,
"max_brightness": 200,
diff --git a/keyboards/owlab/voice65/soldered/keyboard.json b/keyboards/owlab/voice65/soldered/keyboard.json
index edd79a064f..312b612561 100644
--- a/keyboards/owlab/voice65/soldered/keyboard.json
+++ b/keyboards/owlab/voice65/soldered/keyboard.json
@@ -63,6 +63,79 @@
"val": 128
},
"driver": "is31fl3741",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 135, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 150, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 180, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 195, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 209, "y": 0, "flags": 4},
+ {"matrix": [2, 13], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 2, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 18, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 34, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 50, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 66, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 98, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 114, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 130, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 146, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 162, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 178, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 194, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 2, "y": 32, "flags": 0},
+ {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 36, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 68, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 84, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 100, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 132, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 148, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 164, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 180, "y": 32, "flags": 4},
+ {"matrix": [2, 12], "x": 202, "y": 32, "flags": 1},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 0], "x": 0, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 192, "y": 48, "flags": 1},
+ {"matrix": [3, 13], "x": 208, "y": 48, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 0, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 20, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 40, "y": 64, "flags": 1},
+ {"matrix": [4, 3], "x": 60, "y": 64, "flags": 1},
+ {"matrix": [4, 4], "x": 95, "y": 64, "flags": 1},
+ {"matrix": [4, 6], "x": 132, "y": 64, "flags": 1},
+ {"matrix": [4, 9], "x": 152, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 172, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 192, "y": 64, "flags": 1},
+ {"matrix": [4, 12], "x": 208, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ],
"led_flush_limit": 26,
"led_process_limit": 4,
"max_brightness": 200,
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index 23144914fe..5a47de96e8 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -90,29 +90,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB69-dn- */
{0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB70-right- */
};
-
-led_config_t g_led_config = { {
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
- { 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, 15, 44 },
- { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59 },
- { 60, 61, 62, 63, 64, NO_LED, 65, NO_LED, NO_LED, 66, 67, 68, 69, NO_LED, 70 }
-}, {
- { 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 }, { 209, 0 }, { 224, 0 },
- { 2, 16 }, { 18, 16 }, { 34, 16 }, { 50, 16 }, { 66, 16 }, { 82, 16 }, { 98, 16 }, { 114, 16 }, { 130, 16 }, { 146, 16 }, { 162, 16 }, { 178, 16 }, { 194, 16 }, { 208, 16 }, { 224, 16 },
- { 2, 32 }, { 20, 32 }, { 36, 32 }, { 52, 32 }, { 68, 32 }, { 84, 32 }, { 100, 32 }, { 116, 32 }, { 132, 32 }, { 148, 32 }, { 164, 32 }, { 180, 32 }, { 202, 32 }, { 224, 32 },
- { 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, { 80, 48 }, { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 176, 48 }, { 192, 48 }, { 208, 48 }, { 224, 48 },
- { 0, 64 }, { 20, 64 }, { 40, 64 }, { 60, 64 }, { 95, 64 }, { 132, 64 }, { 152, 64 }, { 172, 64 }, { 192, 64 }, { 208, 64 }, { 224, 64 }
-}, {
- 1, 4, 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,
- 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
- }
-};
-
-
#endif
bool rgb_matrix_indicators_kb(void) {