diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-07-25 12:17:15 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-07-25 12:17:15 +1000 |
| commit | 4ec8764c70da13366f8cb7f8240e3124ea509da5 (patch) | |
| tree | e5482bbd1f20e76a5b6dfa03a87d577c3e8d2ed7 /quantum/rgblight/rgblight.c | |
| parent | fdf3ce3cd1bbf931660678b0b5e138ce37c84e7c (diff) | |
| parent | b69e7431aa2e22b4f4662c64e84ed242caac055e (diff) | |
| download | qmk_firmware-4ec8764c70da13366f8cb7f8240e3124ea509da5.tar.gz qmk_firmware-4ec8764c70da13366f8cb7f8240e3124ea509da5.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum/rgblight/rgblight.c')
| -rw-r--r-- | quantum/rgblight/rgblight.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 373dc08d3..148dae78f 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c | |||
| @@ -16,17 +16,6 @@ | |||
| 16 | #include <math.h> | 16 | #include <math.h> |
| 17 | #include <string.h> | 17 | #include <string.h> |
| 18 | #include <stdlib.h> | 18 | #include <stdlib.h> |
| 19 | #ifdef __AVR__ | ||
| 20 | # include <avr/eeprom.h> | ||
| 21 | # include <avr/interrupt.h> | ||
| 22 | #endif | ||
| 23 | #ifdef EEPROM_ENABLE | ||
| 24 | # include "eeprom.h" | ||
| 25 | #endif | ||
| 26 | #ifdef STM32_EEPROM_ENABLE | ||
| 27 | # include <hal.h> | ||
| 28 | # include "eeprom_stm32.h" | ||
| 29 | #endif | ||
| 30 | #include "wait.h" | 19 | #include "wait.h" |
| 31 | #include "progmem.h" | 20 | #include "progmem.h" |
| 32 | #include "sync_timer.h" | 21 | #include "sync_timer.h" |
| @@ -35,6 +24,9 @@ | |||
| 35 | #include "debug.h" | 24 | #include "debug.h" |
| 36 | #include "led_tables.h" | 25 | #include "led_tables.h" |
| 37 | #include <lib/lib8tion/lib8tion.h> | 26 | #include <lib/lib8tion/lib8tion.h> |
| 27 | #ifdef EEPROM_ENABLE | ||
| 28 | # include "eeprom.h" | ||
| 29 | #endif | ||
| 38 | #ifdef VELOCIKEY_ENABLE | 30 | #ifdef VELOCIKEY_ENABLE |
| 39 | # include "velocikey.h" | 31 | # include "velocikey.h" |
| 40 | #endif | 32 | #endif |