diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-14 00:33:07 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-14 00:33:07 +0000 |
| commit | 33bdd2119d9ca28404acc2b0891d5a74997a0d05 (patch) | |
| tree | 0738cc145c8fb8779c104c250b5aec44c259b5ae /stmhal/main.c | |
| parent | b30c02afa078f7713faa14087ae28433dee49027 (diff) | |
| parent | deb413e8baf96a4638c73f26fbe4de99380abaf9 (diff) | |
| download | micropython-33bdd2119d9ca28404acc2b0891d5a74997a0d05.tar.gz micropython-33bdd2119d9ca28404acc2b0891d5a74997a0d05.zip | |
Merge branch 'master' of github.com:micropython/micropython
Conflicts:
stmhal/main.c
Diffstat (limited to 'stmhal/main.c')
| -rw-r--r-- | stmhal/main.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/stmhal/main.c b/stmhal/main.c index 4b502fcf24..865b4fa59c 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -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); } @@ -248,7 +248,6 @@ int main(void) { #endif // basic sub-system init - sys_tick_init(); pendsv_init(); led_init(); @@ -278,16 +277,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; } @@ -362,7 +361,7 @@ soft_reset: reset_filesystem = false; break; } - sys_tick_delay_ms(10); + HAL_Delay(10); } } #endif @@ -378,7 +377,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) { @@ -400,7 +399,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"); @@ -424,7 +423,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); @@ -434,7 +433,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); } } @@ -550,7 +549,7 @@ soft_reset: } accel_read_nack(); usb_hid_send_report(data); - sys_tick_delay_ms(15); + HAL_Delay(15); } } #endif |