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

This commit is contained in:
QMK Bot 2022-10-27 07:29:59 +00:00
commit 1b6a19ef10

View File

@ -28,7 +28,9 @@
# include "via.h" // for VIA_EEPROM_CONFIG_END # include "via.h" // for VIA_EEPROM_CONFIG_END
# define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END) # define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
#else #else
# ifndef DYNAMIC_KEYMAP_EEPROM_START
# define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE) # define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
# endif
#endif #endif
#ifdef ENCODER_ENABLE #ifdef ENCODER_ENABLE