diff options
| author | QMK Bot <hello@qmk.fm> | 2022-02-12 10:29:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-12 18:29:31 +0000 |
| commit | 63646e8906e062d1c1de3925cba70c4e3426a855 (patch) | |
| tree | 4e91648b77b838e1125cf86331d7e84bde6d07a9 /platforms/test | |
| parent | afcdd7079c774dec2aa4b7f2d08adf8b7310919b (diff) | |
Format code according to conventions (#16322)
Diffstat (limited to 'platforms/test')
| -rw-r--r-- | platforms/test/eeprom.c | 4 | ||||
| -rw-r--r-- | platforms/test/eeprom_stm32_tests.cpp | 54 | ||||
| -rw-r--r-- | platforms/test/flash_stm32_mock.c | 12 | ||||
| -rw-r--r-- | platforms/test/timer.c | 36 |
4 files changed, 67 insertions, 39 deletions
diff --git a/platforms/test/eeprom.c b/platforms/test/eeprom.c index e292faa644..d501745e55 100644 --- a/platforms/test/eeprom.c +++ b/platforms/test/eeprom.c | |||
| @@ -68,7 +68,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) { | |||
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); } | 71 | void eeprom_update_byte(uint8_t *addr, uint8_t value) { |
| 72 | eeprom_write_byte(addr, value); | ||
| 73 | } | ||
| 72 | 74 | ||
| 73 | void eeprom_update_word(uint16_t *addr, uint16_t value) { | 75 | void eeprom_update_word(uint16_t *addr, uint16_t value) { |
| 74 | uint8_t *p = (uint8_t *)addr; | 76 | uint8_t *p = (uint8_t *)addr; |
diff --git a/platforms/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_stm32_tests.cpp index 57f31d634f..d2c41fb77d 100644 --- a/platforms/test/eeprom_stm32_tests.cpp +++ b/platforms/test/eeprom_stm32_tests.cpp | |||
| @@ -60,7 +60,9 @@ class EepromStm32Test : public testing::Test { | |||
| 60 | ~EepromStm32Test() {} | 60 | ~EepromStm32Test() {} |
| 61 | 61 | ||
| 62 | protected: | 62 | protected: |
| 63 | void SetUp() override { EEPROM_Erase(); } | 63 | void SetUp() override { |
| 64 | EEPROM_Erase(); | ||
| 65 | } | ||
| 64 | 66 | ||
| 65 | void TearDown() override { | 67 | void TearDown() override { |
| 66 | #ifdef EEPROM_DEBUG | 68 | #ifdef EEPROM_DEBUG |
| @@ -83,7 +85,7 @@ TEST_F(EepromStm32Test, TestReadGarbage) { | |||
| 83 | garbage += i; | 85 | garbage += i; |
| 84 | FlashBuf[i] = garbage; | 86 | FlashBuf[i] = garbage; |
| 85 | } | 87 | } |
| 86 | EEPROM_Init(); // Just verify we don't crash | 88 | EEPROM_Init(); // Just verify we don't crash |
| 87 | } | 89 | } |
| 88 | 90 | ||
| 89 | TEST_F(EepromStm32Test, TestWriteBadAddress) { | 91 | TEST_F(EepromStm32Test, TestWriteBadAddress) { |
| @@ -206,11 +208,11 @@ TEST_F(EepromStm32Test, TestReadWord) { | |||
| 206 | 208 | ||
| 207 | TEST_F(EepromStm32Test, TestWriteWord) { | 209 | TEST_F(EepromStm32Test, TestWriteWord) { |
| 208 | /* Direct compacted-area: Address < 0x80 */ | 210 | /* Direct compacted-area: Address < 0x80 */ |
| 209 | EEPROM_WriteDataWord(0, 0xdead); // Aligned | 211 | EEPROM_WriteDataWord(0, 0xdead); // Aligned |
| 210 | EEPROM_WriteDataWord(3, 0xbeef); // Unaligned | 212 | EEPROM_WriteDataWord(3, 0xbeef); // Unaligned |
| 211 | /* Direct compacted-area: Address >= 0x80 */ | 213 | /* Direct compacted-area: Address >= 0x80 */ |
| 212 | EEPROM_WriteDataWord(200, 0xabcd); // Aligned | 214 | EEPROM_WriteDataWord(200, 0xabcd); // Aligned |
| 213 | EEPROM_WriteDataWord(203, 0x9876); // Unaligned | 215 | EEPROM_WriteDataWord(203, 0x9876); // Unaligned |
| 214 | EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234); | 216 | EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234); |
| 215 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678); | 217 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678); |
| 216 | /* Write Log word zero-encoded */ | 218 | /* Write Log word zero-encoded */ |
| @@ -218,10 +220,10 @@ TEST_F(EepromStm32Test, TestWriteWord) { | |||
| 218 | /* Write Log word one-encoded */ | 220 | /* Write Log word one-encoded */ |
| 219 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1); | 221 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1); |
| 220 | /* Write Log word value aligned */ | 222 | /* Write Log word value aligned */ |
| 221 | EEPROM_WriteDataWord(200, 0x4321); // Aligned | 223 | EEPROM_WriteDataWord(200, 0x4321); // Aligned |
| 222 | /* Write Log word value unaligned */ | 224 | /* Write Log word value unaligned */ |
| 223 | EEPROM_WriteDataByte(202, 0x3c); // Set neighboring byte | 225 | EEPROM_WriteDataByte(202, 0x3c); // Set neighboring byte |
| 224 | EEPROM_WriteDataWord(203, 0xcdef); // Unaligned | 226 | EEPROM_WriteDataWord(203, 0xcdef); // Unaligned |
| 225 | /* Check values */ | 227 | /* Check values */ |
| 226 | /* Direct compacted-area */ | 228 | /* Direct compacted-area */ |
| 227 | EXPECT_EQ(*(uint16_t*)&FlashBuf[EEPROM_BASE], (uint16_t)~0xdead); | 229 | EXPECT_EQ(*(uint16_t*)&FlashBuf[EEPROM_BASE], (uint16_t)~0xdead); |
| @@ -249,11 +251,11 @@ TEST_F(EepromStm32Test, TestWriteWord) { | |||
| 249 | 251 | ||
| 250 | TEST_F(EepromStm32Test, TestWordRoundTrip) { | 252 | TEST_F(EepromStm32Test, TestWordRoundTrip) { |
| 251 | /* Direct compacted-area: Address < 0x80 */ | 253 | /* Direct compacted-area: Address < 0x80 */ |
| 252 | EEPROM_WriteDataWord(0, 0xdead); // Aligned | 254 | EEPROM_WriteDataWord(0, 0xdead); // Aligned |
| 253 | EEPROM_WriteDataWord(3, 0xbeef); // Unaligned | 255 | EEPROM_WriteDataWord(3, 0xbeef); // Unaligned |
| 254 | /* Direct compacted-area: Address >= 0x80 */ | 256 | /* Direct compacted-area: Address >= 0x80 */ |
| 255 | EEPROM_WriteDataWord(200, 0xabcd); // Aligned | 257 | EEPROM_WriteDataWord(200, 0xabcd); // Aligned |
| 256 | EEPROM_WriteDataWord(203, 0x9876); // Unaligned | 258 | EEPROM_WriteDataWord(203, 0x9876); // Unaligned |
| 257 | EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234); | 259 | EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234); |
| 258 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678); | 260 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678); |
| 259 | /* Check values */ | 261 | /* Check values */ |
| @@ -270,10 +272,10 @@ TEST_F(EepromStm32Test, TestWordRoundTrip) { | |||
| 270 | /* Write Log word one-encoded */ | 272 | /* Write Log word one-encoded */ |
| 271 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1); | 273 | EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1); |
| 272 | /* Write Log word value aligned */ | 274 | /* Write Log word value aligned */ |
| 273 | EEPROM_WriteDataWord(200, 0x4321); // Aligned | 275 | EEPROM_WriteDataWord(200, 0x4321); // Aligned |
| 274 | /* Write Log word value unaligned */ | 276 | /* Write Log word value unaligned */ |
| 275 | EEPROM_WriteDataByte(202, 0x3c); // Set neighboring byte | 277 | EEPROM_WriteDataByte(202, 0x3c); // Set neighboring byte |
| 276 | EEPROM_WriteDataWord(203, 0xcdef); // Unaligned | 278 | EEPROM_WriteDataWord(203, 0xcdef); // Unaligned |
| 277 | /* Check values */ | 279 | /* Check values */ |
| 278 | EEPROM_Init(); | 280 | EEPROM_Init(); |
| 279 | EXPECT_EQ(EEPROM_ReadDataWord(200), 0x4321); | 281 | EXPECT_EQ(EEPROM_ReadDataWord(200), 0x4321); |
| @@ -324,34 +326,34 @@ TEST_F(EepromStm32Test, TestByteWordBoundary) { | |||
| 324 | 326 | ||
| 325 | TEST_F(EepromStm32Test, TestDWordRoundTrip) { | 327 | TEST_F(EepromStm32Test, TestDWordRoundTrip) { |
| 326 | /* Direct compacted-area: Address < 0x80 */ | 328 | /* Direct compacted-area: Address < 0x80 */ |
| 327 | eeprom_write_dword((uint32_t*)0, 0xdeadbeef); // Aligned | 329 | eeprom_write_dword((uint32_t*)0, 0xdeadbeef); // Aligned |
| 328 | eeprom_write_dword((uint32_t*)9, 0x12345678); // Unaligned | 330 | eeprom_write_dword((uint32_t*)9, 0x12345678); // Unaligned |
| 329 | /* Direct compacted-area: Address >= 0x80 */ | 331 | /* Direct compacted-area: Address >= 0x80 */ |
| 330 | eeprom_write_dword((uint32_t*)200, 0xfacef00d); | 332 | eeprom_write_dword((uint32_t*)200, 0xfacef00d); |
| 331 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xba5eba11); // Aligned | 333 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xba5eba11); // Aligned |
| 332 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0xcafed00d); // Unaligned | 334 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0xcafed00d); // Unaligned |
| 333 | /* Check direct values */ | 335 | /* Check direct values */ |
| 334 | EEPROM_Init(); | 336 | EEPROM_Init(); |
| 335 | EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdeadbeef); | 337 | EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdeadbeef); |
| 336 | EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x12345678); | 338 | EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x12345678); |
| 337 | EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 0xfacef00d); | 339 | EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 0xfacef00d); |
| 338 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xba5eba11); // Aligned | 340 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xba5eba11); // Aligned |
| 339 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0xcafed00d); // Unaligned | 341 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0xcafed00d); // Unaligned |
| 340 | /* Write Log byte encoded */ | 342 | /* Write Log byte encoded */ |
| 341 | eeprom_write_dword((uint32_t*)0, 0xdecafbad); | 343 | eeprom_write_dword((uint32_t*)0, 0xdecafbad); |
| 342 | eeprom_write_dword((uint32_t*)9, 0x87654321); | 344 | eeprom_write_dword((uint32_t*)9, 0x87654321); |
| 343 | /* Write Log word encoded */ | 345 | /* Write Log word encoded */ |
| 344 | eeprom_write_dword((uint32_t*)200, 1); | 346 | eeprom_write_dword((uint32_t*)200, 1); |
| 345 | /* Write Log word value aligned */ | 347 | /* Write Log word value aligned */ |
| 346 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xdeadc0de); // Aligned | 348 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xdeadc0de); // Aligned |
| 347 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0x6789abcd); // Unaligned | 349 | eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0x6789abcd); // Unaligned |
| 348 | /* Check log values */ | 350 | /* Check log values */ |
| 349 | EEPROM_Init(); | 351 | EEPROM_Init(); |
| 350 | EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdecafbad); | 352 | EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdecafbad); |
| 351 | EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x87654321); | 353 | EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x87654321); |
| 352 | EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 1); | 354 | EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 1); |
| 353 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xdeadc0de); // Aligned | 355 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xdeadc0de); // Aligned |
| 354 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0x6789abcd); // Unaligned | 356 | EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0x6789abcd); // Unaligned |
| 355 | } | 357 | } |
| 356 | 358 | ||
| 357 | TEST_F(EepromStm32Test, TestBlockRoundTrip) { | 359 | TEST_F(EepromStm32Test, TestBlockRoundTrip) { |
diff --git a/platforms/test/flash_stm32_mock.c b/platforms/test/flash_stm32_mock.c index 222a004bc7..b6ab170f95 100644 --- a/platforms/test/flash_stm32_mock.c +++ b/platforms/test/flash_stm32_mock.c | |||
| @@ -44,6 +44,12 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data) { | |||
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) { return FLASH_COMPLETE; } | 47 | FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) { |
| 48 | void FLASH_Unlock(void) { flash_locked = false; } | 48 | return FLASH_COMPLETE; |
| 49 | void FLASH_Lock(void) { flash_locked = true; } | 49 | } |
| 50 | void FLASH_Unlock(void) { | ||
| 51 | flash_locked = false; | ||
| 52 | } | ||
| 53 | void FLASH_Lock(void) { | ||
| 54 | flash_locked = true; | ||
| 55 | } | ||
diff --git a/platforms/test/timer.c b/platforms/test/timer.c index 61c3a00201..e0acd1b16d 100644 --- a/platforms/test/timer.c +++ b/platforms/test/timer.c | |||
| @@ -18,16 +18,34 @@ | |||
| 18 | 18 | ||
| 19 | static uint32_t current_time = 0; | 19 | static uint32_t current_time = 0; |
| 20 | 20 | ||
| 21 | void timer_init(void) { current_time = 0; } | 21 | void timer_init(void) { |
| 22 | current_time = 0; | ||
| 23 | } | ||
| 22 | 24 | ||
| 23 | void timer_clear(void) { current_time = 0; } | 25 | void timer_clear(void) { |
| 26 | current_time = 0; | ||
| 27 | } | ||
| 24 | 28 | ||
| 25 | uint16_t timer_read(void) { return current_time & 0xFFFF; } | 29 | uint16_t timer_read(void) { |
| 26 | uint32_t timer_read32(void) { return current_time; } | 30 | return current_time & 0xFFFF; |
| 27 | uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); } | 31 | } |
| 28 | uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); } | 32 | uint32_t timer_read32(void) { |
| 33 | return current_time; | ||
| 34 | } | ||
| 35 | uint16_t timer_elapsed(uint16_t last) { | ||
| 36 | return TIMER_DIFF_16(timer_read(), last); | ||
| 37 | } | ||
| 38 | uint32_t timer_elapsed32(uint32_t last) { | ||
| 39 | return TIMER_DIFF_32(timer_read32(), last); | ||
| 40 | } | ||
| 29 | 41 | ||
| 30 | void set_time(uint32_t t) { current_time = t; } | 42 | void set_time(uint32_t t) { |
| 31 | void advance_time(uint32_t ms) { current_time += ms; } | 43 | current_time = t; |
| 44 | } | ||
| 45 | void advance_time(uint32_t ms) { | ||
| 46 | current_time += ms; | ||
| 47 | } | ||
| 32 | 48 | ||
| 33 | void wait_ms(uint32_t ms) { advance_time(ms); } | 49 | void wait_ms(uint32_t ms) { |
| 50 | advance_time(ms); | ||
| 51 | } | ||
