diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2020-01-21 13:50:53 +0900 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-02-26 10:15:12 +0900 |
| commit | d3f23ecfbcd2a69714422ab68f346e51fcc2a6de (patch) | |
| tree | c5c07493f4175738f623ca23f618682cc04b779a /quantum | |
| parent | 0c676d6e471e3c1eabf3158fab5cb4645abd29ee (diff) | |
Apollo (#246)
* Add External EEPROM driver
* Add keyboard
* Fix i2c address
* Revert i2c address for eeprom
* Reduce page size for 24LC128
* Disable External EEPROM for now
* Fix up RGB Matrix and layout
* Cleanup moonlander.c file
* Fix led array center
* Disable External EEPROM for now
* Cleanup and optimization of files
* Add and clean up mappings
* Enable "ZSA" defaults for Moonlander
* Update matrix to use i2c_readReg
* Disable render limit for rgb matrix
* Update pin controls to GPIO Commands
* Add proper changed mechanism
* Additional cleanup
* Run clang-format on moonlander files
* Align keymap
* Limit brightness for rgb matrix to 200
To prevent power draw issues
* Add USB-IF VID/PID
* Add RGB Matrix Sleep code
* Enable External EEPROM on Moonlander
* Port over Ergodox Expander error handling and retry code
* Re-init RGB Matrix drivers when half is reconnected
* Add threaded LED display
* Correct layer state settings after moonlander_led_task
* Update Moonlander to include Oryx configuration
* Add webUSB Stuff
* Update default keymap
* fix: merge conflict
Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/audio/audio_arm.c | 2 | ||||
| -rw-r--r-- | quantum/rgblight.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/quantum/audio/audio_arm.c b/quantum/audio/audio_arm.c index 7ef02ebaae..a194a66419 100644 --- a/quantum/audio/audio_arm.c +++ b/quantum/audio/audio_arm.c @@ -270,7 +270,7 @@ void audio_init() { } // Check EEPROM -#if defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE) +#ifdef EEPROM_ENABLE if (!eeconfig_is_enabled()) { eeconfig_init(); } diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 07c3c9770b..e0ed30879b 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -19,9 +19,11 @@ # 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.h" # include "eeprom_stm32.h" #endif #include "wait.h" @@ -146,7 +148,7 @@ void rgblight_check_config(void) { } uint32_t eeconfig_read_rgblight(void) { -#if defined(__AVR__) || defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE) +#ifdef EEPROM_ENABLE return eeprom_read_dword(EECONFIG_RGBLIGHT); #else return 0; @@ -154,7 +156,7 @@ uint32_t eeconfig_read_rgblight(void) { } void eeconfig_update_rgblight(uint32_t val) { -#if defined(__AVR__) || defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE) +#ifdef EEPROM_ENABLE rgblight_check_config(); eeprom_update_dword(EECONFIG_RGBLIGHT, val); #endif |