Commit 9b2e22a

committed

Make autoreload checking more robust

- Add reset for autoreload. De-request ticks. - Separate state a little more in autoreload.c - Rename some routines. - Remove redundant settings of CIRCUITPY_AUTORELOAD_DELAY_MS.

1 parent aeeb58f commit 9b2e22aCopy full SHA for 9b2e22a

21 files changed

main.c
ports
- atmel-samd/supervisor
  - port.c
- nrf/boards
  - aramcon2_badge
    - mpconfigboard.h
  - arduino_nano_33_ble
    - mpconfigboard.h
  - bastble
    - mpconfigboard.h
  - feather_bluefruit_sense
    - mpconfigboard.h
  - ikigaisense_vita
    - mpconfigboard.h
  - itsybitsy_nrf52840_express
    - mpconfigboard.h
  - warmbit_bluepixel
    - mpconfigboard.h
- stm/boards
  - pyb_nano_v2
    - mpconfigboard.h
  - stm32f411ce_blackpill_with_flash
    - mpconfigboard.h
  - stm32f411ce_blackpill
    - mpconfigboard.h
shared-bindings/supervisor
- __init__.c
shared/runtime
- pyexec.c
- pyexec.h
supervisor/shared
- autoreload.c
- autoreload.h
- bluetooth
  - file_transfer.c
- flash.c
- tick.c
- usb
  - usb_msc_flash.c

`‎main.c‎`

-Original file line number
+Diff line change
+}
 STATIC void start_mp(supervisor_allocation *heap, bool first_run) {
 -    autoreload_stop();
 +    autoreload_reset();
     supervisor_workflow_reset();
     // Stack limit should be less than real stack size, so we have a chance
     result.exception = MP_OBJ_NULL;
     result.exception_line = 0;
 -    bool skip_repl;
 +    bool skip_repl = false;
     bool skip_wait = false;
     bool found_main = false;
     uint8_t next_code_options = 0;
         // Print done before resetting everything so that we get the message over
         // BLE before it is reset and we have a delay before reconnect.
 -        if (reload_requested && result.return_code == PYEXEC_EXCEPTION) {
 +        if (result.return_code == PYEXEC_RELOAD) {
             serial_write_compressed(translate("\nCode stopped by auto-reload.\n"));
         } else {
             serial_write_compressed(translate("\nCode done running.\n"));
+        }
 -        // Finished executing python code. Cleanup includes a board reset.
 +        // Finished executing python code. Cleanup includes filesystem flush and a board reset.
         cleanup_after_vm(heap, result.exception);
         // If a new next code file was set, that is a reason to keep it (obviously). Stuff this into
             next_code_options |= SUPERVISOR_NEXT_CODE_OPT_NEWLY_SET;
+        }
 -        if (reload_requested) {
 +        if (result.return_code & PYEXEC_RELOAD) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
 +            skip_repl = true;
 +            skip_wait = true;
         } else if (result.return_code == 0) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_SUCCESS;
             if (next_code_options & SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) {
+            }
+        }
         if (result.return_code & PYEXEC_FORCED_EXIT) {
 -            skip_repl = reload_requested;
 +            skip_repl = false;
             skip_wait = true;
+        }
+    }
         RUN_BACKGROUND_TASKS;
         // If a reload was requested by the supervisor or autoreload, return
 -        if (reload_requested) {
 +        if (result.return_code & PYEXEC_RELOAD) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
             // Should the STICKY_ON_SUCCESS and STICKY_ON_ERROR bits be cleared in
             // next_code_stickiness_situation? I can see arguments either way, but I'm deciding
+        }
+    }
 +    // Done waiting, start the board back up.
++
     // free code allocation if unused
     if ((next_code_options & next_code_stickiness_situation) == 0) {
         free_memory(next_code_allocation);
         next_code_allocation = NULL;
+    }
 -    // Done waiting, start the board back up.
     #if CIRCUITPY_STATUS_LED
     if (led_active) {
         new_status_color(BLACK);
     usb_setup_with_vm();
     #endif
 -    autoreload_suspend(AUTORELOAD_LOCK_REPL);
 +    autoreload_suspend(AUTORELOAD_SUSPEND_REPL);
     // Set the status LED to the REPL color before running the REPL. For
     // NeoPixels and DotStars this will be sticky but for PWM or single LED it
     status_led_deinit();
     #endif
 -    autoreload_resume(AUTORELOAD_LOCK_REPL);
 +    autoreload_resume(AUTORELOAD_SUSPEND_REPL);
     return exit_code;
+}

