Merge remote-tracking branch 'qmk 0.17.0' into firmware21

2022-05-29 15:38:33 -07:00
parent 67f4e5f344 e22a183329
commit 30aac80d5a
337 changed files with 14741 additions and 2516 deletions
@@ -154,9 +154,11 @@
 #define FIRMWARE_VERSION_SIZE 17
 #define DYNAMIC_KEYMAP_EEPROM_ADDR (EECONFIG_SIZE + FIRMWARE_VERSION_SIZE)

-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383
-#define DYNAMIC_KEYMAP_LAYER_COUNT     8
 #define EEPROM_I2C_24LC128
+#ifdef EEPROM_I2C
+#    define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383
+#    define DYNAMIC_KEYMAP_LAYER_COUNT     8
+#endif

 #define AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4