diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2019-05-07 18:22:46 -0500 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-07 16:22:46 -0700 |
| commit | af89752bffbaf5dcea30ea16be66b4d682701bc4 (patch) | |
| tree | c82f2bc25409159a44778379db8b3a35afc47b8a /keyboards/planck/keymaps/tom/keymap.c | |
| parent | c7f8548d9af2045996294602d2a4bd9a214ae23c (diff) | |
| download | qmk_firmware-af89752bffbaf5dcea30ea16be66b4d682701bc4.tar.gz qmk_firmware-af89752bffbaf5dcea30ea16be66b4d682701bc4.zip | |
rgb_led struct conversion (aka: Per led (key) type rgb matrix effects - part 2) (#5783)
* Initial conversion of the rgb_led struct
* Converting last keyboard & updating effects to take advantage of the new structure
* New struct should not be const
* Updated docs
* Changing define ___ for no led to NO_LED
* Missed converting some keymap usages of the old struct layout
Diffstat (limited to 'keyboards/planck/keymaps/tom/keymap.c')
| -rw-r--r-- | keyboards/planck/keymaps/tom/keymap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/keyboards/planck/keymaps/tom/keymap.c b/keyboards/planck/keymaps/tom/keymap.c index 5b7177c6c..0ffff4e69 100644 --- a/keyboards/planck/keymaps/tom/keymap.c +++ b/keyboards/planck/keymaps/tom/keymap.c | |||
| @@ -224,14 +224,16 @@ bool music_mask_user(uint16_t keycode) { | |||
| 224 | } | 224 | } |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | #ifdef RGB_MATRIX_ENABLE | ||
| 228 | extern led_config_t g_led_config; | ||
| 229 | #endif | ||
| 230 | |||
| 227 | void rgb_matrix_indicators_user(void) { | 231 | void rgb_matrix_indicators_user(void) { |
| 228 | #ifdef RGB_MATRIX_ENABLE | 232 | #ifdef RGB_MATRIX_ENABLE |
| 229 | rgb_led led; | ||
| 230 | switch (biton32(layer_state)) { | 233 | switch (biton32(layer_state)) { |
| 231 | case _RAISE: | 234 | case _RAISE: |
| 232 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 235 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 233 | led = g_rgb_leds[i]; | 236 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 234 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 235 | rgb_matrix_set_color(i, 0x6B, 0x00, 0x80); | 237 | rgb_matrix_set_color(i, 0x6B, 0x00, 0x80); |
| 236 | } else { | 238 | } else { |
| 237 | rgb_matrix_set_color(i, 0x00, 0xFF, 0x00); | 239 | rgb_matrix_set_color(i, 0x00, 0xFF, 0x00); |
| @@ -241,8 +243,7 @@ void rgb_matrix_indicators_user(void) { | |||
| 241 | 243 | ||
| 242 | case _LOWER: | 244 | case _LOWER: |
| 243 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 245 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 244 | led = g_rgb_leds[i]; | 246 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 245 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 246 | rgb_matrix_set_color(i, 0xFF, 0xA5, 0x00); | 247 | rgb_matrix_set_color(i, 0xFF, 0xA5, 0x00); |
| 247 | } else { | 248 | } else { |
| 248 | rgb_matrix_set_color(i, 0x00, 0x67, 0xC7); | 249 | rgb_matrix_set_color(i, 0x00, 0x67, 0xC7); |
