aboutsummaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-05-10 22:38:06 +0000
committerQMK Bot <hello@qmk.fm>2021-05-10 22:38:06 +0000
commit6bb9113e27c649eeb9dc5b200bfc45eb51952861 (patch)
tree734aaa152f72ff5c0ed052a593041d2512b4e5ef /quantum
parent0e7c66e8917ee470d8a3d3904bd8b55c75c8a0b4 (diff)
parenta116b3f1ae4e6dbd09c450bfc74dd2a64f66b7b1 (diff)
downloadqmk_firmware-6bb9113e27c649eeb9dc5b200bfc45eb51952861.tar.gz
qmk_firmware-6bb9113e27c649eeb9dc5b200bfc45eb51952861.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/dynamic_keymap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index a860b9497..b7a9f2662 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -35,9 +35,11 @@
35// Explicitly override it if the keyboard uses a microcontroller with 35// Explicitly override it if the keyboard uses a microcontroller with
36// more EEPROM *and* it makes sense to increase it. 36// more EEPROM *and* it makes sense to increase it.
37#ifndef DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 37#ifndef DYNAMIC_KEYMAP_EEPROM_MAX_ADDR
38# if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) 38# if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
39# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 39# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
40# elif defined(__AVR_AT90USB162__) 40# elif defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
41# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
42# elif defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_AT90USB162__) || defined(__AVR_ATtiny85__)
41# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 511 43# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 511
42# else 44# else
43# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023 45# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023