diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-05 06:01:27 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-05 06:01:27 +0000 |
| commit | 684773f2d4b2b28b1d0f81aa1c4dbd938017d3e9 (patch) | |
| tree | 0b2f27ccd7bf2db84c0940c5d4a7bc24e3f044d4 | |
| parent | e1ced62836d6ca4b4650c7367323ec15b69ffd81 (diff) | |
| parent | e3888281f49d566cb9cf3efdebb105014f0957d2 (diff) | |
| download | qmk_firmware-684773f2d4b2b28b1d0f81aa1c4dbd938017d3e9.tar.gz qmk_firmware-684773f2d4b2b28b1d0f81aa1c4dbd938017d3e9.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | quantum/rgb_matrix.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix.h index 771a1fcd3..1fd016d79 100644 --- a/quantum/rgb_matrix.h +++ b/quantum/rgb_matrix.h | |||
| @@ -91,6 +91,7 @@ enum rgb_matrix_effects { | |||
| 91 | }; | 91 | }; |
| 92 | 92 | ||
| 93 | void eeconfig_update_rgb_matrix_default(void); | 93 | void eeconfig_update_rgb_matrix_default(void); |
| 94 | void eeconfig_update_rgb_matrix(void); | ||
| 94 | 95 | ||
| 95 | uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i); | 96 | uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i); |
| 96 | uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i); | 97 | uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i); |
| @@ -159,6 +160,7 @@ led_flags_t rgb_matrix_get_flags(void); | |||
| 159 | void rgb_matrix_set_flags(led_flags_t flags); | 160 | void rgb_matrix_set_flags(led_flags_t flags); |
| 160 | 161 | ||
| 161 | #ifndef RGBLIGHT_ENABLE | 162 | #ifndef RGBLIGHT_ENABLE |
| 163 | # define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix | ||
| 162 | # define rgblight_toggle rgb_matrix_toggle | 164 | # define rgblight_toggle rgb_matrix_toggle |
| 163 | # define rgblight_toggle_noeeprom rgb_matrix_toggle_noeeprom | 165 | # define rgblight_toggle_noeeprom rgb_matrix_toggle_noeeprom |
| 164 | # define rgblight_enable rgb_matrix_enable | 166 | # define rgblight_enable rgb_matrix_enable |
