Merge remote-tracking branch 'qmk/master' into merge-2021-12-11

This commit is contained in:
Ilya Zhuravlev
2021-12-11 20:19:52 -05:00
7014 changed files with 165752 additions and 81542 deletions

View File

@ -2,10 +2,6 @@
#pragma once
#ifdef STM32_EEPROM_ENABLE
# include "eeprom_stm32.h"
#endif
// This is the default EEPROM max address to use for dynamic keymaps.
// The default is the ATmega32u4 EEPROM max address.
// Explicitly override it if the keyboard uses a microcontroller with
@ -17,8 +13,8 @@
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
# elif defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_AT90USB162__) || defined(__AVR_ATtiny85__)
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 511
# elif defined(FEE_DENSITY_BYTES)
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR FEE_DENSITY_BYTES-1
# elif defined(STM32_EEPROM_ENABLE)
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095 /* can't access FEE_DENSITY_BYTES because that's defined in eeprom_stm32.c */
# else
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023
# endif