diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
| commit | fdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch) | |
| tree | 9524405fef6cc3b16965517735dc0ef315f67ab1 /quantum/rgblight.c | |
| parent | ed76f4394fd95413f7da11e2342b0965182ccb95 (diff) | |
| parent | 501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff) | |
| download | qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/rgblight.c')
| -rw-r--r-- | quantum/rgblight.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 65308572d..c6d84ccd6 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | # include "eeprom.h" | 24 | # include "eeprom.h" |
| 25 | #endif | 25 | #endif |
| 26 | #ifdef STM32_EEPROM_ENABLE | 26 | #ifdef STM32_EEPROM_ENABLE |
| 27 | # include "hal.h" | 27 | # include <hal.h> |
| 28 | # include "eeprom_stm32.h" | 28 | # include "eeprom_stm32.h" |
| 29 | #endif | 29 | #endif |
| 30 | #include "wait.h" | 30 | #include "wait.h" |
| @@ -34,7 +34,7 @@ | |||
| 34 | #include "color.h" | 34 | #include "color.h" |
| 35 | #include "debug.h" | 35 | #include "debug.h" |
| 36 | #include "led_tables.h" | 36 | #include "led_tables.h" |
| 37 | #include "lib/lib8tion/lib8tion.h" | 37 | #include <lib/lib8tion/lib8tion.h> |
| 38 | #ifdef VELOCIKEY_ENABLE | 38 | #ifdef VELOCIKEY_ENABLE |
| 39 | # include "velocikey.h" | 39 | # include "velocikey.h" |
| 40 | #endif | 40 | #endif |
| @@ -982,7 +982,7 @@ void rgblight_task(void) { | |||
| 982 | # ifndef RGBLIGHT_BREATHE_TABLE_SIZE | 982 | # ifndef RGBLIGHT_BREATHE_TABLE_SIZE |
| 983 | # define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64 | 983 | # define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64 |
| 984 | # endif | 984 | # endif |
| 985 | # include <rgblight_breathe_table.h> | 985 | # include "rgblight_breathe_table.h" |
| 986 | # endif | 986 | # endif |
| 987 | 987 | ||
| 988 | __attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; | 988 | __attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; |