Merge pull request #9008 from tannewt/debug_rgbmatrix_crash

Improve RGBMatrix reliability

Author: dhalbert

.gitmodules

@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.1.2
+	branch = circuitpython-v5.1.3
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/espressif/esp-protocols.git

ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk

@@ -11,6 +11,7 @@ CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 40m
 
+CIRCUITPY_CANIO = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_ROTARYIO = 0

ports/espressif/esp-idf

@@ -14,6 +14,7 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 # ESP System Settings
 #
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+CONFIG_ESP_PANIC_HANDLER_IRAM=y
 # end of ESP System Settings
 
 # end of Component config

ports/espressif/esp-idf-config/sdkconfig-debug.defaults

@@ -44,7 +44,11 @@
 #error Unknown CONFIG_IDF_TARGET_xxx
 #endif
 
-void mp_hal_delay_us(mp_uint_t delay) {
+#include "esp_attr.h"
+
+// This is used by ProtoMatter's interrupt so make sure it is available when
+// flash isn't.
+void IRAM_ATTR mp_hal_delay_us(mp_uint_t delay) {
     ets_delay_us(delay);
 }
 

ports/espressif/mphalport.c

@@ -270,7 +270,7 @@ safe_mode_t port_init(void) {
     #endif
 
     #ifndef ENABLE_JTAG
-    #define ENABLE_JTAG (defined(DEBUG) && DEBUG)
+    #define ENABLE_JTAG (0)
     #endif
 
     #if ENABLE_JTAG

ports/espressif/supervisor/port.c

@@ -25,6 +25,7 @@
     "CONFIG_HAL_DEFAULT_ASSERTION_LEVEL",
     "CONFIG_BOOTLOADER_LOG_LEVEL",
     "LOG_DEFAULT_LEVEL",
+    "CONFIG_ESP_PANIC_HANDLER_IRAM",
 ]
 
 TARGET_SETTINGS = [

ports/espressif/tools/update_sdkconfig.py

@@ -171,6 +171,10 @@ void usb_background(void) {
         #if CIRCUITPY_USB_HOST
         tuh_task();
         #endif
+        #elif CFG_TUSB_OS == OPT_OS_FREERTOS
+        // Yield to FreeRTOS in case TinyUSB runs in a separate task. Don't use
+        // port_yield() because it has a longer delay.
+        vTaskDelay(0);
         #endif
         // No need to flush if there's no REPL.
         #if CIRCUITPY_USB_CDC