diff options
| author | Joel Challis <git@zvecr.com> | 2021-09-05 21:36:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-05 21:36:43 +0100 |
| commit | 8d6d8cfadfd1522b3dd2cc8ac1ce7393b45bbe64 (patch) | |
| tree | ba073cc829e8311462375d5bf20667f3b89c0cf4 /tmk_core/common/test | |
| parent | fe6d6cf76dc827adb2f46d55217dc189eae21b02 (diff) | |
Tidy up defines within STM EEPROM emulation (#14275)
* Tidy up defines within stm eeprom emulation
* Fix tests
* Resolve todo
* Still use page notion in clear
* Remove more f4 refs
Diffstat (limited to 'tmk_core/common/test')
| -rw-r--r-- | tmk_core/common/test/eeprom_stm32_tests.cpp | 2 | ||||
| -rw-r--r-- | tmk_core/common/test/hal.h | 18 | ||||
| -rw-r--r-- | tmk_core/common/test/rules.mk | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/tmk_core/common/test/eeprom_stm32_tests.cpp b/tmk_core/common/test/eeprom_stm32_tests.cpp index aa84492b87..5bc8d87900 100644 --- a/tmk_core/common/test/eeprom_stm32_tests.cpp +++ b/tmk_core/common/test/eeprom_stm32_tests.cpp @@ -46,7 +46,7 @@ extern "C" { * */ -#define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_DENSITY_PAGES / 2) +#define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_PAGE_COUNT / 2) #define LOG_SIZE EEPROM_SIZE #define LOG_BASE (MOCK_FLASH_SIZE - LOG_SIZE) #define EEPROM_BASE (LOG_BASE - EEPROM_SIZE) diff --git a/tmk_core/common/test/hal.h b/tmk_core/common/test/hal.h new file mode 100644 index 0000000000..2d268ad54c --- /dev/null +++ b/tmk_core/common/test/hal.h @@ -0,0 +1,18 @@ +/* Copyright 2021 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#pragma once + +// Just here to please eeprom tests diff --git a/tmk_core/common/test/rules.mk b/tmk_core/common/test/rules.mk index e47e5880c5..48632a095b 100644 --- a/tmk_core/common/test/rules.mk +++ b/tmk_core/common/test/rules.mk @@ -3,12 +3,12 @@ eeprom_stm32_tiny_DEFS := $(eeprom_stm32_DEFS) \ -DFEE_MCU_FLASH_SIZE=1 \ -DMOCK_FLASH_SIZE=1024 \ -DFEE_PAGE_SIZE=512 \ - -DFEE_DENSITY_PAGES=1 + -DFEE_PAGE_COUNT=1 eeprom_stm32_large_DEFS := $(eeprom_stm32_DEFS) \ -DFEE_MCU_FLASH_SIZE=64 \ -DMOCK_FLASH_SIZE=65536 \ -DFEE_PAGE_SIZE=2048 \ - -DFEE_DENSITY_PAGES=16 + -DFEE_PAGE_COUNT=16 eeprom_stm32_INC := \ $(TMK_PATH)/common/chibios/ |