Merge remote-tracking branch 'origin/main'

Author: weblate

frozen/Adafruit_CircuitPython_Display_Shapes

@@ -3755,6 +3755,10 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
+#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
+msgid "pressing SW38 button at start up.\n"
+msgstr ""
+
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
 #: supervisor/shared/safe_mode.c

frozen/Adafruit_CircuitPython_PortalBase

@@ -704,6 +704,10 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
 vstr_t *boot_output;
 
 STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
+    if (safe_mode == NO_HEAP) {
+        return;
+    }
+
     // If not in safe mode, run boot before initing USB and capture output in a file.
 
     // There is USB setup to do even if boot.py is not actually run.

frozen/Adafruit_CircuitPython_RFM9x

@@ -60,7 +60,7 @@
 #define MICROPY_PORT_ROOT_POINTERS \
     CIRCUITPY_COMMON_ROOT_POINTERS
 
-#define CIRCUITPY_DEBUG_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_DEBUG_UART_RX (&pin_GPIO15)
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
 
 #endif  // __INCLUDED_MPCONFIGPORT_H