debugging

Author: tannewt

main.c

@@ -116,6 +116,9 @@ uint8_t value_out = 0;
 #include "shared-module/os/__init__.h"
 #endif
 
+#include "esp_log.h"
+static const char *TAG = "main";
+
 static void reset_devices(void) {
     #if CIRCUITPY_BLEIO_HCI
     bleio_reset();
@@ -154,6 +157,7 @@ static uint8_t *_allocate_memory(safe_mode_t safe_mode, const char *env_key, siz
 #endif
 
 static void start_mp(safe_mode_t safe_mode) {
+    ESP_LOGI(TAG, "start_mp");
     supervisor_workflow_reset();
 
     // Stack limit should be less than real stack size, so we have a chance
@@ -210,6 +214,7 @@ static void start_mp(safe_mode_t safe_mode) {
 }
 
 static void stop_mp(void) {
+    ESP_LOGI(TAG, "stop_mp");
     #if MICROPY_VFS
     mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table);
 
@@ -421,6 +426,7 @@ static void print_code_py_status_message(safe_mode_t safe_mode) {
 }
 
 static bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
+    ESP_LOGI(TAG, "run_code_py");
     bool serial_connected_at_start = serial_connected();
     bool printed_safe_mode_message = false;
     #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0

ports/espressif/boards/espressif_esp32c6_devkitc_1_n8/sdkconfig

@@ -5,9 +5,10 @@
 # Component config
 #
 #
-# LWIP
+# ESP-Driver:GPTimer Configurations
 #
-# end of LWIP
+CONFIG_GPTIMER_ISR_CACHE_SAFE=y
+# end of ESP-Driver:GPTimer Configurations
 
 # end of Component config
 

ports/espressif/common-hal/digitalio/DigitalInOut.c

@@ -10,6 +10,9 @@
 #include "driver/gpio.h"
 #include "hal/gpio_hal.h"
 
+#include "esp_log.h"
+static const char *TAG = "digitalio";
+
 static bool _pin_is_input(uint8_t pin_number) {
     gpio_io_config_t config;
     if (gpio_get_io_config((gpio_num_t)pin_number, &config) != ESP_OK) {
@@ -87,6 +90,7 @@ digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
 
 void common_hal_digitalio_digitalinout_set_value(
     digitalio_digitalinout_obj_t *self, bool value) {
+    ESP_LOGI(TAG, "Setting value to %d", value);
     self->output_value = value;
     gpio_set_level(self->pin->number, value);
 }

ports/espressif/supervisor/port.c

@@ -417,6 +417,7 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
+    ESP_LOGI(TAG, "Resetting CPU");
     #if CIRCUITPY_DEBUG
     esp_backtrace_print(100);
     #endif

ports/espressif/supervisor/usb_serial_jtag.c

@@ -15,6 +15,8 @@
 #include "esp_intr_alloc.h"
 #include "soc/periph_defs.h"
 
+#include "esp_log.h"
+static const char *TAG = "usb_serial_jtag";
 
 #define USB_SERIAL_JTAG_BUF_SIZE (64)
 
@@ -33,6 +35,7 @@ static void _copy_out_of_fifo(void) {
     if (req_len == 0) {
         // Disable the interrupt so that CircuitPython can run and process the ringbuf. It will
         // re-enable the interrupt once the ringbuf is empty.
+        ESP_EARLY_LOGW(TAG, "Disable interrupt");
         usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
     }
     if (req_len > USB_SERIAL_JTAG_BUF_SIZE) {
@@ -42,9 +45,15 @@ static void _copy_out_of_fifo(void) {
 
     // Read up to req_len bytes. Does not block.
     size_t len = usb_serial_jtag_ll_read_rxfifo(rx_buf, req_len);
+    if (len == req_len) {
+        ESP_EARLY_LOGW(TAG, "Buffer full");
+    } else if (len > 0) {
+        ESP_EARLY_LOGW(TAG, "Read %d bytes", len);
+    }
 
     for (size_t i = 0; i < len; ++i) {
         if (rx_buf[i] == mp_interrupt_char) {
+            ESP_LOGI(TAG, "usb_serial_jtag_read_char: interrupt char received");
             mp_sched_keyboard_interrupt();
             ringbuf_clear(&ringbuf);
         } else {
@@ -72,10 +81,20 @@ static void usb_serial_jtag_isr_handler(void *arg) {
         _copy_out_of_fifo();
         port_wake_main_task_from_isr();
     }
+
+    // Clear everything else
+    usb_serial_jtag_ll_clr_intsts_mask(~(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1));
 }
 
 void usb_serial_jtag_init(void) {
     ringbuf_init(&ringbuf, buf, sizeof(buf));
+    #ifdef USB_SERIAL_JTAG_USB_UART_CHIP_RST_DIS
+    // Disable UART triggered reset because the host may set the serial lines.
+    USB_SERIAL_JTAG.chip_rst.usb_uart_chip_rst_dis = 1;
+    ESP_LOGI(TAG, "UART reset disabled");
+    #else
+    #error "USB_SERIAL_JTAG_USB_UART_CHIP_RST_DIS must be defined"
+    #endif
     usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
     usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SOF | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_TOKEN_REC_IN_EP1);
     ESP_ERROR_CHECK(esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, ESP_INTR_FLAG_LEVEL1,
@@ -90,6 +109,7 @@ char usb_serial_jtag_read_char(void) {
     uint32_t num_filled = ringbuf_num_filled(&ringbuf);
 
     if (num_filled == 0 && !usb_serial_jtag_ll_rxfifo_data_available()) {
+        ESP_LOGI(TAG, "usb_serial_jtag_read_char: no data available");
         return -1;
     }
     char c = -1;
@@ -113,6 +133,7 @@ char usb_serial_jtag_read_char(void) {
         }
         usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
     }
+    ESP_LOGI(TAG, "c: %c", c);
     return c;
 }
 
@@ -121,13 +142,15 @@ uint32_t usb_serial_jtag_bytes_available(void) {
     common_hal_mcu_disable_interrupts();
     const uint32_t count = ringbuf_num_filled(&ringbuf) + usb_serial_jtag_ll_rxfifo_data_available();
     common_hal_mcu_enable_interrupts();
+    ESP_LOGI(TAG, "usb_serial_jtag_bytes_available: %d", count);
     return count;
 }
 
 void usb_serial_jtag_write(const char *text, uint32_t length) {
     if (!usb_serial_jtag_connected()) {
         return;
     }
+    ESP_LOGI(TAG, "Writing '%s'", text);
     size_t total_written = 0;
     while (total_written < length) {
         uint32_t start_time = supervisor_ticks_ms32();
@@ -144,4 +167,5 @@ void usb_serial_jtag_write(const char *text, uint32_t length) {
         RUN_BACKGROUND_TASKS;
     }
     usb_serial_jtag_ll_txfifo_flush();
+    ESP_LOGI(TAG, "Written %d bytes", total_written);
 }