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 | |
| parent | fdf3ce3cd1bbf931660678b0b5e138ce37c84e7c (diff) | |
| parent | b69e7431aa2e22b4f4662c64e84ed242caac055e (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum/rgblight')
| -rw-r--r-- | quantum/rgblight/rgblight.c | 14 | ||||
| -rw-r--r-- | quantum/rgblight/rgblight.h | 5 |
2 files changed, 4 insertions, 15 deletions
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 373dc08d3a..148dae78f4 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -16,17 +16,6 @@ #include <math.h> #include <string.h> #include <stdlib.h> -#ifdef __AVR__ -# include <avr/eeprom.h> -# include <avr/interrupt.h> -#endif -#ifdef EEPROM_ENABLE -# include "eeprom.h" -#endif -#ifdef STM32_EEPROM_ENABLE -# include <hal.h> -# include "eeprom_stm32.h" -#endif #include "wait.h" #include "progmem.h" #include "sync_timer.h" @@ -35,6 +24,9 @@ #include "debug.h" #include "led_tables.h" #include <lib/lib8tion/lib8tion.h> +#ifdef EEPROM_ENABLE +# include "eeprom.h" +#endif #ifdef VELOCIKEY_ENABLE # include "velocikey.h" #endif diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h index 49f82bdfc6..5b90b8f49e 100644 --- a/quantum/rgblight/rgblight.h +++ b/quantum/rgblight/rgblight.h @@ -169,15 +169,12 @@ enum RGBLIGHT_EFFECT_MODE { #include <stdint.h> #include <stdbool.h> +#include "progmem.h" #include "eeconfig.h" #include "ws2812.h" #include "color.h" #include "rgblight_list.h" -#if defined(__AVR__) -# include <avr/pgmspace.h> -#endif - #ifdef RGBLIGHT_LAYERS typedef struct { uint8_t index; // The first LED to light |