Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
commit
4ec8764c70
20 changed files with 307 additions and 42 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue