drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2020-12-11 02:46:19 +00:00
commit fdfcce57e1
60 changed files with 99 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
quantum/rgblight.c
View file

@ -24,7 +24,7 @@
# include "eeprom.h"
#endif
#ifdef STM32_EEPROM_ENABLE
# include "hal.h"
# include <hal.h>
# include "eeprom_stm32.h"
#endif
#include "wait.h"
@ -34,7 +34,7 @@
#include "color.h"
#include "debug.h"
#include "led_tables.h"
#include "lib/lib8tion/lib8tion.h"
#include <lib/lib8tion/lib8tion.h>
#ifdef VELOCIKEY_ENABLE
# include "velocikey.h"
#endif
@ -982,7 +982,7 @@ void rgblight_task(void) {
# ifndef RGBLIGHT_BREATHE_TABLE_SIZE
# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64
# endif
# include <rgblight_breathe_table.h>
# include "rgblight_breathe_table.h"
# endif
__attribute__((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};