forked from mirrors/qmk_firmware
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
663b250e2f
4 changed files with 12 additions and 12 deletions
|
@ -348,9 +348,9 @@ void custom_config_load(){
|
|||
// Called from matrix_init_kb() if not VIA_ENABLE
|
||||
void via_init_kb(void)
|
||||
{
|
||||
// If the EEPROM has the magic, the data is good.
|
||||
// OK to load from EEPROM.
|
||||
if (via_eeprom_is_valid()) {
|
||||
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
|
||||
// and also firmware build date (from via_eeprom_is_valid())
|
||||
if (eeconfig_is_enabled()) {
|
||||
custom_config_load();
|
||||
} else {
|
||||
#ifdef DYNAMIC_KEYMAP_ENABLE
|
||||
|
|
|
@ -39,9 +39,9 @@ __attribute__ ((weak))
|
|||
size_t lc_size = sizeof(layer_colors) / sizeof(hs_set);
|
||||
|
||||
void fled_init(void) {
|
||||
// If EEPROM config exists, load it
|
||||
// If VIA EEPROM exists, FLED config should too
|
||||
if (via_eeprom_is_valid()) {
|
||||
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
|
||||
// and also firmware build date (from via_eeprom_is_valid())
|
||||
if (eeconfig_is_enabled()) {
|
||||
fled_load_conf();
|
||||
// Else, default config
|
||||
} else {
|
||||
|
|
|
@ -38,9 +38,9 @@ bool led_update_kb(led_t led_state) {
|
|||
// Called from matrix_init_kb() if not VIA_ENABLE
|
||||
void via_init_kb(void)
|
||||
{
|
||||
// If the EEPROM has the magic, the data is good.
|
||||
// OK to load from EEPROM
|
||||
if (via_eeprom_is_valid()) {
|
||||
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
|
||||
// and also firmware build date (from via_eeprom_is_valid())
|
||||
if (eeconfig_is_enabled()) {
|
||||
} else {
|
||||
// Cache "first execution" state so we can do something
|
||||
// specific after QMK initialization has done its thing.
|
||||
|
|
|
@ -35,9 +35,9 @@
|
|||
// Called from matrix_init_kb() if not VIA_ENABLE
|
||||
void via_init_kb(void)
|
||||
{
|
||||
// If the EEPROM has the magic, the data is good.
|
||||
// OK to load from EEPROM
|
||||
if (via_eeprom_is_valid()) {
|
||||
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
|
||||
// and also firmware build date (from via_eeprom_is_valid())
|
||||
if (eeconfig_is_enabled()) {
|
||||
#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
|
||||
backlight_config_load();
|
||||
#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
|
||||
|
|
Loading…
Reference in a new issue