diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-02-02 15:04:37 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 15:04:37 +1100 |
| commit | e22efc037a7e4da17f1051d5053768e40683da68 (patch) | |
| tree | d58924ef9de401b4e97ba46113ee42874a1593be /platforms/test | |
| parent | da5cb5fd6f91c2f7aebbcebbf211252c51d9b4a5 (diff) | |
Don't make EEPROM size assumptions with dynamic keymaps. (#16054)
* Don't make EEPROM size assumptions with dynamic keymaps.
* Add support for checking against emulated flash, error out if someone attempts to build a board without specifying EEPROM size.
* Reorder defines so that MCU is considered last.
* Refactor EEPROM definitions for simplicity.
* Fix max sizing of kabedon/kabedon980.
* Fix max sizing of mechlovin/olly/jf.
* Fix unit tests.
* Review comments, add messages with values during build failures.
Diffstat (limited to 'platforms/test')
| -rw-r--r-- | platforms/test/eeprom.c | 4 | ||||
| -rw-r--r-- | platforms/test/eeprom_stm32_tests.cpp | 3 | ||||
| -rw-r--r-- | platforms/test/eeprom_stm32_tests.h | 8 | ||||
| -rw-r--r-- | platforms/test/rules.mk | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/platforms/test/eeprom.c b/platforms/test/eeprom.c index 5c8e69dae3..e292faa644 100644 --- a/platforms/test/eeprom.c +++ b/platforms/test/eeprom.c | |||
| @@ -16,9 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include "eeprom.h" | 17 | #include "eeprom.h" |
| 18 | 18 | ||
| 19 | #define EEPROM_SIZE 32 | 19 | static uint8_t buffer[TOTAL_EEPROM_BYTE_COUNT]; |
| 20 | |||
| 21 | static uint8_t buffer[EEPROM_SIZE]; | ||
| 22 | 20 | ||
| 23 | uint8_t eeprom_read_byte(const uint8_t *addr) { | 21 | uint8_t eeprom_read_byte(const uint8_t *addr) { |
| 24 | uintptr_t offset = (uintptr_t)addr; | 22 | uintptr_t offset = (uintptr_t)addr; |
diff --git a/platforms/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_stm32_tests.cpp index 5bc8d87900..57f31d634f 100644 --- a/platforms/test/eeprom_stm32_tests.cpp +++ b/platforms/test/eeprom_stm32_tests.cpp | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | #include "gtest/gtest.h" | 17 | #include "gtest/gtest.h" |
| 18 | 18 | ||
| 19 | extern "C" { | 19 | extern "C" { |
| 20 | #include "flash_stm32.h" | ||
| 21 | #include "eeprom_stm32.h" | ||
| 22 | #include "eeprom.h" | 20 | #include "eeprom.h" |
| 23 | } | 21 | } |
| 24 | 22 | ||
| @@ -46,7 +44,6 @@ extern "C" { | |||
| 46 | * | 44 | * |
| 47 | */ | 45 | */ |
| 48 | 46 | ||
| 49 | #define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_PAGE_COUNT / 2) | ||
| 50 | #define LOG_SIZE EEPROM_SIZE | 47 | #define LOG_SIZE EEPROM_SIZE |
| 51 | #define LOG_BASE (MOCK_FLASH_SIZE - LOG_SIZE) | 48 | #define LOG_BASE (MOCK_FLASH_SIZE - LOG_SIZE) |
| 52 | #define EEPROM_BASE (LOG_BASE - EEPROM_SIZE) | 49 | #define EEPROM_BASE (LOG_BASE - EEPROM_SIZE) |
diff --git a/platforms/test/eeprom_stm32_tests.h b/platforms/test/eeprom_stm32_tests.h new file mode 100644 index 0000000000..35ed885e52 --- /dev/null +++ b/platforms/test/eeprom_stm32_tests.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | // Copyright 2018-2022 Nick Brassel (@tzarc) | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | #pragma once | ||
| 4 | |||
| 5 | #include "flash_stm32.h" | ||
| 6 | #include "eeprom_stm32.h" | ||
| 7 | |||
| 8 | #define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_PAGE_COUNT / 2) | ||
diff --git a/platforms/test/rules.mk b/platforms/test/rules.mk index 66b853d8ee..55512c7392 100644 --- a/platforms/test/rules.mk +++ b/platforms/test/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | eeprom_stm32_DEFS := -DFLASH_STM32_MOCKED -DNO_PRINT -DFEE_FLASH_BASE=FlashBuf | 1 | eeprom_stm32_DEFS := -DEEPROM_TEST_HARNESS -DFLASH_STM32_MOCKED -DNO_PRINT -DFEE_FLASH_BASE=FlashBuf |
| 2 | eeprom_stm32_tiny_DEFS := $(eeprom_stm32_DEFS) \ | 2 | eeprom_stm32_tiny_DEFS := $(eeprom_stm32_DEFS) \ |
| 3 | -DFEE_MCU_FLASH_SIZE=1 \ | 3 | -DFEE_MCU_FLASH_SIZE=1 \ |
| 4 | -DMOCK_FLASH_SIZE=1024 \ | 4 | -DMOCK_FLASH_SIZE=1024 \ |
