diff options
| author | Damien George <damien.p.george@gmail.com> | 2019-02-03 22:52:31 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-02-08 01:20:09 +1100 |
| commit | 5fbda53d3c43e94a18a66d49a4c315f0af86e204 (patch) | |
| tree | cc5be5bb6531edc402ea12310ae51755c5589942 | |
| parent | f024b2610f68109a3a5d8ec2680ca3bafc179344 (diff) | |
stm32/systick: Rename sys_tick_XXX functions to systick_XXX.
| -rw-r--r-- | ports/stm32/main.c | 4 | ||||
| -rw-r--r-- | ports/stm32/systick.c | 6 | ||||
| -rw-r--r-- | ports/stm32/systick.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ports/stm32/main.c b/ports/stm32/main.c index 33cfe84ee..ef0e1e791 100644 --- a/ports/stm32/main.c +++ b/ports/stm32/main.c @@ -229,7 +229,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) { f_close(&fp); // keep LED on for at least 200ms - sys_tick_wait_at_least(start_tick, 200); + systick_wait_at_least(start_tick, 200); led_state(PYB_LED_GREEN, 0); } else if (res == FR_OK) { // mount sucessful @@ -273,7 +273,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) { f_close(&fp); // keep LED on for at least 200ms - sys_tick_wait_at_least(start_tick, 200); + systick_wait_at_least(start_tick, 200); led_state(PYB_LED_GREEN, 0); } diff --git a/ports/stm32/systick.c b/ports/stm32/systick.c index c07d0fabc..8b5efe057 100644 --- a/ports/stm32/systick.c +++ b/ports/stm32/systick.c @@ -90,15 +90,15 @@ void mp_hal_delay_us(mp_uint_t usec) { } } -bool sys_tick_has_passed(uint32_t start_tick, uint32_t delay_ms) { +bool systick_has_passed(uint32_t start_tick, uint32_t delay_ms) { return HAL_GetTick() - start_tick >= delay_ms; } // waits until at least delay_ms milliseconds have passed from the sampling of // startTick. Handles overflow properly. Assumes stc was taken from // HAL_GetTick() some time before calling this function. -void sys_tick_wait_at_least(uint32_t start_tick, uint32_t delay_ms) { - while (!sys_tick_has_passed(start_tick, delay_ms)) { +void systick_wait_at_least(uint32_t start_tick, uint32_t delay_ms) { + while (!systick_has_passed(start_tick, delay_ms)) { __WFI(); // enter sleep mode, waiting for interrupt } } diff --git a/ports/stm32/systick.h b/ports/stm32/systick.h index 256a500c2..abb8729f5 100644 --- a/ports/stm32/systick.h +++ b/ports/stm32/systick.h @@ -26,7 +26,7 @@ #ifndef MICROPY_INCLUDED_STM32_SYSTICK_H #define MICROPY_INCLUDED_STM32_SYSTICK_H -void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms); -bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms); +void systick_wait_at_least(uint32_t stc, uint32_t delay_ms); +bool systick_has_passed(uint32_t stc, uint32_t delay_ms); #endif // MICROPY_INCLUDED_STM32_SYSTICK_H |