Merge pull request #6172 from tannewt/supervisor_reload

Fix supervisor.reload

Author: tannewt

main.c

@@ -413,6 +413,12 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 
         if (result.return_code & PYEXEC_RELOAD) {
             next_code_stickiness_situation |= SUPERVISOR_NEXT_CODE_OPT_STICKY_ON_RELOAD;
+            // Reload immediately unless the reload is due to autoreload. In that
+            // case, we wait below to see if any other writes occur.
+            if (supervisor_get_run_reason() != RUN_REASON_AUTO_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) {

ports/nrf/boards/bluemicro833/mpconfigboard.mk

@@ -36,6 +36,7 @@ CIRCUITPY_RE = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_TRACEBACK = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_ULAB = 0
 CIRCUITPY_USB_MIDI = 0