diff options
| author | Andrew Kannan <andrew.kannan@klaviyo.com> | 2019-01-28 19:40:02 -0500 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-01-28 16:40:02 -0800 |
| commit | 0f507f01696eae0e8fe808d17a19db3f6d9e2ce4 (patch) | |
| tree | 986c78fbb09b6bf5e33df6c28158e6877af64960 /quantum | |
| parent | d9120412d3d81fc688a7e5346711cf716518dc34 (diff) | |
Practice60 RGB and PWM Backlight (#4929)
* Update Practice60 to enable RGB via SPI DMA and use PWM backlight breathing * Correct stm32f103c8t6 flash size in eeprom definition * Remove unused files and improve ifdef checks * Update quantum/rgblight.c Co-Authored-By: awkannan <andrew.kannan@klaviyo.com> * Update quantum/rgblight.c Co-Authored-By: awkannan <andrew.kannan@klaviyo.com> * EEPROM implementation fix and updated p60 code * Update define * Remove dead code * Update keymap to remove test key * Update keymap again
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/rgblight.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index cf2666eb4b..22dce963c9 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -19,6 +19,11 @@ #include <avr/eeprom.h> #include <avr/interrupt.h> #endif +#ifdef STM32_EEPROM_ENABLE + #include "hal.h" + #include "eeprom.h" + #include "eeprom_stm32.h" +#endif #include "wait.h" #include "progmem.h" #include "timer.h" @@ -120,14 +125,14 @@ void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) { uint32_t eeconfig_read_rgblight(void) { - #ifdef __AVR__ + #if defined(__AVR__) || defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE) return eeprom_read_dword(EECONFIG_RGBLIGHT); #else return 0; #endif } void eeconfig_update_rgblight(uint32_t val) { - #ifdef __AVR__ + #if defined(__AVR__) || defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE) if (eeconfig_read_rgblight() != val) { eeprom_update_dword(EECONFIG_RGBLIGHT, val); } @@ -333,7 +338,7 @@ void rgblight_disable_noeeprom(void) { #ifdef RGBLIGHT_USE_TIMER rgblight_timer_disable(); #endif - _delay_ms(50); + wait_ms(50); rgblight_set(); } |