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

2022-10-27 07:29:59 +00:00 · 2022-10-27 07:29:59 +00:00 · 1b6a19ef10
commit 1b6a19ef10
parent d3bc77b090 91b1e8a3e5
1 changed files with 3 additions and 1 deletions
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@ -28,7 +28,9 @@
 #    include "via.h" // for VIA_EEPROM_CONFIG_END
 #    define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
 #else
-#    define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
+#    ifndef DYNAMIC_KEYMAP_EEPROM_START
+#        define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
+#    endif
 #endif

 #ifdef ENCODER_ENABLE