aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kbdfans/bella
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kbdfans/bella')
-rw-r--r--keyboards/kbdfans/bella/rgb/keyboard.json96
-rw-r--r--keyboards/kbdfans/bella/rgb/rgb.c30
-rw-r--r--keyboards/kbdfans/bella/rgb_iso/keyboard.json97
-rw-r--r--keyboards/kbdfans/bella/rgb_iso/rgb_iso.c30
4 files changed, 193 insertions, 60 deletions
diff --git a/keyboards/kbdfans/bella/rgb/keyboard.json b/keyboards/kbdfans/bella/rgb/keyboard.json
index 2ca18d2851..7bbc5ea7a2 100644
--- a/keyboards/kbdfans/bella/rgb/keyboard.json
+++ b/keyboards/kbdfans/bella/rgb/keyboard.json
@@ -54,6 +54,102 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 29, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 44, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 59, "y": 0, "flags": 1},
+ {"matrix": [0, 5], "x": 73, "y": 0, "flags": 1},
+ {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+ {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+ {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+ {"matrix": [0, 9], "x": 140, "y": 0, "flags": 1},
+ {"matrix": [0, 11], "x": 161, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 176, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 191, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 206, "y": 0, "flags": 1},
+ {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
+ {"matrix": [1, 1], "x": 15, "y": 17, "flags": 4},
+ {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
+ {"matrix": [1, 3], "x": 44, "y": 17, "flags": 4},
+ {"matrix": [1, 4], "x": 59, "y": 17, "flags": 4},
+ {"matrix": [1, 5], "x": 73, "y": 17, "flags": 4},
+ {"matrix": [1, 6], "x": 88, "y": 17, "flags": 4},
+ {"matrix": [1, 7], "x": 102, "y": 17, "flags": 4},
+ {"matrix": [1, 8], "x": 117, "y": 17, "flags": 4},
+ {"matrix": [1, 9], "x": 132, "y": 17, "flags": 4},
+ {"matrix": [1, 10], "x": 147, "y": 17, "flags": 4},
+ {"matrix": [1, 11], "x": 161, "y": 17, "flags": 4},
+ {"matrix": [1, 12], "x": 176, "y": 17, "flags": 4},
+ {"matrix": [1, 14], "x": 198, "y": 17, "flags": 4},
+ {"matrix": [1, 15], "x": 224, "y": 17, "flags": 4},
+ {"matrix": [2, 0], "x": 4, "y": 29, "flags": 4},
+ {"matrix": [2, 1], "x": 22, "y": 29, "flags": 4},
+ {"matrix": [2, 2], "x": 37, "y": 29, "flags": 4},
+ {"matrix": [2, 3], "x": 51, "y": 29, "flags": 4},
+ {"matrix": [2, 4], "x": 66, "y": 29, "flags": 4},
+ {"matrix": [2, 5], "x": 81, "y": 29, "flags": 4},
+ {"matrix": [2, 6], "x": 95, "y": 29, "flags": 4},
+ {"matrix": [2, 7], "x": 110, "y": 29, "flags": 4},
+ {"matrix": [2, 8], "x": 125, "y": 29, "flags": 4},
+ {"matrix": [2, 9], "x": 140, "y": 29, "flags": 4},
+ {"matrix": [2, 10], "x": 154, "y": 29, "flags": 4},
+ {"matrix": [2, 11], "x": 169, "y": 29, "flags": 4},
+ {"matrix": [2, 12], "x": 184, "y": 29, "flags": 4},
+ {"matrix": [2, 13], "x": 202, "y": 29, "flags": 4},
+ {"matrix": [2, 15], "x": 224, "y": 29, "flags": 4},
+ {"matrix": [3, 0], "x": 5, "y": 41, "flags": 4},
+ {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
+ {"matrix": [3, 2], "x": 40, "y": 41, "flags": 4},
+ {"matrix": [3, 3], "x": 55, "y": 41, "flags": 4},
+ {"matrix": [3, 4], "x": 70, "y": 41, "flags": 4},
+ {"matrix": [3, 5], "x": 84, "y": 41, "flags": 4},
+ {"matrix": [3, 6], "x": 99, "y": 41, "flags": 4},
+ {"matrix": [3, 7], "x": 114, "y": 41, "flags": 4},
+ {"matrix": [3, 8], "x": 129, "y": 41, "flags": 4},
+ {"matrix": [3, 9], "x": 143, "y": 41, "flags": 4},
+ {"matrix": [3, 10], "x": 158, "y": 41, "flags": 4},
+ {"matrix": [3, 11], "x": 172, "y": 41, "flags": 4},
+ {"matrix": [3, 13], "x": 196, "y": 41, "flags": 4},
+ {"matrix": [3, 15], "x": 224, "y": 41, "flags": 4},
+ {"matrix": [4, 0], "x": 9, "y": 52, "flags": 4},
+ {"matrix": [4, 2], "x": 33, "y": 52, "flags": 4},
+ {"matrix": [4, 3], "x": 48, "y": 52, "flags": 4},
+ {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
+ {"matrix": [4, 5], "x": 77, "y": 52, "flags": 4},
+ {"matrix": [4, 6], "x": 92, "y": 52, "flags": 4},
+ {"matrix": [4, 7], "x": 106, "y": 52, "flags": 4},
+ {"matrix": [4, 8], "x": 121, "y": 52, "flags": 4},
+ {"matrix": [4, 9], "x": 136, "y": 52, "flags": 4},
+ {"matrix": [4, 10], "x": 150, "y": 52, "flags": 4},
+ {"matrix": [4, 11], "x": 165, "y": 52, "flags": 4},
+ {"matrix": [4, 12], "x": 185, "y": 52, "flags": 4},
+ {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+ {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4},
+ {"matrix": [5, 1], "x": 20, "y": 64, "flags": 4},
+ {"matrix": [5, 2], "x": 38, "y": 64, "flags": 4},
+ {"matrix": [5, 6], "x": 94, "y": 64, "flags": 4},
+ {"matrix": [5, 10], "x": 150, "y": 64, "flags": 4},
+ {"matrix": [5, 11], "x": 172, "y": 64, "flags": 4},
+ {"matrix": [5, 12], "x": 195, "y": 64, "flags": 1},
+ {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+ {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1},
+ {"x": 0, "y": 0, "flags": 2},
+ {"x": 45, "y": 0, "flags": 2},
+ {"x": 90, "y": 0, "flags": 2},
+ {"x": 134, "y": 0, "flags": 2},
+ {"x": 179, "y": 0, "flags": 2},
+ {"x": 224, "y": 0, "flags": 2},
+ {"x": 0, "y": 32, "flags": 2},
+ {"x": 224, "y": 32, "flags": 2},
+ {"x": 0, "y": 64, "flags": 2},
+ {"x": 45, "y": 64, "flags": 2},
+ {"x": 90, "y": 64, "flags": 2},
+ {"x": 134, "y": 64, "flags": 2},
+ {"x": 179, "y": 64, "flags": 2},
+ {"x": 224, "y": 64, "flags": 2}
+ ],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index 4818c99005..2dd792c5bc 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -118,36 +118,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */
};
-led_config_t g_led_config = {
- {
- /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15*/
- { 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, NO_LED, 9, 10, 11, 12, 13, }, /* R0 */
- { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, NO_LED, 27, 28, }, /* R1 */
- { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43, }, /* R2 */
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, NO_LED, 57, }, /* R3 */
- { 58, NO_LED, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, NO_LED, 70, NO_LED, }, /* R4 */
- { 71, 72, 73, NO_LED, NO_LED, NO_LED, 74, NO_LED, NO_LED, NO_LED, 75, 76, 77, NO_LED, 78, 79, }, /* R5 */
- }, {
- {0, 0}, {29, 0}, {44, 0}, {59, 0}, {73, 0}, {95, 0}, {110, 0}, {125, 0}, {140, 0}, {161, 0}, {176, 0}, {191, 0}, {206, 0}, {224, 0},
- {0, 17}, {15, 17}, {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17},
- {4, 29}, {22, 29}, {37, 29}, {51, 29}, {66, 29}, {81, 29}, {95, 29}, {110, 29}, {125, 29}, {140, 29}, {154, 29}, {169, 29}, {184, 29}, {202, 29}, {224, 29},
- {5, 41}, {26, 41}, {40, 41}, {55, 41}, {70, 41}, {84, 41}, {99, 41}, {114, 41}, {129, 41}, {143, 41}, {158, 41}, {172, 41}, {196, 41}, {224, 41},
- {9, 52}, {33, 52}, {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {185, 52}, {209, 52},
- {2, 64}, {20, 64}, {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64},
- {0, 0}, {45, 0}, {90, 0}, {134, 0}, {179, 0}, {224, 0},
- {0, 32}, {224,32},
- {0, 64}, {45, 64}, {90, 64}, {134, 64}, {179, 64}, {224, 64},
- }, {
- 4,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,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,1,
- 4,4,4,4,4,4,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- }
-};
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
diff --git a/keyboards/kbdfans/bella/rgb_iso/keyboard.json b/keyboards/kbdfans/bella/rgb_iso/keyboard.json
index c7dd6423b5..43f36625f9 100644
--- a/keyboards/kbdfans/bella/rgb_iso/keyboard.json
+++ b/keyboards/kbdfans/bella/rgb_iso/keyboard.json
@@ -54,6 +54,103 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 29, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 44, "y": 0, "flags": 1},
+ {"matrix": [0, 4], "x": 59, "y": 0, "flags": 1},
+ {"matrix": [0, 5], "x": 73, "y": 0, "flags": 1},
+ {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+ {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+ {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+ {"matrix": [0, 9], "x": 140, "y": 0, "flags": 1},
+ {"matrix": [0, 11], "x": 161, "y": 0, "flags": 1},
+ {"matrix": [0, 12], "x": 176, "y": 0, "flags": 1},
+ {"matrix": [0, 13], "x": 191, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 206, "y": 0, "flags": 1},
+ {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
+ {"matrix": [1, 1], "x": 15, "y": 17, "flags": 4},
+ {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
+ {"matrix": [1, 3], "x": 44, "y": 17, "flags": 4},
+ {"matrix": [1, 4], "x": 59, "y": 17, "flags": 4},
+ {"matrix": [1, 5], "x": 73, "y": 17, "flags": 4},
+ {"matrix": [1, 6], "x": 88, "y": 17, "flags": 4},
+ {"matrix": [1, 7], "x": 102, "y": 17, "flags": 4},
+ {"matrix": [1, 8], "x": 117, "y": 17, "flags": 4},
+ {"matrix": [1, 9], "x": 132, "y": 17, "flags": 4},
+ {"matrix": [1, 10], "x": 147, "y": 17, "flags": 4},
+ {"matrix": [1, 11], "x": 161, "y": 17, "flags": 4},
+ {"matrix": [1, 12], "x": 176, "y": 17, "flags": 4},
+ {"matrix": [1, 14], "x": 198, "y": 17, "flags": 4},
+ {"matrix": [1, 15], "x": 224, "y": 17, "flags": 4},
+ {"matrix": [2, 0], "x": 4, "y": 29, "flags": 4},
+ {"matrix": [2, 1], "x": 22, "y": 29, "flags": 4},
+ {"matrix": [2, 2], "x": 37, "y": 29, "flags": 4},
+ {"matrix": [2, 3], "x": 51, "y": 29, "flags": 4},
+ {"matrix": [2, 4], "x": 66, "y": 29, "flags": 4},
+ {"matrix": [2, 5], "x": 81, "y": 29, "flags": 4},
+ {"matrix": [2, 6], "x": 95, "y": 29, "flags": 4},
+ {"matrix": [2, 7], "x": 110, "y": 29, "flags": 4},
+ {"matrix": [2, 8], "x": 125, "y": 29, "flags": 4},
+ {"matrix": [2, 9], "x": 140, "y": 29, "flags": 4},
+ {"matrix": [2, 10], "x": 154, "y": 29, "flags": 4},
+ {"matrix": [2, 11], "x": 169, "y": 29, "flags": 4},
+ {"matrix": [2, 12], "x": 184, "y": 29, "flags": 4},
+ {"matrix": [3, 13], "x": 200, "y": 35, "flags": 4},
+ {"matrix": [2, 15], "x": 224, "y": 29, "flags": 4},
+ {"matrix": [3, 0], "x": 5, "y": 41, "flags": 4},
+ {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
+ {"matrix": [3, 2], "x": 40, "y": 41, "flags": 4},
+ {"matrix": [3, 3], "x": 55, "y": 41, "flags": 4},
+ {"matrix": [3, 4], "x": 70, "y": 41, "flags": 4},
+ {"matrix": [3, 5], "x": 84, "y": 41, "flags": 4},
+ {"matrix": [3, 6], "x": 99, "y": 41, "flags": 4},
+ {"matrix": [3, 7], "x": 114, "y": 41, "flags": 4},
+ {"matrix": [3, 8], "x": 129, "y": 41, "flags": 4},
+ {"matrix": [3, 9], "x": 143, "y": 41, "flags": 4},
+ {"matrix": [3, 10], "x": 158, "y": 41, "flags": 4},
+ {"matrix": [3, 11], "x": 172, "y": 41, "flags": 4},
+ {"matrix": [2, 13], "x": 187, "y": 41, "flags": 4},
+ {"matrix": [3, 15], "x": 224, "y": 41, "flags": 4},
+ {"matrix": [4, 0], "x": 2, "y": 52, "flags": 4},
+ {"matrix": [4, 1], "x": 18, "y": 52, "flags": 4},
+ {"matrix": [4, 2], "x": 33, "y": 52, "flags": 4},
+ {"matrix": [4, 3], "x": 48, "y": 52, "flags": 4},
+ {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
+ {"matrix": [4, 5], "x": 77, "y": 52, "flags": 4},
+ {"matrix": [4, 6], "x": 92, "y": 52, "flags": 4},
+ {"matrix": [4, 7], "x": 106, "y": 52, "flags": 4},
+ {"matrix": [4, 8], "x": 121, "y": 52, "flags": 4},
+ {"matrix": [4, 9], "x": 136, "y": 52, "flags": 4},
+ {"matrix": [4, 10], "x": 150, "y": 52, "flags": 4},
+ {"matrix": [4, 11], "x": 165, "y": 52, "flags": 4},
+ {"matrix": [4, 12], "x": 185, "y": 52, "flags": 4},
+ {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+ {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4},
+ {"matrix": [5, 1], "x": 20, "y": 64, "flags": 4},
+ {"matrix": [5, 2], "x": 38, "y": 64, "flags": 4},
+ {"matrix": [5, 6], "x": 94, "y": 64, "flags": 4},
+ {"matrix": [5, 10], "x": 150, "y": 64, "flags": 4},
+ {"matrix": [5, 11], "x": 172, "y": 64, "flags": 4},
+ {"matrix": [5, 12], "x": 195, "y": 64, "flags": 1},
+ {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+ {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1},
+ {"x": 0, "y": 0, "flags": 2},
+ {"x": 45, "y": 0, "flags": 2},
+ {"x": 90, "y": 0, "flags": 2},
+ {"x": 134, "y": 0, "flags": 2},
+ {"x": 179, "y": 0, "flags": 2},
+ {"x": 224, "y": 0, "flags": 2},
+ {"x": 0, "y": 32, "flags": 2},
+ {"x": 224, "y": 32, "flags": 2},
+ {"x": 0, "y": 64, "flags": 2},
+ {"x": 45, "y": 64, "flags": 2},
+ {"x": 90, "y": 64, "flags": 2},
+ {"x": 134, "y": 64, "flags": 2},
+ {"x": 179, "y": 64, "flags": 2},
+ {"x": 224, "y": 64, "flags": 2}
+ ],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index 8d9349e295..ecbe4b3122 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -119,36 +119,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */
};
-led_config_t g_led_config = {
- {
- /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15*/
- { 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, NO_LED, 9, 10, 11, 12, 13, }, /* R0 */
- { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, NO_LED, 27, 28, }, /* R1 */
- { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 56, NO_LED, 43, }, /* R2 */
- { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 42, NO_LED, 57, }, /* R3 */
- { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NO_LED, 71, NO_LED, }, /* R4 */
- { 72, 73, 74, NO_LED, NO_LED, NO_LED, 75, NO_LED, NO_LED, NO_LED, 76, 77, 78, NO_LED, 79, 80, }, /* R5 */
- }, {
- {0, 0}, {29, 0}, {44, 0}, {59, 0}, {73, 0}, {95, 0}, {110, 0}, {125, 0}, {140, 0}, {161, 0}, {176, 0}, {191, 0}, {206, 0}, {224, 0},
- {0, 17}, {15, 17}, {29, 17}, {44, 17}, {59, 17}, {73, 17}, {88, 17}, {102, 17}, {117, 17}, {132, 17}, {147, 17}, {161, 17}, {176, 17}, {198, 17}, {224, 17},
- {4, 29}, {22, 29}, {37, 29}, {51, 29}, {66, 29}, {81, 29}, {95, 29}, {110, 29}, {125, 29}, {140, 29}, {154, 29}, {169, 29}, {184, 29}, {200, 35}, {224, 29},
- {5, 41}, {26, 41}, {40, 41}, {55, 41}, {70, 41}, {84, 41}, {99, 41}, {114, 41}, {129, 41}, {143, 41}, {158, 41}, {172, 41}, {187, 41}, {224, 41},
- {2, 52}, {18, 52}, {33, 52}, {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {185, 52}, {209, 52},
- {2, 64}, {20, 64}, {38, 64}, {94, 64}, {150, 64}, {172, 64}, {195, 64}, {209, 64}, {224, 64},
- {0, 0}, {45, 0}, {90, 0}, {134, 0}, {179, 0}, {224, 0},
- {0, 32}, {224,32},
- {0, 64}, {45, 64}, {90, 64}, {134, 64}, {179, 64}, {224, 64},
- }, {
- 4,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,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,1,
- 4,4,4,4,4,4,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,
- }
-};
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;