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 /layouts/community | |
| 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 'layouts/community')
| -rw-r--r-- | layouts/community/ergodox/drashna/keymap.c | 7 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/keymap.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index eeb21501b..3cfce966b 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c | |||
| @@ -403,11 +403,10 @@ void suspend_wakeup_init_keymap(void) { | |||
| 403 | rgb_matrix_set_suspend_state(false); | 403 | rgb_matrix_set_suspend_state(false); |
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) { | 406 | extern led_config_t g_led_config; |
| 407 | rgb_led led; | 407 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) { |
| 408 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 408 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 409 | led = g_rgb_leds[i]; | 409 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 410 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 411 | rgb_matrix_set_color( i, red, green, blue ); | 410 | rgb_matrix_set_color( i, red, green, blue ); |
| 412 | } | 411 | } |
| 413 | } | 412 | } |
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c index 5eef2e023..e8dc185a1 100644 --- a/layouts/community/ortho_4x12/drashna/keymap.c +++ b/layouts/community/ortho_4x12/drashna/keymap.c | |||
| @@ -184,11 +184,10 @@ void suspend_wakeup_init_keymap(void) { | |||
| 184 | rgb_matrix_set_suspend_state(false); | 184 | rgb_matrix_set_suspend_state(false); |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | extern led_config_t g_led_config; | ||
| 187 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) { | 188 | void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) { |
| 188 | rgb_led led; | ||
| 189 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { | 189 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 190 | led = g_rgb_leds[i]; | 190 | if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) { |
| 191 | if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) { | ||
| 192 | rgb_matrix_set_color( i, red, green, blue ); | 191 | rgb_matrix_set_color( i, red, green, blue ); |
| 193 | } | 192 | } |
| 194 | } | 193 | } |
