mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #345 from dhylands/stmhal-systick-cleanup 

stmhal - More systick cleanup. Fix HAL_Delay
This commit is contained in:
Damien George 2014-03-14 00:29:51 +00:00
parent 536dde254b 9db719bb57
commit deb413e8ba
6 changed files with 30 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stmhal/hal/src/stm32f4xx_hal.c
View File

@ -281,11 +281,13 @@ uint32_t HAL_GetTick(void)
*/
void HAL_Delay(__IO uint32_t Delay)
{
uint32_t timingdelay;
timingdelay = HAL_GetTick() + Delay;
while(HAL_GetTick() < timingdelay)
{
uint32_t start = HAL_GetTick();
// Note that the following works (due to the magic of 2's complement numbers)
// even when Delay causes wraparound.
while (HAL_GetTick() - start <= Delay) {
__WFI(); // enter sleep mode, waiting for interrupt
}
}

26
stmhal/main.c
View File

@ -72,10 +72,10 @@ void flash_error(int n) {
for (int i = 0; i < n; i++) {
led_state(PYB_LED_R1, 1);
led_state(PYB_LED_R2, 0);
sys_tick_delay_ms(250);
HAL_Delay(250);
led_state(PYB_LED_R1, 0);
led_state(PYB_LED_R2, 1);
sys_tick_delay_ms(250);
HAL_Delay(250);
}
led_state(PYB_LED_R2, 0);
}
@ -242,8 +242,6 @@ int main(void) {
#endif
#endif
// basic sub-system init
sys_tick_init();
#if 0
pendsv_init();
#endif
@ -275,16 +273,16 @@ int main(void) {
while (1) {
led_state(led, 1);
usart_tx_strn_cooked(pyb_usart_global_debug, "on\n", 3);
sys_tick_delay_ms(100);
HAL_Delay(100);
led_state(led, 0);
usart_tx_strn_cooked(pyb_usart_global_debug, "off\n", 4);
sys_tick_delay_ms(100);
HAL_Delay(100);
led_state(led, 1);
usart_tx_strn_cooked(pyb_usart_global_debug, "on\n", 3);
sys_tick_delay_ms(100);
HAL_Delay(100);
led_state(led, 0);
usart_tx_strn_cooked(pyb_usart_global_debug, "off\n", 4);
sys_tick_delay_ms(700);
HAL_Delay(700);
led = (led % 4) + 1;
}
@ -359,7 +357,7 @@ soft_reset:
reset_filesystem = false;
break;
}
sys_tick_delay_ms(10);
HAL_Delay(10);
}
}
#endif
@ -375,7 +373,7 @@ soft_reset:
// LED on to indicate creation of LFS
led_state(PYB_LED_R2, 1);
uint32_t stc = sys_tick_counter;
uint32_t start_tick = HAL_GetTick();
res = f_mkfs("0:", 0, 0);
if (res == FR_OK) {
@ -397,7 +395,7 @@ soft_reset:
f_close(&fp);
// keep LED on for at least 200ms
sys_tick_wait_at_least(stc, 200);
sys_tick_wait_at_least(start_tick, 200);
led_state(PYB_LED_R2, 0);
} else {
__fatal_error("could not access LFS");
@ -421,7 +419,7 @@ soft_reset:
// LED on to indicate creation of boot.py
led_state(PYB_LED_R2, 1);
uint32_t stc = sys_tick_counter;
uint32_t start_tick = HAL_GetTick();
FIL fp;
f_open(&fp, "0:/boot.py", FA_WRITE | FA_CREATE_ALWAYS);
@ -431,7 +429,7 @@ soft_reset:
f_close(&fp);
// keep LED on for at least 200ms
sys_tick_wait_at_least(stc, 200);
sys_tick_wait_at_least(start_tick, 200);
led_state(PYB_LED_R2, 0);
}
}
@ -530,7 +528,7 @@ soft_reset:
}
accel_read_nack();
usb_hid_send_report(data);
sys_tick_delay_ms(15);
HAL_Delay(15);
}
}
#endif

2
stmhal/pybmodule.c
View File

@ -116,7 +116,7 @@ STATIC mp_obj_t pyb_millis(void) {
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_millis_obj, pyb_millis);
STATIC mp_obj_t pyb_delay(mp_obj_t count) {
sys_tick_delay_ms(mp_obj_get_int(count));
HAL_Delay(mp_obj_get_int(count));
return mp_const_none;
}

4
stmhal/pyexec.c
View File

@ -59,7 +59,7 @@ int stdin_rx_chr(void) {
if (pyb_usart_global_debug != PYB_USART_NONE && usart_rx_any(pyb_usart_global_debug)) {
return usart_rx_char(pyb_usart_global_debug);
}
sys_tick_delay_ms(1);
HAL_Delay(1);
#if 0
if (storage_needs_flush()) {
storage_flush();
@ -142,7 +142,7 @@ int readline(vstr_t *line, const char *prompt) {
} else {
escape = 0;
}
sys_tick_delay_ms(1);
HAL_Delay(1);
}
}

48
stmhal/systick.c
View File

@ -2,47 +2,15 @@
#include "misc.h"
#include "systick.h"
void sys_tick_init(void) {
// SysTick_Config is now called from HAL_RCC_ClockConfig, which is called
// from SystemClock_Config
// SysTick_Config sets the SysTick_IRQn to be the lowest priority, but
// we want it to be the highest priority, so fix things here.
HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
bool sys_tick_has_passed(uint32_t start_tick, uint32_t delay_ms) {
return HAL_GetTick() - start_tick >= delay_ms;
}
void sys_tick_delay_ms(uint32_t delay_ms) {
sys_tick_wait_at_least(HAL_GetTick(), delay_ms);
}
// waits until at least delay_ms milliseconds have passed from the sampling of stc
// handles overflow properl
// assumes stc was taken from HAL_GetTick() some time before calling this function
// eg stc <= HAL_GetTick() for the case of no wrap around of HAL_GetTick()
void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms) {
// stc_wait is the value of HAL_GetTick() that we wait for
uint32_t stc_wait = stc + delay_ms;
if (stc_wait < stc) {
// stc_wait wrapped around
while (stc <= HAL_GetTick() || HAL_GetTick() < stc_wait) {
__WFI(); // enter sleep mode, waiting for interrupt
}
} else {
// stc_wait did not wrap around
while (stc <= HAL_GetTick() && HAL_GetTick() < stc_wait) {
__WFI(); // enter sleep mode, waiting for interrupt
}
}
}
bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms) {
// stc_wait is the value of HAL_GetTick() that we wait for
uint32_t stc_wait = stc + delay_ms;
if (stc_wait < stc) {
// stc_wait wrapped around
return !(stc <= HAL_GetTick() || HAL_GetTick() < stc_wait);
} else {
// stc_wait did not wrap around
return !(stc <= HAL_GetTick() && HAL_GetTick() < stc_wait);
// 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)) {
__WFI(); // enter sleep mode, waiting for interrupt
}
}

3
stmhal/systick.h
View File

@ -1,5 +1,2 @@
void sys_tick_init(void);
void SysTick_Handler(void);
void sys_tick_delay_ms(uint32_t delay_ms);
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);