gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-09 10:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2022-10-27 07:29:59 +00:00
commit 1b6a19ef10
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/dynamic_keymap.c
View File

@ -28,8 +28,10 @@
# 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
# include "encoder.h" # include "encoder.h"