diff options
Diffstat (limited to 'keyboards/dztech')
| -rw-r--r-- | keyboards/dztech/dz40rgb/dz40rgb.c | 163 | ||||
| -rw-r--r-- | keyboards/dztech/dz40rgb/keymaps/default/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb/dz60rgb.c | 419 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c | 5 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c | 5 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c | 5 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb/keymaps/iso/keymap.c | 5 | ||||
| -rw-r--r-- | keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c | 30 | ||||
| -rw-r--r-- | keyboards/dztech/dz65rgb/dz65rgb.c | 90 |
10 files changed, 183 insertions, 551 deletions
diff --git a/keyboards/dztech/dz40rgb/dz40rgb.c b/keyboards/dztech/dz40rgb/dz40rgb.c index 34bfc4366..e5e39c92a 100644 --- a/keyboards/dztech/dz40rgb/dz40rgb.c +++ b/keyboards/dztech/dz40rgb/dz40rgb.c | |||
| @@ -52,7 +52,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 52 | {0, E_3, D_3, F_3}, | 52 | {0, E_3, D_3, F_3}, |
| 53 | {0, E_2, D_2, F_2}, | 53 | {0, E_2, D_2, F_2}, |
| 54 | {0, E_1, D_1, F_1}, | 54 | {0, E_1, D_1, F_1}, |
| 55 | 55 | ||
| 56 | {0, E_13, D_13, F_13}, | 56 | {0, E_13, D_13, F_13}, |
| 57 | {0, E_14, D_14, F_14}, | 57 | {0, E_14, D_14, F_14}, |
| 58 | 58 | ||
| @@ -71,70 +71,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 71 | 71 | ||
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 74 | led_config_t g_led_config = { { |
| 75 | 75 | { 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, | |
| 76 | {{0|(11<<4)}, {20.36*11, 0}, 1}, | 76 | { 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, |
| 77 | {{0|(10<<4)}, {20.36*10, 0}, 1}, | 77 | { 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 }, |
| 78 | {{0|(9<<4)}, {20.36*9, 0}, 1}, | 78 | { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42 } |
| 79 | {{0|(8<<4)}, {20.36*8, 0}, 1}, | 79 | }, { |
| 80 | {{0|(7<<4)}, {20.36*7, 0}, 1}, | 80 | { 223, 0 }, { 203, 0 }, { 183, 0 }, { 162, 0 }, { 142, 0 }, { 122, 0 }, { 101, 0 }, { 81, 0 }, { 61, 0 }, { 40, 0 }, { 20, 0 }, { 0, 0 }, |
| 81 | {{0|(6<<4)}, { 20.36*6, 0}, 1}, | 81 | { 223, 10 }, { 0, 10 }, { 223, 21 }, { 203, 21 }, { 183, 21 }, { 162, 21 }, { 142, 21 }, { 122, 21 }, { 101, 21 }, { 81, 21 }, { 61, 21 }, { 40, 21 }, |
| 82 | {{0|(5<<4)}, { 20.36*5, 0}, 1}, | 82 | { 20, 21 }, { 0, 21 }, { 223, 31 }, { 0, 31 }, { 223, 42 }, { 203, 42 }, { 183, 42 }, { 162, 42 }, { 142, 42 }, { 122, 42 }, { 101, 42 }, { 81, 42 }, |
| 83 | {{0|(4<<4)}, { 20.36*4, 0}, 1}, | 83 | { 61, 42 }, { 40, 42 }, { 20, 42 }, { 0, 42 }, { 223, 53 }, { 0, 53 }, { 223, 63 }, { 203, 63 }, { 183, 63 }, { 162, 63 }, { 142, 63 }, { 122, 63 }, |
| 84 | {{0|(3<<4)}, { 20.36*3, 0}, 1}, | 84 | { 101, 63 }, { 81, 63 }, { 61, 63 }, { 40, 63 }, { 20, 63 }, { 0, 63 } |
| 85 | {{0|(2<<4)}, { 20.36*2, 0}, 1}, | 85 | }, { |
| 86 | {{0|(1<<4)}, { 20.36*1, 0}, 1}, | 86 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 87 | {{0|(0<<4)}, { 20.36*0, 0}, 1}, | 87 | 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 88 | 88 | 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, | |
| 89 | {{0|(12<<4)}, {20.36*11, 21.33*0.5}, 1}, | 89 | 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 90 | {{0|(13<<4)}, {20.36*0,21.33*0.5}, 1}, | 90 | 1, 1, 1, 1, 1, 1 |
| 91 | 91 | } }; | |
| 92 | {{1|(11<<4)}, {20.36*11, 21.33}, 1}, | ||
| 93 | {{1|(10<<4)}, {20.36*10, 21.33}, 4}, | ||
| 94 | {{1|(9<<4)}, {20.36*9, 21.33}, 4}, | ||
| 95 | {{1|(8<<4)}, {20.36*8, 21.33}, 4}, | ||
| 96 | {{1|(7<<4)}, {20.36*7, 21.33}, 4}, | ||
| 97 | {{1|(6<<4)}, { 20.36*6, 21.33}, 4}, | ||
| 98 | {{1|(5<<4)}, { 20.36*5, 21.33}, 4}, | ||
| 99 | {{1|(4<<4)}, { 20.36*4, 21.33}, 4}, | ||
| 100 | {{1|(3<<4)}, { 20.36*3, 21.33}, 4}, | ||
| 101 | {{1|(2<<4)}, { 20.36*2, 21.33}, 4}, | ||
| 102 | {{1|(1<<4)}, { 20.36*1, 21.33}, 4}, | ||
| 103 | {{1|(0<<4)}, { 20.36*0, 21.33}, 1}, | ||
| 104 | |||
| 105 | {{1|(12<<4)}, {20.36*11, 21.33*1.5}, 1}, | ||
| 106 | {{1|(13<<4)}, {20.36*0,21.33*1.5}, 1}, | ||
| 107 | 92 | ||
| 108 | {{2|(11<<4)}, {20.36*11, 21.33*2}, 1}, | ||
| 109 | {{2|(10<<4)}, {20.36*10, 21.33*2}, 4}, | ||
| 110 | {{2|(9<<4)}, {20.36*9, 21.33*2}, 4}, | ||
| 111 | {{2|(8<<4)}, {20.36*8, 21.33*2}, 4}, | ||
| 112 | {{2|(7<<4)}, {20.36*7, 21.33*2}, 4}, | ||
| 113 | {{2|(6<<4)}, { 20.36*6, 21.33*2}, 4}, | ||
| 114 | {{2|(5<<4)}, { 20.36*5, 21.33*2}, 4}, | ||
| 115 | {{2|(4<<4)}, { 20.36*4, 21.33*2}, 4}, | ||
| 116 | {{2|(3<<4)}, { 20.36*3, 21.33*2}, 4}, | ||
| 117 | {{2|(2<<4)}, { 20.36*2, 21.33*2}, 4}, | ||
| 118 | {{2|(1<<4)}, { 20.36*1, 21.33*2}, 4}, | ||
| 119 | {{2|(0<<4)}, { 20.36*0, 21.33*2}, 1}, | ||
| 120 | |||
| 121 | {{2|(12<<4)}, {20.36*11, 21.33*2.5}, 1}, | ||
| 122 | {{2|(13<<4)}, {20.36*0,21.33*2.5}, 1}, | ||
| 123 | |||
| 124 | {{3|(11<<4)}, {20.36*11, 21.33*3}, 1}, | ||
| 125 | {{3|(10<<4)}, {20.36*10, 21.33*3}, 1}, | ||
| 126 | {{3|(9<<4)}, {20.36*9, 21.33*3}, 1}, | ||
| 127 | {{3|(8<<4)}, {20.36*8, 21.33*3}, 1}, | ||
| 128 | {{3|(7<<4)}, {20.36*7, 21.33*3}, 1}, | ||
| 129 | {{3|(6<<4)}, { 20.36*6, 21.33*3}, 1}, | ||
| 130 | {{3|(5<<4)}, { 20.36*5, 21.33*3}, 1}, | ||
| 131 | {{3|(4<<4)}, { 20.36*4, 21.33*3}, 1}, | ||
| 132 | {{3|(3<<4)}, { 20.36*3, 21.33*3}, 1}, | ||
| 133 | {{3|(2<<4)}, { 20.36*2, 21.33*3}, 1}, | ||
| 134 | {{3|(1<<4)}, { 20.36*1, 21.33*3}, 1}, | ||
| 135 | {{3|(0<<4)}, { 20.36*0, 21.33*3}, 1} | ||
| 136 | |||
| 137 | }; | ||
| 138 | #else | 93 | #else |
| 139 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 94 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { |
| 140 | /* Refer to IS31 manual for these locations | 95 | /* Refer to IS31 manual for these locations |
| @@ -205,69 +160,25 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 205 | 160 | ||
| 206 | }; | 161 | }; |
| 207 | 162 | ||
| 208 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 163 | led_config_t g_led_config = { { |
| 164 | { 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, | ||
| 165 | { 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, | ||
| 166 | { 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 }, | ||
| 167 | { 52, 51, 50, 49, 48, NO_LED, 47, 46, 45, 44, 43, 42 } | ||
| 168 | }, { | ||
| 169 | { 223, 0 }, { 203, 0 }, { 183, 0 }, { 162, 0 }, { 142, 0 }, { 122, 0 }, { 101, 0 }, { 81, 0 }, { 61, 0 }, { 40, 0 }, { 20, 0 }, { 0, 0 }, | ||
| 170 | { 223, 10 }, { 0, 10 }, { 223, 21 }, { 203, 21 }, { 183, 21 }, { 162, 21 }, { 142, 21 }, { 122, 21 }, { 101, 21 }, { 81, 21 }, { 61, 21 }, { 40, 21 }, | ||
| 171 | { 20, 21 }, { 0, 21 }, { 223, 31 }, { 0, 31 }, { 223, 42 }, { 203, 42 }, { 183, 42 }, { 162, 42 }, { 142, 42 }, { 122, 42 }, { 101, 42 }, { 81, 42 }, | ||
| 172 | { 61, 42 }, { 40, 42 }, { 20, 42 }, { 0, 42 }, { 223, 53 }, { 0, 53 }, { 223, 63 }, { 203, 63 }, { 183, 63 }, { 162, 63 }, { 142, 63 }, { 111, 63 }, | ||
| 173 | { 81, 63 }, { 61, 63 }, { 40, 63 }, { 20, 63 }, { 0, 63 } | ||
| 174 | }, { | ||
| 175 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | ||
| 176 | 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, | ||
| 177 | 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, | ||
| 178 | 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, | ||
| 179 | 1, 1, 1, 1, 1 | ||
| 180 | } }; | ||
| 209 | 181 | ||
| 210 | {{0|(11<<4)}, {20.36*11, 0}, 1}, | ||
| 211 | {{0|(10<<4)}, {20.36*10, 0}, 1}, | ||
| 212 | {{0|(9<<4)}, {20.36*9, 0}, 1}, | ||
| 213 | {{0|(8<<4)}, {20.36*8, 0}, 1}, | ||
| 214 | {{0|(7<<4)}, {20.36*7, 0}, 1}, | ||
| 215 | {{0|(6<<4)}, { 20.36*6, 0}, 1}, | ||
| 216 | {{0|(5<<4)}, { 20.36*5, 0}, 1}, | ||
| 217 | {{0|(4<<4)}, { 20.36*4, 0}, 1}, | ||
| 218 | {{0|(3<<4)}, { 20.36*3, 0}, 1}, | ||
| 219 | {{0|(2<<4)}, { 20.36*2, 0}, 1}, | ||
| 220 | {{0|(1<<4)}, { 20.36*1, 0}, 1}, | ||
| 221 | {{0|(0<<4)}, { 20.36*0, 0}, 1}, | ||
| 222 | |||
| 223 | {{0|(12<<4)}, {20.36*11, 21.33*0.5}, 1}, | ||
| 224 | {{0|(13<<4)}, {20.36*0,21.33*0.5}, 1}, | ||
| 225 | |||
| 226 | {{1|(11<<4)}, {20.36*11, 21.33}, 1}, | ||
| 227 | {{1|(10<<4)}, {20.36*10, 21.33}, 4}, | ||
| 228 | {{1|(9<<4)}, {20.36*9, 21.33}, 4}, | ||
| 229 | {{1|(8<<4)}, {20.36*8, 21.33}, 4}, | ||
| 230 | {{1|(7<<4)}, {20.36*7, 21.33}, 4}, | ||
| 231 | {{1|(6<<4)}, { 20.36*6, 21.33}, 4}, | ||
| 232 | {{1|(5<<4)}, { 20.36*5, 21.33}, 4}, | ||
| 233 | {{1|(4<<4)}, { 20.36*4, 21.33}, 4}, | ||
| 234 | {{1|(3<<4)}, { 20.36*3, 21.33}, 4}, | ||
| 235 | {{1|(2<<4)}, { 20.36*2, 21.33}, 4}, | ||
| 236 | {{1|(1<<4)}, { 20.36*1, 21.33}, 4}, | ||
| 237 | {{1|(0<<4)}, { 20.36*0, 21.33}, 1}, | ||
| 238 | |||
| 239 | {{1|(12<<4)}, {20.36*11, 21.33*1.5}, 1}, | ||
| 240 | {{1|(13<<4)}, {20.36*0,21.33*1.5}, 1}, | ||
| 241 | |||
| 242 | {{2|(11<<4)}, {20.36*11, 21.33*2}, 1}, | ||
| 243 | {{2|(10<<4)}, {20.36*10, 21.33*2}, 4}, | ||
| 244 | {{2|(9<<4)}, {20.36*9, 21.33*2}, 4}, | ||
| 245 | {{2|(8<<4)}, {20.36*8, 21.33*2}, 4}, | ||
| 246 | {{2|(7<<4)}, {20.36*7, 21.33*2}, 4}, | ||
| 247 | {{2|(6<<4)}, { 20.36*6, 21.33*2}, 4}, | ||
| 248 | {{2|(5<<4)}, { 20.36*5, 21.33*2}, 4}, | ||
| 249 | {{2|(4<<4)}, { 20.36*4, 21.33*2}, 4}, | ||
| 250 | {{2|(3<<4)}, { 20.36*3, 21.33*2}, 4}, | ||
| 251 | {{2|(2<<4)}, { 20.36*2, 21.33*2}, 4}, | ||
| 252 | {{2|(1<<4)}, { 20.36*1, 21.33*2}, 4}, | ||
| 253 | {{2|(0<<4)}, { 20.36*0, 21.33*2}, 1}, | ||
| 254 | |||
| 255 | {{2|(12<<4)}, {20.36*11, 21.33*2.5}, 1}, | ||
| 256 | {{2|(13<<4)}, {20.36*0,21.33*2.5}, 1}, | ||
| 257 | |||
| 258 | {{3|(11<<4)}, {20.36*11, 21.33*3}, 1}, | ||
| 259 | {{3|(10<<4)}, {20.36*10, 21.33*3}, 1}, | ||
| 260 | {{3|(9<<4)}, {20.36*9, 21.33*3}, 1}, | ||
| 261 | {{3|(8<<4)}, {20.36*8, 21.33*3}, 1}, | ||
| 262 | {{3|(7<<4)}, {20.36*7, 21.33*3}, 1}, | ||
| 263 | {{3|(6<<4)}, { 20.36*5.5, 21.33*3}, 1}, | ||
| 264 | {{3|(4<<4)}, { 20.36*4, 21.33*3}, 1}, | ||
| 265 | {{3|(3<<4)}, { 20.36*3, 21.33*3}, 1}, | ||
| 266 | {{3|(2<<4)}, { 20.36*2, 21.33*3}, 1}, | ||
| 267 | {{3|(1<<4)}, { 20.36*1, 21.33*3}, 1}, | ||
| 268 | {{3|(0<<4)}, { 20.36*0, 21.33*3}, 1} | ||
| 269 | |||
| 270 | }; | ||
| 271 | #endif | 182 | #endif |
| 272 | 183 | ||
| 273 | 184 | ||
diff --git a/keyboards/dztech/dz40rgb/keymaps/default/keymap.c b/keyboards/dztech/dz40rgb/keymaps/default/keymap.c index 59b917121..650c178a7 100644 --- a/keyboards/dztech/dz40rgb/keymaps/default/keymap.c +++ b/keyboards/dztech/dz40rgb/keymaps/default/keymap.c | |||
| @@ -31,11 +31,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | ), | 31 | ), |
| 32 | 32 | ||
| 33 | }; | 33 | }; |
| 34 | |||
| 35 | extern led_config_t g_led_config; | ||
| 34 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { | 36 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 35 | rgb_led led; | ||
| 36 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 37 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 37 | led = g_rgb_leds[i]; | 38 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 38 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 39 | rgb_matrix_set_color( i, red, green, blue ); | 39 | rgb_matrix_set_color( i, red, green, blue ); |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
diff --git a/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c b/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c index 5613e3500..80741b19c 100644 --- a/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c +++ b/keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c | |||
| @@ -53,12 +53,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | 55 | ||
| 56 | 56 | extern led_config_t g_led_config; | |
| 57 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { | 57 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 58 | rgb_led led; | ||
| 59 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 58 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 60 | led = g_rgb_leds[i]; | 59 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 61 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 62 | rgb_matrix_set_color( i, red, green, blue ); | 60 | rgb_matrix_set_color( i, red, green, blue ); |
| 63 | } | 61 | } |
| 64 | } | 62 | } |
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c index 10b2ea7a8..28ac7ce9e 100644 --- a/keyboards/dztech/dz60rgb/dz60rgb.c +++ b/keyboards/dztech/dz60rgb/dz60rgb.c | |||
| @@ -65,69 +65,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 65 | {0, K_16, J_16, L_16}, | 65 | {0, K_16, J_16, L_16}, |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 68 | led_config_t g_led_config = { { |
| 69 | {{0|(13<<4)}, {16*13.5, 0}, 1}, | 69 | { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, |
| 70 | {{0|(12<<4)}, {16*12, 0}, 1}, | 70 | { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 28 }, |
| 71 | {{0|(11<<4)}, {16*11, 0}, 1}, | 71 | { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 14 }, |
| 72 | {{0|(10<<4)}, {16*10, 0}, 1}, | 72 | { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, NO_LED }, |
| 73 | {{0|(9<<4)}, {16*9, 0}, 1}, | 73 | { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED, 53 } |
| 74 | {{0|(8<<4)}, {16*8, 0}, 1}, | 74 | }, { |
| 75 | {{0|(7<<4)}, {16*7, 0}, 1}, | 75 | { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 }, |
| 76 | {{0|(6<<4)}, {16*6, 0}, 1}, | 76 | { 220, 24 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 }, |
| 77 | {{0|(5<<4)}, {16*5, 0}, 1}, | 77 | { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, { 210, 48 }, |
| 78 | {{0|(4<<4)}, {16*4, 0}, 1}, | 78 | { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 222, 64 }, { 202, 64 }, { 182, 64 }, |
| 79 | {{0|(3<<4)}, {16*3, 0}, 1}, | 79 | { 162, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 } |
| 80 | {{0|(2<<4)}, {16*2, 0}, 1}, | 80 | }, { |
| 81 | {{0|(1<<4)}, {16*1, 0}, 1}, | 81 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 82 | {{0|(0<<4)}, {16*0, 0}, 1}, | 82 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 83 | {{2|(13<<4)}, {16*13.75, 24}, 1}, | 83 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, |
| 84 | {{1|(12<<4)}, {16*12.5, 16}, 4}, | 84 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, |
| 85 | {{1|(11<<4)}, {16*11.5, 16}, 4}, | 85 | 1, 4, 1, 1, 1 |
| 86 | {{1|(10<<4)}, {16*10.5, 16}, 4}, | 86 | } }; |
| 87 | {{1|(9<<4)}, { 16*9.5, 16}, 4}, | 87 | |
| 88 | {{1|(8<<4)}, { 16*8.5, 16}, 4}, | ||
| 89 | {{1|(7<<4)}, { 16*7.5, 16}, 4}, | ||
| 90 | {{1|(6<<4)}, { 16*6.5, 16}, 4}, | ||
| 91 | {{1|(5<<4)}, { 16*5.5, 16}, 4}, | ||
| 92 | {{1|(4<<4)}, { 16*4.5, 16}, 4}, | ||
| 93 | {{1|(3<<4)}, { 16*3.5, 16}, 4}, | ||
| 94 | {{1|(2<<4)}, { 16*2.5, 16}, 4}, | ||
| 95 | {{1|(1<<4)}, { 16*1.5, 16}, 4}, | ||
| 96 | {{1|(0<<4)}, { 16*0.25, 16}, 1}, | ||
| 97 | {{1|(13<<4)}, {16*12.75, 32}, 1}, | ||
| 98 | {{2|(11<<4)}, {16*11.75, 32}, 4}, | ||
| 99 | {{2|(10<<4)}, {16*10.75, 32}, 4}, | ||
| 100 | {{2|(9<<4)}, {16*9.75, 32}, 4}, | ||
| 101 | {{2|(8<<4)}, {16*8.75, 32}, 4}, | ||
| 102 | {{2|(7<<4)}, {16*7.75, 32}, 4}, | ||
| 103 | {{2|(6<<4)}, { 16*6.75, 32}, 4}, | ||
| 104 | {{2|(5<<4)}, { 16*5.75, 32}, 4}, | ||
| 105 | {{2|(4<<4)}, { 16*4.75, 32}, 4}, | ||
| 106 | {{2|(3<<4)}, { 16*3.75, 32}, 4}, | ||
| 107 | {{2|(2<<4)}, { 16*2.75, 32}, 4}, | ||
| 108 | {{2|(1<<4)}, { 16*1.75, 32}, 4}, | ||
| 109 | {{2|(0<<4)}, { 16*0.375, 32}, 1}, | ||
| 110 | {{3|(11<<4)}, {16*13.125, 48}, 1}, | ||
| 111 | {{3|(10<<4)}, {16*11.25, 48}, 4}, | ||
| 112 | {{3|(9<<4)}, {16*10.25, 48}, 4}, | ||
| 113 | {{3|(8<<4)}, {16*9.25, 48}, 4}, | ||
| 114 | {{3|(7<<4)}, {16*8.25, 48}, 4}, | ||
| 115 | {{3|(6<<4)}, {16*7.25, 48}, 4}, | ||
| 116 | {{3|(5<<4)}, {16*6.25, 48}, 4}, | ||
| 117 | {{3|(4<<4)}, {16*5.25, 48}, 4}, | ||
| 118 | {{3|(3<<4)}, {16*4.25, 48}, 4}, | ||
| 119 | {{3|(2<<4)}, {16*3.25, 48}, 4}, | ||
| 120 | {{3|(1<<4)}, {16*1.25, 48}, 4}, | ||
| 121 | {{3|(0<<4)}, {16*0.625, 48}, 1}, | ||
| 122 | {{4|(13<<4)}, {16*13.875, 64}, 1}, | ||
| 123 | {{4|(11<<4)}, {16*12.625, 64}, 1}, | ||
| 124 | {{4|(10<<4)}, {16*11.375, 64}, 1}, | ||
| 125 | {{4|(9<<4)}, {16*10.125, 64}, 1}, | ||
| 126 | {{4|(5<<4)}, { 16*6.375, 64}, 4}, | ||
| 127 | {{4|(2<<4)}, { 16*2.625, 64}, 1}, | ||
| 128 | {{4|(1<<4)}, { 16*1.375, 64}, 1}, | ||
| 129 | {{4|(0<<4)}, { 16*0.125, 64}, 1}, | ||
| 130 | }; | ||
| 131 | #elif defined (dzrgb60_hhkb) | 88 | #elif defined (dzrgb60_hhkb) |
| 132 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 89 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { |
| 133 | {0, H_15, G_15, I_15}, | 90 | {0, H_15, G_15, I_15}, |
| @@ -194,70 +151,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 194 | {0, K_16, J_16, L_16}, | 151 | {0, K_16, J_16, L_16}, |
| 195 | }; | 152 | }; |
| 196 | 153 | ||
| 197 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 154 | led_config_t g_led_config = { { |
| 198 | {{2|(12<<4)}, {16*14, 0}, 1}, | 155 | { 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 }, |
| 199 | {{0|(13<<4)}, {16*13, 0}, 1}, | 156 | { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 }, |
| 200 | {{0|(12<<4)}, {16*12, 0}, 1}, | 157 | { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 0, 29 }, |
| 201 | {{0|(11<<4)}, {16*11, 0}, 1}, | 158 | { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, NO_LED, 42 }, |
| 202 | {{0|(10<<4)}, {16*10, 0}, 1}, | 159 | { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 } |
| 203 | {{0|(9<<4)}, {16*9, 0}, 1}, | 160 | }, { |
| 204 | {{0|(8<<4)}, {16*8, 0}, 1}, | 161 | { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, |
| 205 | {{0|(7<<4)}, {16*7, 0}, 1}, | 162 | { 0, 0 }, { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, |
| 206 | {{0|(6<<4)}, {16*6, 0}, 1}, | 163 | { 4, 16 }, { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, |
| 207 | {{0|(5<<4)}, {16*5, 0}, 1}, | 164 | { 224, 48 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 218, 64 }, |
| 208 | {{0|(4<<4)}, {16*4, 0}, 1}, | 165 | { 198, 64 }, { 178, 64 }, { 112, 64 }, { 46, 64 }, { 26, 64 }, { 6, 64 } |
| 209 | {{0|(3<<4)}, {16*3, 0}, 1}, | 166 | }, { |
| 210 | {{0|(2<<4)}, {16*2, 0}, 1}, | 167 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 211 | {{0|(1<<4)}, {16*1, 0}, 1}, | 168 | 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 212 | {{0|(0<<4)}, {16*0, 0}, 1}, | 169 | 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 213 | {{1|(13<<4)}, {16*13.75, 16}, 1}, | 170 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, |
| 214 | {{1|(12<<4)}, {16*12.5, 16}, 4}, | 171 | 1, 1, 4, 1, 1, 1 |
| 215 | {{1|(11<<4)}, {16*11.5, 16}, 4}, | 172 | } }; |
| 216 | {{1|(10<<4)}, {16*10.5, 16}, 4}, | 173 | |
| 217 | {{1|(9<<4)}, { 16*9.5, 16}, 4}, | ||
| 218 | {{1|(8<<4)}, { 16*8.5, 16}, 4}, | ||
| 219 | {{1|(7<<4)}, { 16*7.5, 16}, 4}, | ||
| 220 | {{1|(6<<4)}, { 16*6.5, 16}, 4}, | ||
| 221 | {{1|(5<<4)}, { 16*5.5, 16}, 4}, | ||
| 222 | {{1|(4<<4)}, { 16*4.5, 16}, 4}, | ||
| 223 | {{1|(3<<4)}, { 16*3.5, 16}, 4}, | ||
| 224 | {{1|(2<<4)}, { 16*2.5, 16}, 4}, | ||
| 225 | {{1|(1<<4)}, { 16*1.5, 16}, 4}, | ||
| 226 | {{1|(0<<4)}, { 16*0.25, 16}, 1}, | ||
| 227 | {{2|(13<<4)}, {16*12.75, 32}, 1}, | ||
| 228 | {{2|(11<<4)}, {16*11.75, 32}, 4}, | ||
| 229 | {{2|(10<<4)}, {16*10.75, 32}, 4}, | ||
| 230 | {{2|(9<<4)}, {16*9.75, 32}, 4}, | ||
| 231 | {{2|(8<<4)}, {16*8.75, 32}, 4}, | ||
| 232 | {{2|(7<<4)}, {16*7.75, 32}, 4}, | ||
| 233 | {{2|(6<<4)}, { 16*6.75, 32}, 4}, | ||
| 234 | {{2|(5<<4)}, { 16*5.75, 32}, 4}, | ||
| 235 | {{2|(4<<4)}, { 16*4.75, 32}, 4}, | ||
| 236 | {{2|(3<<4)}, { 16*3.75, 32}, 4}, | ||
| 237 | {{2|(2<<4)}, { 16*2.75, 32}, 4}, | ||
| 238 | {{2|(1<<4)}, { 16*1.75, 32}, 4}, | ||
| 239 | {{2|(0<<4)}, { 16*0.375, 32}, 1}, | ||
| 240 | {{3|(13<<4)}, {16*14, 48}, 1}, | ||
| 241 | {{3|(11<<4)}, {16*12.625, 48}, 4}, | ||
| 242 | {{3|(10<<4)}, {16*11.25, 48}, 4}, | ||
| 243 | {{3|(9<<4)}, {16*10.25, 48}, 4}, | ||
| 244 | {{3|(8<<4)}, {16*9.25, 48}, 4}, | ||
| 245 | {{3|(7<<4)}, {16*8.25, 48}, 4}, | ||
| 246 | {{3|(6<<4)}, {16*7.25, 48}, 4}, | ||
| 247 | {{3|(5<<4)}, {16*6.25, 48}, 4}, | ||
| 248 | {{3|(4<<4)}, {16*5.25, 48}, 4}, | ||
| 249 | {{3|(3<<4)}, {16*4.25, 48}, 4}, | ||
| 250 | {{3|(2<<4)}, {16*3.25, 48}, 4}, | ||
| 251 | {{3|(1<<4)}, {16*1.25, 48}, 4}, | ||
| 252 | {{3|(0<<4)}, {16*0.625, 48}, 1}, | ||
| 253 | {{4|(13<<4)}, {16*13.625, 64}, 1}, | ||
| 254 | {{4|(11<<4)}, {16*12.375, 64}, 1}, | ||
| 255 | {{4|(10<<4)}, {16*11.125, 64}, 1}, | ||
| 256 | {{4|(5<<4)}, { 16*7, 64}, 4}, | ||
| 257 | {{4|(2<<4)}, { 16*2.875, 64}, 1}, | ||
| 258 | {{4|(1<<4)}, { 16*1.625, 64}, 1}, | ||
| 259 | {{4|(0<<4)}, { 16*0.375, 64}, 1}, | ||
| 260 | }; | ||
| 261 | #elif defined (dzrgb60_hhkb_iso) | 174 | #elif defined (dzrgb60_hhkb_iso) |
| 262 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 175 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { |
| 263 | {0, H_15, G_15, I_15}, | 176 | {0, H_15, G_15, I_15}, |
| @@ -324,70 +237,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 324 | {0, K_16, J_16, L_16}, | 237 | {0, K_16, J_16, L_16}, |
| 325 | }; | 238 | }; |
| 326 | 239 | ||
| 327 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 240 | led_config_t g_led_config = { { |
| 328 | {{2|(12<<4)}, {16*14, 0}, 1}, | 241 | { 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 }, |
| 329 | {{0|(13<<4)}, {16*13, 0}, 1}, | 242 | { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 29 }, |
| 330 | {{0|(12<<4)}, {16*12, 0}, 1}, | 243 | { 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 0, 15 }, |
| 331 | {{0|(11<<4)}, {16*11, 0}, 1}, | 244 | { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, NO_LED, 42 }, |
| 332 | {{0|(10<<4)}, {16*10, 0}, 1}, | 245 | { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 } |
| 333 | {{0|(9<<4)}, {16*9, 0}, 1}, | 246 | }, { |
| 334 | {{0|(8<<4)}, {16*8, 0}, 1}, | 247 | { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, |
| 335 | {{0|(7<<4)}, {16*7, 0}, 1}, | 248 | { 0, 0 }, { 220, 24 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, |
| 336 | {{0|(6<<4)}, {16*6, 0}, 1}, | 249 | { 4, 16 }, { 204, 32 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, |
| 337 | {{0|(5<<4)}, {16*5, 0}, 1}, | 250 | { 224, 48 }, { 202, 48 }, { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 218, 64 }, |
| 338 | {{0|(4<<4)}, {16*4, 0}, 1}, | 251 | { 198, 64 }, { 178, 64 }, { 112, 64 }, { 46, 64 }, { 26, 64 }, { 6, 64 } |
| 339 | {{0|(3<<4)}, {16*3, 0}, 1}, | 252 | }, { |
| 340 | {{0|(2<<4)}, {16*2, 0}, 1}, | 253 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 341 | {{0|(1<<4)}, {16*1, 0}, 1}, | 254 | 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 342 | {{0|(0<<4)}, {16*0, 0}, 1}, | 255 | 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 343 | {{2|(13<<4)}, {16*13.75, 24}, 1}, | 256 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, |
| 344 | {{1|(12<<4)}, {16*12.5, 16}, 4}, | 257 | 1, 1, 4, 1, 1, 1 |
| 345 | {{1|(11<<4)}, {16*11.5, 16}, 4}, | 258 | } }; |
| 346 | {{1|(10<<4)}, {16*10.5, 16}, 4}, | 259 | |
| 347 | {{1|(9<<4)}, { 16*9.5, 16}, 4}, | ||
| 348 | {{1|(8<<4)}, { 16*8.5, 16}, 4}, | ||
| 349 | {{1|(7<<4)}, { 16*7.5, 16}, 4}, | ||
| 350 | {{1|(6<<4)}, { 16*6.5, 16}, 4}, | ||
| 351 | {{1|(5<<4)}, { 16*5.5, 16}, 4}, | ||
| 352 | {{1|(4<<4)}, { 16*4.5, 16}, 4}, | ||
| 353 | {{1|(3<<4)}, { 16*3.5, 16}, 4}, | ||
| 354 | {{1|(2<<4)}, { 16*2.5, 16}, 4}, | ||
| 355 | {{1|(1<<4)}, { 16*1.5, 16}, 4}, | ||
| 356 | {{1|(0<<4)}, { 16*0.25, 16}, 1}, | ||
| 357 | {{1|(13<<4)}, {16*12.75, 32}, 1}, | ||
| 358 | {{2|(11<<4)}, {16*11.75, 32}, 4}, | ||
| 359 | {{2|(10<<4)}, {16*10.75, 32}, 4}, | ||
| 360 | {{2|(9<<4)}, {16*9.75, 32}, 4}, | ||
| 361 | {{2|(8<<4)}, {16*8.75, 32}, 4}, | ||
| 362 | {{2|(7<<4)}, {16*7.75, 32}, 4}, | ||
| 363 | {{2|(6<<4)}, { 16*6.75, 32}, 4}, | ||
| 364 | {{2|(5<<4)}, { 16*5.75, 32}, 4}, | ||
| 365 | {{2|(4<<4)}, { 16*4.75, 32}, 4}, | ||
| 366 | {{2|(3<<4)}, { 16*3.75, 32}, 4}, | ||
| 367 | {{2|(2<<4)}, { 16*2.75, 32}, 4}, | ||
| 368 | {{2|(1<<4)}, { 16*1.75, 32}, 4}, | ||
| 369 | {{2|(0<<4)}, { 16*0.375, 32}, 1}, | ||
| 370 | {{3|(13<<4)}, {16*14, 48}, 1}, | ||
| 371 | {{3|(11<<4)}, {16*12.625, 48}, 4}, | ||
| 372 | {{3|(10<<4)}, {16*11.25, 48}, 4}, | ||
| 373 | {{3|(9<<4)}, {16*10.25, 48}, 4}, | ||
| 374 | {{3|(8<<4)}, {16*9.25, 48}, 4}, | ||
| 375 | {{3|(7<<4)}, {16*8.25, 48}, 4}, | ||
| 376 | {{3|(6<<4)}, {16*7.25, 48}, 4}, | ||
| 377 | {{3|(5<<4)}, {16*6.25, 48}, 4}, | ||
| 378 | {{3|(4<<4)}, {16*5.25, 48}, 4}, | ||
| 379 | {{3|(3<<4)}, {16*4.25, 48}, 4}, | ||
| 380 | {{3|(2<<4)}, {16*3.25, 48}, 4}, | ||
| 381 | {{3|(1<<4)}, {16*1.25, 48}, 4}, | ||
| 382 | {{3|(0<<4)}, {16*0.625, 48}, 1}, | ||
| 383 | {{4|(13<<4)}, {16*13.625, 64}, 1}, | ||
| 384 | {{4|(11<<4)}, {16*12.375, 64}, 1}, | ||
| 385 | {{4|(10<<4)}, {16*11.125, 64}, 1}, | ||
| 386 | {{4|(5<<4)}, { 16*7, 64}, 4}, | ||
| 387 | {{4|(2<<4)}, { 16*2.875, 64}, 1}, | ||
| 388 | {{4|(1<<4)}, { 16*1.625, 64}, 1}, | ||
| 389 | {{4|(0<<4)}, { 16*0.375, 64}, 1}, | ||
| 390 | }; | ||
| 391 | #elif defined (dzrgb60_ansi) | 260 | #elif defined (dzrgb60_ansi) |
| 392 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 261 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { |
| 393 | {0, K_14, J_14, L_14}, | 262 | {0, K_14, J_14, L_14}, |
| @@ -453,69 +322,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 453 | {0, K_16, J_16, L_16}, | 322 | {0, K_16, J_16, L_16}, |
| 454 | }; | 323 | }; |
| 455 | 324 | ||
| 456 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 325 | led_config_t g_led_config = { { |
| 457 | {{0|(13<<4)}, {16*13.5, 0}, 1}, | 326 | { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, |
| 458 | {{0|(12<<4)}, {16*12, 0}, 1}, | 327 | { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, |
| 459 | {{0|(11<<4)}, {16*11, 0}, 1}, | 328 | { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 }, |
| 460 | {{0|(10<<4)}, {16*10, 0}, 1}, | 329 | { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, NO_LED }, |
| 461 | {{0|(9<<4)}, {16*9, 0}, 1}, | 330 | { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED, 53 } |
| 462 | {{0|(8<<4)}, {16*8, 0}, 1}, | 331 | }, { |
| 463 | {{0|(7<<4)}, {16*7, 0}, 1}, | 332 | { 216, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, { 32, 0 }, { 16, 0 }, { 0, 0 }, |
| 464 | {{0|(6<<4)}, {16*6, 0}, 1}, | 333 | { 220, 16 }, { 200, 16 }, { 184, 16 }, { 168, 16 }, { 152, 16 }, { 136, 16 }, { 120, 16 }, { 104, 16 }, { 88, 16 }, { 72, 16 }, { 56, 16 }, { 40, 16 }, { 24, 16 }, { 4, 16 }, |
| 465 | {{0|(5<<4)}, {16*5, 0}, 1}, | 334 | { 214, 24 }, { 188, 32 }, { 172, 32 }, { 156, 32 }, { 140, 32 }, { 124, 32 }, { 108, 32 }, { 92, 32 }, { 76, 32 }, { 60, 32 }, { 44, 32 }, { 28, 32 }, { 6, 32 }, { 210, 48 }, |
| 466 | {{0|(4<<4)}, {16*4, 0}, 1}, | 335 | { 180, 48 }, { 164, 48 }, { 148, 48 }, { 132, 48 }, { 116, 48 }, { 100, 48 }, { 84, 48 }, { 68, 48 }, { 52, 48 }, { 20, 48 }, { 10, 48 }, { 222, 64 }, { 202, 64 }, { 182, 64 }, |
| 467 | {{0|(3<<4)}, {16*3, 0}, 1}, | 336 | { 162, 64 }, { 102, 64 }, { 42, 64 }, { 22, 64 }, { 2, 64 } |
| 468 | {{0|(2<<4)}, {16*2, 0}, 1}, | 337 | }, { |
| 469 | {{0|(1<<4)}, {16*1, 0}, 1}, | 338 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 470 | {{0|(0<<4)}, {16*0, 0}, 1}, | 339 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 471 | {{1|(13<<4)}, {16*13.75, 16}, 1}, | 340 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, |
| 472 | {{1|(12<<4)}, {16*12.5, 16}, 4}, | 341 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, |
| 473 | {{1|(11<<4)}, {16*11.5, 16}, 4}, | 342 | 1, 4, 1, 1, 1 |
| 474 | {{1|(10<<4)}, {16*10.5, 16}, 4}, | 343 | } }; |
| 475 | {{1|(9<<4)}, { 16*9.5, 16}, 4}, | 344 | |
| 476 | {{1|(8<<4)}, { 16*8.5, 16}, 4}, | ||
| 477 | {{1|(7<<4)}, { 16*7.5, 16}, 4}, | ||
| 478 | {{1|(6<<4)}, { 16*6.5, 16}, 4}, | ||
| 479 | {{1|(5<<4)}, { 16*5.5, 16}, 4}, | ||
| 480 | {{1|(4<<4)}, { 16*4.5, 16}, 4}, | ||
| 481 | {{1|(3<<4)}, { 16*3.5, 16}, 4}, | ||
| 482 | {{1|(2<<4)}, { 16*2.5, 16}, 4}, | ||
| 483 | {{1|(1<<4)}, { 16*1.5, 16}, 4}, | ||
| 484 | {{1|(0<<4)}, { 16*0.25, 16}, 1}, | ||
| 485 | {{2|(13<<4)}, {16*13.375, 24}, 1}, | ||
| 486 | {{2|(11<<4)}, {16*11.75, 32}, 4}, | ||
| 487 | {{2|(10<<4)}, {16*10.75, 32}, 4}, | ||
| 488 | {{2|(9<<4)}, {16*9.75, 32}, 4}, | ||
| 489 | {{2|(8<<4)}, {16*8.75, 32}, 4}, | ||
| 490 | {{2|(7<<4)}, {16*7.75, 32}, 4}, | ||
| 491 | {{2|(6<<4)}, { 16*6.75, 32}, 4}, | ||
| 492 | {{2|(5<<4)}, { 16*5.75, 32}, 4}, | ||
| 493 | {{2|(4<<4)}, { 16*4.75, 32}, 4}, | ||
| 494 | {{2|(3<<4)}, { 16*3.75, 32}, 4}, | ||
| 495 | {{2|(2<<4)}, { 16*2.75, 32}, 4}, | ||
| 496 | {{2|(1<<4)}, { 16*1.75, 32}, 4}, | ||
| 497 | {{2|(0<<4)}, { 16*0.375, 32}, 1}, | ||
| 498 | {{3|(11<<4)}, {16*13.125, 48}, 1}, | ||
| 499 | {{3|(10<<4)}, {16*11.25, 48}, 4}, | ||
| 500 | {{3|(9<<4)}, {16*10.25, 48}, 4}, | ||
| 501 | {{3|(8<<4)}, {16*9.25, 48}, 4}, | ||
| 502 | {{3|(7<<4)}, {16*8.25, 48}, 4}, | ||
| 503 | {{3|(6<<4)}, {16*7.25, 48}, 4}, | ||
| 504 | {{3|(5<<4)}, {16*6.25, 48}, 4}, | ||
| 505 | {{3|(4<<4)}, {16*5.25, 48}, 4}, | ||
| 506 | {{3|(3<<4)}, {16*4.25, 48}, 4}, | ||
| 507 | {{3|(2<<4)}, {16*3.25, 48}, 4}, | ||
| 508 | {{3|(1<<4)}, {16*1.25, 48}, 4}, | ||
| 509 | {{3|(0<<4)}, {16*0.625, 48}, 1}, | ||
| 510 | {{4|(13<<4)}, {16*13.875, 64}, 1}, | ||
| 511 | {{4|(11<<4)}, {16*12.625, 64}, 1}, | ||
| 512 | {{4|(10<<4)}, {16*11.375, 64}, 1}, | ||
| 513 | {{4|(9<<4)}, {16*10.125, 64}, 1}, | ||
| 514 | {{4|(5<<4)}, { 16*6.375, 64}, 4}, | ||
| 515 | {{4|(2<<4)}, { 16*2.625, 64}, 1}, | ||
| 516 | {{4|(1<<4)}, { 16*1.375, 64}, 1}, | ||
| 517 | {{4|(0<<4)}, { 16*0.125, 64}, 1}, | ||
| 518 | }; | ||
| 519 | #else | 345 | #else |
| 520 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 346 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { |
| 521 | {0, K_14, J_14, L_14}, | 347 | {0, K_14, J_14, L_14}, |
| @@ -583,71 +409,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 583 | {0, K_16, J_16, L_16}, | 409 | {0, K_16, J_16, L_16}, |
| 584 | }; | 410 | }; |
| 585 | 411 | ||
| 586 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 412 | led_config_t g_led_config = { { |
| 587 | {{0|(13<<4)}, {17.23*13, 0}, 1}, | 413 | { 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, |
| 588 | {{0|(12<<4)}, {17.23*12, 0}, 1}, | 414 | { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, |
| 589 | {{0|(11<<4)}, {17.23*11, 0}, 1}, | 415 | { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, NO_LED, 28 }, |
| 590 | {{0|(10<<4)}, {17.23*10, 0}, 1}, | 416 | { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, NO_LED, 41 }, |
| 591 | {{0|(9<<4)}, {17.23*9, 0}, 1}, | 417 | { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 } |
| 592 | {{0|(8<<4)}, {17.23*8, 0}, 1}, | 418 | }, { |
| 593 | {{0|(7<<4)}, {17.23*7, 0}, 1}, | 419 | { 223, 0 }, { 206, 0 }, { 189, 0 }, { 172, 0 }, { 155, 0 }, { 137, 0 }, { 120, 0 }, { 103, 0 }, { 86, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, |
| 594 | {{0|(6<<4)}, { 17.23*6, 0}, 1}, | 420 | { 223, 16 }, { 206, 16 }, { 189, 16 }, { 172, 16 }, { 155, 16 }, { 137, 16 }, { 120, 16 }, { 103, 16 }, { 86, 16 }, { 68, 16 }, { 51, 16 }, { 34, 16 }, { 17, 16 }, { 0, 16 }, |
| 595 | {{0|(5<<4)}, { 17.23*5, 0}, 1}, | 421 | { 223, 32 }, { 189, 32 }, { 172, 32 }, { 155, 32 }, { 137, 32 }, { 120, 32 }, { 103, 32 }, { 86, 32 }, { 68, 32 }, { 51, 32 }, { 34, 32 }, { 17, 32 }, { 0, 32 }, { 223, 48 }, |
| 596 | {{0|(4<<4)}, { 17.23*4, 0}, 1}, | 422 | { 189, 48 }, { 172, 48 }, { 155, 48 }, { 137, 48 }, { 120, 48 }, { 103, 48 }, { 86, 48 }, { 68, 48 }, { 51, 48 }, { 34, 48 }, { 17, 48 }, { 0, 48 }, { 223, 64 }, { 189, 64 }, |
| 597 | {{0|(3<<4)}, { 17.23*3, 0}, 1}, | 423 | { 172, 64 }, { 155, 64 }, { 137, 64 }, { 86, 64 }, { 34, 64 }, { 17, 64 }, { 0, 64 } |
| 598 | {{0|(2<<4)}, { 17.23*2, 0}, 1}, | 424 | }, { |
| 599 | {{0|(1<<4)}, { 17.23*1, 0}, 1}, | 425 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| 600 | {{0|(0<<4)}, { 17.23*0, 0}, 1}, | 426 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 601 | {{1|(13<<4)}, {17.23*13, 16}, 1}, | 427 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, |
| 602 | {{1|(12<<4)}, {17.23*12, 16}, 4}, | 428 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, |
| 603 | {{1|(11<<4)}, {17.23*11, 16}, 4}, | 429 | 1, 1, 1, 4, 1, 1, 1 |
| 604 | {{1|(10<<4)}, {17.23*10, 16}, 4}, | 430 | } }; |
| 605 | {{1|(9<<4)}, {17.23*9, 16}, 4}, | 431 | |
| 606 | {{1|(8<<4)}, {17.23*8, 16}, 4}, | ||
| 607 | {{1|(7<<4)}, {17.23*7, 16}, 4}, | ||
| 608 | {{1|(6<<4)}, { 17.23*6, 16}, 4}, | ||
| 609 | {{1|(5<<4)}, { 17.23*5, 16}, 4}, | ||
| 610 | {{1|(4<<4)}, { 17.23*4, 16}, 4}, | ||
| 611 | {{1|(3<<4)}, { 17.23*3, 16}, 4}, | ||
| 612 | {{1|(2<<4)}, { 17.23*2, 16}, 4}, | ||
| 613 | {{1|(1<<4)}, { 17.23*1, 16}, 4}, | ||
| 614 | {{1|(0<<4)}, { 17.23*0, 16}, 1}, | ||
| 615 | {{2|(13<<4)}, {17.23*13, 32}, 1}, | ||
| 616 | {{2|(11<<4)}, {17.23*11, 32}, 4}, | ||
| 617 | {{2|(10<<4)}, {17.23*10, 32}, 4}, | ||
| 618 | {{2|(9<<4)}, {17.23*9, 32}, 4}, | ||
| 619 | {{2|(8<<4)}, {17.23*8, 32}, 4}, | ||
| 620 | {{2|(7<<4)}, {17.23*7, 32}, 4}, | ||
| 621 | {{2|(6<<4)}, { 17.23*6, 32}, 4}, | ||
| 622 | {{2|(5<<4)}, { 17.23*5, 32}, 4}, | ||
| 623 | {{2|(4<<4)}, { 17.23*4, 32}, 4}, | ||
| 624 | {{2|(3<<4)}, { 17.23*3, 32}, 4}, | ||
| 625 | {{2|(2<<4)}, { 17.23*2, 32}, 4}, | ||
| 626 | {{2|(1<<4)}, { 17.23*1, 32}, 4}, | ||
| 627 | {{2|(0<<4)}, { 17.23*0, 32}, 1}, | ||
| 628 | {{3|(13<<4)}, {17.23*13, 48}, 1}, | ||
| 629 | {{3|(11<<4)}, {17.23*11, 48}, 4}, | ||
| 630 | {{3|(10<<4)}, {17.23*10, 48}, 4}, | ||
| 631 | {{3|(9<<4)}, {17.23*9, 48}, 4}, | ||
| 632 | {{3|(8<<4)}, {17.23*8, 48}, 4}, | ||
| 633 | {{3|(7<<4)}, {17.23*7, 48}, 4}, | ||
| 634 | {{3|(6<<4)}, { 17.23*6, 48}, 4}, | ||
| 635 | {{3|(5<<4)}, { 17.23*5, 48}, 4}, | ||
| 636 | {{3|(4<<4)}, { 17.23*4, 48}, 4}, | ||
| 637 | {{3|(3<<4)}, { 17.23*3, 48}, 4}, | ||
| 638 | {{3|(2<<4)}, { 17.23*2, 48}, 4}, | ||
| 639 | {{3|(1<<4)}, { 17.23*1, 48}, 4}, | ||
| 640 | {{3|(0<<4)}, { 17.23*0, 48}, 1}, | ||
| 641 | {{4|(13<<4)}, {17.23*13, 64}, 1}, | ||
| 642 | {{4|(11<<4)}, {17.23*11, 64}, 1}, | ||
| 643 | {{4|(10<<4)}, {17.23*10, 64}, 1}, | ||
| 644 | {{4|(9<<4)}, {17.23*9, 64}, 1}, | ||
| 645 | {{4|(8<<4)}, {17.23*8, 64}, 1}, | ||
| 646 | {{4|(5<<4)}, { 17.23*5, 64}, 4}, | ||
| 647 | {{4|(2<<4)}, { 17.23*2, 64}, 1}, | ||
| 648 | {{4|(1<<4)}, { 17.23*1, 64}, 1}, | ||
| 649 | {{4|(0<<4)}, { 17.23*0, 64}, 1}, | ||
| 650 | }; | ||
| 651 | #endif | 432 | #endif |
| 652 | 433 | ||
| 653 | void matrix_init_kb(void) { | 434 | void matrix_init_kb(void) { |
diff --git a/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c b/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c index 741fc55fb..584f035ef 100644 --- a/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c | |||
| @@ -38,11 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 38 | KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 38 | KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | extern led_config_t g_led_config; | ||
| 41 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { | 42 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 42 | rgb_led led; | ||
| 43 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 43 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 44 | led = g_rgb_leds[i]; | 44 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 45 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 46 | rgb_matrix_set_color( i, red, green, blue ); | 45 | rgb_matrix_set_color( i, red, green, blue ); |
| 47 | } | 46 | } |
| 48 | } | 47 | } |
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c index 1f3807c3b..5a7a56801 100644 --- a/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c | |||
| @@ -39,11 +39,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | extern led_config_t g_led_config; | ||
| 42 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { | 43 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 43 | rgb_led led; | ||
| 44 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 44 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 45 | led = g_rgb_leds[i]; | 45 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 46 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 47 | rgb_matrix_set_color( i, red, green, blue ); | 46 | rgb_matrix_set_color( i, red, green, blue ); |
| 48 | } | 47 | } |
| 49 | } | 48 | } |
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c b/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c index 4575eb19d..34c1752ff 100644 --- a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c | |||
| @@ -39,11 +39,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 39 | KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS), | 39 | KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS), |
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | extern led_config_t g_led_config; | ||
| 42 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { | 43 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 43 | rgb_led led; | ||
| 44 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 44 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 45 | led = g_rgb_leds[i]; | 45 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 46 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 47 | rgb_matrix_set_color( i, red, green, blue ); | 46 | rgb_matrix_set_color( i, red, green, blue ); |
| 48 | } | 47 | } |
| 49 | } | 48 | } |
diff --git a/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c b/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c index 5e3884803..3a90d2f33 100644 --- a/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c | |||
| @@ -38,11 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 38 | KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 38 | KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | extern led_config_t g_led_config; | ||
| 41 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { | 42 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 42 | rgb_led led; | ||
| 43 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 43 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 44 | led = g_rgb_leds[i]; | 44 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 45 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 46 | rgb_matrix_set_color( i, red, green, blue ); | 45 | rgb_matrix_set_color( i, red, green, blue ); |
| 47 | } | 46 | } |
| 48 | } | 47 | } |
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c index 3dfa78374..a6d1e226b 100644 --- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c | |||
| @@ -50,40 +50,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, bool default_layer) | 53 | extern led_config_t g_led_config; |
| 54 | { | 54 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 55 | rgb_led led; | 55 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 56 | 56 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { | |
| 57 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 57 | rgb_matrix_set_color( i, red, green, blue ); |
| 58 | led = g_rgb_leds[i]; | 58 | } |
| 59 | 59 | } | |
| 60 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 61 | rgb_matrix_set_color( i, red, green, blue ); | ||
| 62 | } | ||
| 63 | } | ||
| 64 | } | 60 | } |
| 65 | 61 | ||
| 66 | void rgb_matrix_indicators_user(void) | 62 | void rgb_matrix_indicators_user(void) |
| 67 | { | 63 | { |
| 68 | uint8_t this_led = host_keyboard_leds(); | 64 | uint8_t this_led = host_keyboard_leds(); |
| 69 | 65 | ||
| 70 | if (!g_suspend_state) { | 66 | if (!g_suspend_state) { |
| 71 | switch (biton32(layer_state)) { | 67 | switch (biton32(layer_state)) { |
| 72 | case _LAYER1: | 68 | case _LAYER1: |
| 73 | rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break; | 69 | rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break; |
| 74 | 70 | ||
| 75 | case _LAYER2: | 71 | case _LAYER2: |
| 76 | rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break; | 72 | rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break; |
| 77 | 73 | ||
| 78 | case _LAYER4: | 74 | case _LAYER4: |
| 79 | rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break; | 75 | rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break; |
| 80 | } | 76 | } |
| 81 | } | 77 | } |
| 82 | 78 | ||
| 83 | if (this_led & (1 << USB_LED_CAPS_LOCK)) { | 79 | if (this_led & (1 << USB_LED_CAPS_LOCK)) { |
| 84 | rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); | 80 | rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); |
| 85 | } | 81 | } |
| 86 | 82 | ||
| 87 | switch (biton32(layer_state)) { | 83 | switch (biton32(layer_state)) { |
| 88 | case _LAYER3: | 84 | case _LAYER3: |
| 89 | if (this_led & (1 << USB_LED_NUM_LOCK)) { | 85 | if (this_led & (1 << USB_LED_NUM_LOCK)) { |
| @@ -91,7 +87,7 @@ void rgb_matrix_indicators_user(void) | |||
| 91 | } else { | 87 | } else { |
| 92 | rgb_matrix_set_color(13, 0x00, 0x00, 0x00); | 88 | rgb_matrix_set_color(13, 0x00, 0x00, 0x00); |
| 93 | } | 89 | } |
| 94 | 90 | ||
| 95 | rgb_matrix_set_color(0, 0x00, 0xFF, 0x00); | 91 | rgb_matrix_set_color(0, 0x00, 0xFF, 0x00); |
| 96 | rgb_matrix_set_color(1, 0x00, 0x00, 0x00); | 92 | rgb_matrix_set_color(1, 0x00, 0x00, 0x00); |
| 97 | rgb_matrix_set_color(1, 0x00, 0xFF, 0x00); | 93 | rgb_matrix_set_color(1, 0x00, 0xFF, 0x00); |
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c index 78b345843..e14943d97 100644 --- a/keyboards/dztech/dz65rgb/dz65rgb.c +++ b/keyboards/dztech/dz65rgb/dz65rgb.c | |||
| @@ -73,76 +73,26 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 73 | {1, C9_16, C7_15, C6_15}, // LD16 | 73 | {1, C9_16, C7_15, C6_15}, // LD16 |
| 74 | {1, C8_16, C7_16, C6_16}, // LD17 | 74 | {1, C8_16, C7_16, C6_16}, // LD17 |
| 75 | }; | 75 | }; |
| 76 | rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { | 76 | |
| 77 | {{1|(7<<4)}, {16*7, 16}, 4}, | 77 | led_config_t g_led_config = { { |
| 78 | {{1|(6<<4)}, {16*6, 16}, 4}, | 78 | { 17, 16, 15, 14, 13, 12, 11, 10, 9, 18, 19, 20, 21, 22, 23 }, |
| 79 | {{1|(5<<4)}, {16*5, 16}, 4}, | 79 | { 7, 6, 5, 4, 3, 2, 1, 0, 26, 27, 28, 29, 30, 31, 24 }, |
| 80 | {{1|(4<<4)}, {16*4, 16}, 4}, | 80 | { 8, 48, 47, 46, 45, 44, 43, 51, 52, 53, 54, 55, NO_LED, 56, 25 }, |
| 81 | {{1|(3<<4)}, {16*3, 16}, 4}, | 81 | { 49, 40, 39, 38, 37, 36, 60, 61, 62, 63, 57, 58, NO_LED, 59, 32 }, |
| 82 | {{1|(2<<4)}, {16*2, 16}, 4}, | 82 | { 50, 42, 41, NO_LED, NO_LED, 35, NO_LED, NO_LED, 64, 65, 66, 67, NO_LED, 34, 33 } |
| 83 | {{1|(1<<4)}, {16*1, 16}, 4}, | 83 | }, { |
| 84 | {{1|(0<<4)}, {16*0, 16}, 1}, | 84 | { 112, 16 }, { 96, 16 }, { 80, 16 }, { 64, 16 }, { 48, 16 }, { 32, 16 }, { 16, 16 }, { 0, 16 }, { 0, 32 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 48, 0 }, |
| 85 | {{2|(0<<4)}, {16*0, 32}, 1}, | 85 | { 32, 0 }, { 16, 0 }, { 0, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 208, 0 }, { 224, 0 }, { 224, 16 }, { 224, 32 }, { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 }, |
| 86 | {{0|(8<<4)}, {16*8, 0}, 1}, | 86 | { 192, 16 }, { 208, 16 }, { 224, 48 }, { 224, 64 }, { 208, 64 }, { 80, 64 }, { 80, 48 }, { 64, 48 }, { 48, 48 }, { 32, 48 }, { 16, 48 }, { 32, 64 }, { 16, 64 }, { 96, 32 }, { 80, 32 }, |
| 87 | {{0|(7<<4)}, {16*7, 0}, 1}, | 87 | { 64, 32 }, { 48, 32 }, { 32, 32 }, { 16, 32 }, { 0, 48 }, { 0, 64 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 208, 32 }, { 160, 48 }, { 176, 48 }, { 208, 48 }, |
| 88 | {{0|(6<<4)}, {16*6, 0}, 1}, | 88 | { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 128, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 } |
| 89 | {{0|(5<<4)}, {16*5, 0}, 1}, | 89 | }, { |
| 90 | {{0|(4<<4)}, {16*4, 0}, 1}, | 90 | 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, |
| 91 | {{0|(3<<4)}, {16*3, 0}, 1}, | 91 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, |
| 92 | {{0|(2<<4)}, {16*2, 0}, 1}, | 92 | 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4, |
| 93 | {{0|(1<<4)}, {16*1, 0}, 1}, | 93 | 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 94 | {{0|(0<<4)}, {16*0, 0}, 1}, | 94 | 4, 4, 4, 4, 1, 1, 1, 1 |
| 95 | {{0|(9<<4)}, {16*9, 0}, 1}, | 95 | } }; |
| 96 | {{0|(10<<4)}, {16*10, 0}, 1}, | ||
| 97 | {{0|(11<<4)}, {16*11, 0}, 1}, | ||
| 98 | {{0|(12<<4)}, {16*12, 0}, 1}, | ||
| 99 | {{0|(13<<4)}, {16*13, 0}, 1}, | ||
| 100 | {{0|(14<<4)}, {16*14, 0}, 1}, | ||
| 101 | {{1|(14<<4)}, {16*14, 16}, 1}, | ||
| 102 | {{2|(14<<4)}, {16*14, 32}, 1}, | ||
| 103 | {{1|(8<<4)}, {16*8, 16}, 4}, | ||
| 104 | {{1|(9<<4)}, {16*9, 16}, 4}, | ||
| 105 | {{1|(10<<4)}, {16*10, 16}, 4}, | ||
| 106 | {{1|(11<<4)}, {16*11, 16}, 4}, | ||
| 107 | {{1|(12<<4)}, {16*12, 16}, 4}, | ||
| 108 | {{1|(13<<4)}, {16*13, 16}, 4}, | ||
| 109 | {{3|(14<<4)}, {16*14, 48}, 1}, | ||
| 110 | {{4|(14<<4)}, {16*14, 64}, 1}, | ||
| 111 | {{4|(13<<4)}, {16*13, 64}, 1}, | ||
| 112 | {{4|(5<<4)}, {16*5, 64}, 1}, | ||
| 113 | {{3|(5<<4)}, {16*5, 48}, 4}, | ||
| 114 | {{3|(4<<4)}, {16*4, 48}, 4}, | ||
| 115 | {{3|(3<<4)}, {16*3, 48}, 4}, | ||
| 116 | {{3|(2<<4)}, {16*2, 48}, 4}, | ||
| 117 | {{3|(1<<4)}, {16*1, 48}, 4}, | ||
| 118 | {{4|(2<<4)}, {16*2, 64}, 1}, | ||
| 119 | {{4|(1<<4)}, {16*1, 64}, 1}, | ||
| 120 | {{2|(6<<4)}, {16*6, 32}, 4}, | ||
| 121 | {{2|(5<<4)}, {16*5, 32}, 4}, | ||
| 122 | {{2|(4<<4)}, {16*4, 32}, 4}, | ||
| 123 | {{2|(3<<4)}, {16*3, 32}, 4}, | ||
| 124 | {{2|(2<<4)}, {16*2, 32}, 4}, | ||
| 125 | {{2|(1<<4)}, {16*1, 32}, 4}, | ||
| 126 | {{3|(0<<4)}, {16*0, 48}, 1}, | ||
| 127 | {{4|(0<<4)}, {16*0, 64}, 1}, | ||
| 128 | {{2|(7<<4)}, {16*7, 32}, 4}, | ||
| 129 | {{2|(8<<4)}, {16*8, 32}, 4}, | ||
| 130 | {{2|(9<<4)}, {16*9, 32}, 4}, | ||
| 131 | {{2|(10<<4)}, {16*10, 32}, 4}, | ||
| 132 | {{2|(11<<4)}, {16*11, 32}, 4}, | ||
| 133 | {{2|(13<<4)}, {16*13, 32}, 4}, | ||
| 134 | {{3|(10<<4)}, {16*10, 48}, 4}, | ||
| 135 | {{3|(11<<4)}, {16*11, 48}, 4}, | ||
| 136 | {{3|(13<<4)}, {16*13, 48}, 4}, | ||
| 137 | {{3|(6<<4)}, {16*6, 48}, 4}, | ||
| 138 | {{3|(7<<4)}, {16*7, 48}, 4}, | ||
| 139 | {{3|(8<<4)}, {16*8, 48}, 4}, | ||
| 140 | {{3|(9<<4)}, {16*9, 48}, 4}, | ||
| 141 | {{4|(8<<4)}, {16*8, 64}, 1}, | ||
| 142 | {{4|(9<<4)}, {16*9, 64}, 1}, | ||
| 143 | {{4|(10<<4)}, {16*10, 64}, 1}, | ||
| 144 | {{4|(11<<4)}, {16*11, 64}, 1}, | ||
| 145 | }; | ||
| 146 | 96 | ||
| 147 | void suspend_power_down_kb(void) | 97 | void suspend_power_down_kb(void) |
| 148 | { | 98 | { |
