aboutsummaryrefslogtreecommitdiff
path: root/ports/stm32/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'ports/stm32/main.c')
-rw-r--r--ports/stm32/main.c164
1 files changed, 34 insertions, 130 deletions
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 7f8ee84fd..c749cac97 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -3,7 +3,7 @@
*
* The MIT License (MIT)
*
- * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2013-2020 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -53,6 +53,7 @@
#include "extmod/modbluetooth.h"
#endif
+#include "boardctrl.h"
#include "mpu.h"
#include "rfcore.h"
#include "systick.h"
@@ -95,18 +96,6 @@ STATIC pyb_uart_obj_t pyb_uart_repl_obj;
STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
#endif
-void flash_error(int n) {
- for (int i = 0; i < n; i++) {
- led_state(PYB_LED_RED, 1);
- led_state(PYB_LED_GREEN, 0);
- mp_hal_delay_ms(250);
- led_state(PYB_LED_RED, 0);
- led_state(PYB_LED_GREEN, 1);
- mp_hal_delay_ms(250);
- }
- led_state(PYB_LED_GREEN, 0);
-}
-
void NORETURN __fatal_error(const char *msg) {
for (volatile uint delay = 0; delay < 10000000; delay++) {
}
@@ -310,83 +299,6 @@ STATIC bool init_sdcard_fs(void) {
}
#endif
-#if !MICROPY_HW_USES_BOOTLOADER
-STATIC uint update_reset_mode(uint reset_mode) {
- #if MICROPY_HW_HAS_SWITCH
- if (switch_get()) {
-
- // The original method used on the pyboard is appropriate if you have 2
- // or more LEDs.
- #if defined(MICROPY_HW_LED2)
- for (uint i = 0; i < 3000; i++) {
- if (!switch_get()) {
- break;
- }
- mp_hal_delay_ms(20);
- if (i % 30 == 29) {
- if (++reset_mode > 3) {
- reset_mode = 1;
- }
- led_state(2, reset_mode & 1);
- led_state(3, reset_mode & 2);
- led_state(4, reset_mode & 4);
- }
- }
- // flash the selected reset mode
- for (uint i = 0; i < 6; i++) {
- led_state(2, 0);
- led_state(3, 0);
- led_state(4, 0);
- mp_hal_delay_ms(50);
- led_state(2, reset_mode & 1);
- led_state(3, reset_mode & 2);
- led_state(4, reset_mode & 4);
- mp_hal_delay_ms(50);
- }
- mp_hal_delay_ms(400);
-
- #elif defined(MICROPY_HW_LED1)
-
- // For boards with only a single LED, we'll flash that LED the
- // appropriate number of times, with a pause between each one
- for (uint i = 0; i < 10; i++) {
- led_state(1, 0);
- for (uint j = 0; j < reset_mode; j++) {
- if (!switch_get()) {
- break;
- }
- led_state(1, 1);
- mp_hal_delay_ms(100);
- led_state(1, 0);
- mp_hal_delay_ms(200);
- }
- mp_hal_delay_ms(400);
- if (!switch_get()) {
- break;
- }
- if (++reset_mode > 3) {
- reset_mode = 1;
- }
- }
- // Flash the selected reset mode
- for (uint i = 0; i < 2; i++) {
- for (uint j = 0; j < reset_mode; j++) {
- led_state(1, 1);
- mp_hal_delay_ms(100);
- led_state(1, 0);
- mp_hal_delay_ms(200);
- }
- mp_hal_delay_ms(400);
- }
- #else
- #error Need a reset mode update method
- #endif
- }
- #endif
- return reset_mode;
-}
-#endif
-
void stm32_main(uint32_t reset_mode) {
#if !defined(STM32F0) && defined(MICROPY_HW_VTOR)
// Change IRQ vector table if configured differently
@@ -552,22 +464,17 @@ void stm32_main(uint32_t reset_mode) {
MP_STATE_PORT(pyb_uart_obj_all)[MICROPY_HW_UART_REPL - 1] = &pyb_uart_repl_obj;
#endif
- #if !MICROPY_HW_USES_BOOTLOADER
- // check if user switch held to select the reset mode
- reset_mode = update_reset_mode(1);
- #endif
+ boardctrl_state_t state;
+ state.reset_mode = reset_mode;
+ state.run_boot_py = false;
+ state.run_main_py = false;
+ state.last_ret = 0;
+
+ MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
soft_reset:
- #if defined(MICROPY_HW_LED2)
- led_state(1, 0);
- led_state(2, 1);
- #else
- led_state(1, 1);
- led_state(2, 0);
- #endif
- led_state(3, 0);
- led_state(4, 0);
+ MICROPY_BOARD_TOP_SOFT_RESET_LOOP(&state);
// Python threading init
#if MICROPY_PY_THREAD
@@ -656,29 +563,19 @@ soft_reset:
// reset config variables; they should be set by boot.py
MP_STATE_PORT(pyb_config_main) = MP_OBJ_NULL;
+ MICROPY_BOARD_BEFORE_BOOT_PY(&state);
+
// run boot.py, if it exists
// TODO perhaps have pyb.reboot([bootpy]) function to soft-reboot and execute custom boot.py
- if (reset_mode == 1 || reset_mode == 3) {
+ if (state.run_boot_py) {
const char *boot_py = "boot.py";
- int ret = pyexec_file_if_exists(boot_py);
- if (ret & PYEXEC_FORCED_EXIT) {
+ state.last_ret = pyexec_file_if_exists(boot_py);
+ if (state.last_ret & PYEXEC_FORCED_EXIT) {
goto soft_reset_exit;
}
- if (!ret) {
- flash_error(4);
- }
}
- // turn boot-up LEDs off
- #if !defined(MICROPY_HW_LED2)
- // If there is only one LED on the board then it's used to signal boot-up
- // and so we turn it off here. Otherwise LED(1) is used to indicate dirty
- // flash cache and so we shouldn't change its state.
- led_state(1, 0);
- #endif
- led_state(2, 0);
- led_state(3, 0);
- led_state(4, 0);
+ MICROPY_BOARD_AFTER_BOOT_PY(&state);
// Now we initialise sub-systems that need configuration from boot.py,
// or whose initialisation can be safely deferred until after running
@@ -713,23 +610,24 @@ soft_reset:
// At this point everything is fully configured and initialised.
+ MICROPY_BOARD_BEFORE_MAIN_PY(&state);
+
// Run the main script from the current directory.
- if ((reset_mode == 1 || reset_mode == 3) && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+ if (state.run_main_py) {
const char *main_py;
if (MP_STATE_PORT(pyb_config_main) == MP_OBJ_NULL) {
main_py = "main.py";
} else {
main_py = mp_obj_str_get_str(MP_STATE_PORT(pyb_config_main));
}
- int ret = pyexec_file_if_exists(main_py);
- if (ret & PYEXEC_FORCED_EXIT) {
+ state.last_ret = pyexec_file_if_exists(main_py);
+ if (state.last_ret & PYEXEC_FORCED_EXIT) {
goto soft_reset_exit;
}
- if (!ret) {
- flash_error(3);
- }
}
+ MICROPY_BOARD_AFTER_MAIN_PY(&state);
+
#if MICROPY_ENABLE_COMPILER
// Main script is finished, so now go into REPL mode.
// The REPL mode can change, or it can request a soft reset.
@@ -750,12 +648,19 @@ soft_reset_exit:
// soft reset
+ MICROPY_BOARD_START_SOFT_RESET(&state);
+
#if MICROPY_HW_ENABLE_STORAGE
- printf("MPY: sync filesystems\n");
+ if (state.log_soft_reset) {
+ mp_printf(&mp_plat_print, "MPY: sync filesystems\n");
+ }
storage_flush();
#endif
- printf("MPY: soft reboot\n");
+ if (state.log_soft_reset) {
+ mp_printf(&mp_plat_print, "MPY: soft reboot\n");
+ }
+
#if MICROPY_PY_BLUETOOTH
mp_bluetooth_deinit();
#endif
@@ -774,10 +679,9 @@ soft_reset_exit:
pyb_thread_deinit();
#endif
- gc_sweep_all();
+ MICROPY_BOARD_END_SOFT_RESET(&state);
- // Set reset_mode to normal boot.
- reset_mode = 1;
+ gc_sweep_all();
goto soft_reset;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-28 11:39:46 +0000