`‎ports/atmel-samd/supervisor/port.c‎`

-Original file line number
+Diff line change
 #include "common-hal/_pew/PewPew.h"
 #endif
 static volatile bool sleep_ok = true;
++
 #ifdef SAMD21
 -static uint8_t _tick_event_channel = 0;
 +uint8_t _tick_event_channel;
 // Sleeping requires a register write that can stall interrupt handling. Turning
 // off sleeps allows for more accurate interrupt timing. (Python still thinks
 void rtc_end_pulse(void) {
     sleep_ok = true;
+}
 -#endif
 +#endif // SAMD21
++
 +static void reset_ticks(void) {
 +    #ifdef SAMD21
 +    _tick_event_channel = EVSYS_SYNCH_NUM;
 +    #endif
 +}
 extern volatile bool mp_msc_enabled;
     #endif
     reset_event_system();
 -    #ifdef SAMD21
 -    _tick_event_channel = EVSYS_SYNCH_NUM;
 -    #endif
 +    reset_ticks();
     reset_all_pins();
 static volatile uint64_t overflowed_ticks = 0;
 static uint32_t _get_count(uint64_t *overflow_count) {
 -    while(1) {
 +    while (1) {
         // Disable interrupts so we can grab the count and the overflow atomically.
         common_hal_mcu_disable_interrupts();
             return count;
+        }
 -    // Try again if overflow hasn't been processed yet.
 +        // Try again if overflow hasn't been processed yet.
+    }
+}
     RTC->MODE0.INTENSET.reg = RTC_MODE0_INTENSET_PER2;
     #endif
     #ifdef SAMD21
 -    // SAMD21 ticks won't survive port_reset(). This *should* be ok since it'll
 +    // SAMD21 ticks won't survive reset_port(). This *should* be ok since it'll
     // be triggered by ticks and no Python will be running.
     if (_tick_event_channel >= EVSYS_SYNCH_NUM) {
         turn_on_event_system();
         uint8_t value = 1 << _tick_event_channel;
         EVSYS->INTENCLR.reg = EVSYS_INTENSET_EVD(value);
+    }
 +    _tick_event_channel = EVSYS_SYNCH_NUM;
     #endif
+}

`‎ports/nrf/boards/aramcon2_badge/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define BOARD_USER_SAFE_MODE_ACTION translate("pressing the left button at start up\n")
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

`‎ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define MICROPY_HW_BOARD_NAME       "Arduino Nano 33 BLE"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #define DEFAULT_I2C_BUS_SCL         (&pin_P0_02)
 #define DEFAULT_I2C_BUS_SDA         (&pin_P0_31)

`‎ports/nrf/boards/bastble/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define MICROPY_HW_BOARD_NAME       "BastBLE"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #if QSPI_FLASH_FILESYSTEM
 #define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(0, 30)
 #define MICROPY_QSPI_DATA1                NRF_GPIO_PIN_MAP(0, 29)

`‎ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define SPI_FLASH_CS_PIN &pin_P0_20
 #endif
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

`‎ports/nrf/boards/ikigaisense_vita/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define MICROPY_HW_LED_STATUS       (&pin_P0_27)
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

`‎ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define SPI_FLASH_CS_PIN &pin_P0_23
 #endif
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

`‎ports/nrf/boards/warmbit_bluepixel/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define MICROPY_HW_LED_STATUS       (&pin_P0_12)
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+-
 #define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

`‎ports/stm/boards/pyb_nano_v2/mpconfigboard.h‎`

-Original file line number
+Diff line change
 #define SPI_FLASH_SCK_PIN           (&pin_PB13)
 #define SPI_FLASH_CS_PIN            (&pin_PB12)
 -#define CIRCUITPY_AUTORELOAD_DELAY_MS (500)
+-
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x2000 - 0xC000)
 #define AUTORESET_DELAY_MS (500)

Comments

(0)

File tree

0 commit comments