Fix wire protocol hiccups for targets with CDC (#3224)

***NO_CI***

Author: josesimoes

CMake/binutils.ESP32.cmake

@@ -752,10 +752,14 @@ macro(nf_add_idf_as_library)
             string(APPEND SDKCONFIG_DEFAULT_CONTENTS "\nCONFIG_TINYUSB_CDC_ENABLED=y\n")
             string(APPEND SDKCONFIG_DEFAULT_CONTENTS "CONFIG_TINYUSB_DESC_PRODUCT_STRING=\"nanoFramework device\"\n")
             string(APPEND SDKCONFIG_DEFAULT_CONTENTS "CONFIG_TINYUSB_DESC_CDC_STRING=\"nanoFramework device\"\n")
-            string(APPEND SDKCONFIG_DEFAULT_CONTENTS "CONFIG_TINYUSB_CDC_RX_BUFSIZE=64\n")
+            # set the TX buffer as large as the WireProtocol packet size
+            # no worries about the RX buffer
             string(APPEND SDKCONFIG_DEFAULT_CONTENTS "CONFIG_TINYUSB_CDC_TX_BUFSIZE=1024\n")
+            # better to assign the tinyUSB task to the same core as the ReceiverTask
+            string(APPEND SDKCONFIG_DEFAULT_CONTENTS "CONFIG_TINYUSB_TASK_AFFINITY=TINYUSB_TASK_AFFINITY_CPU0\n")
 
             message(STATUS "Support for embedded USB CDC enabled")
+
         else()
             message(STATUS "Support for embedded USB CDC **IS NOT** enabled")
 

targets/ESP32/_common/WireProtocol_HAL_Interface.c

@@ -275,6 +275,7 @@ static bool WP_Initialise(COM_HANDLE port)
     tinyusb_config_cdcacm_t amc_cfg = {
         .usb_dev = TINYUSB_USBDEV_0,
         .cdc_port = TINYUSB_CDC_ACM_0,
+        // parameter deprecated, therefore it doesn't matter what we put here
         .rx_unread_buf_sz = 1056,
         .callback_rx = &WP_Cdc_Rx_Callback,
         .callback_rx_wanted_char = NULL,
@@ -339,7 +340,9 @@ uint8_t WP_TransmitMessage(WP_Message *message)
         }
     }
 
-    tinyusb_cdcacm_write_flush(TINYUSB_CDC_ACM_0, 0);
+    // need to call flush with a timeout to have it behave cooperatively with the RTOS
+    // OK to silently ignore errors here
+    tinyusb_cdcacm_write_flush(TINYUSB_CDC_ACM_0, pdMS_TO_TICKS(250));
 
     return true;
 }
@@ -358,16 +361,17 @@ static bool WP_Initialise(COM_HANDLE port)
     // uninstall driver for console
     // ESP_ERROR_CHECK(uart_driver_delete(ESP32_WP_UART));
 
-    uart_config_t uart_config = {// baudrate
-                                 .baud_rate = TARGET_SERIAL_BAUDRATE,
-                                 // baudrate
-                                 .data_bits = UART_DATA_8_BITS,
-                                 // parity mode
-                                 .parity = UART_PARITY_DISABLE,
-                                 // stop bit mode
-                                 .stop_bits = UART_STOP_BITS_1,
-                                 // hardware flow control(cts/rts)
-                                 .flow_ctrl = UART_HW_FLOWCTRL_DISABLE};
+    uart_config_t uart_config = {
+        // baudrate
+        .baud_rate = TARGET_SERIAL_BAUDRATE,
+        // baudrate
+        .data_bits = UART_DATA_8_BITS,
+        // parity mode
+        .parity = UART_PARITY_DISABLE,
+        // stop bit mode
+        .stop_bits = UART_STOP_BITS_1,
+        // hardware flow control(cts/rts)
+        .flow_ctrl = UART_HW_FLOWCTRL_DISABLE};
 
     ESP_ERROR_CHECK(uart_param_config(ESP32_WP_UART, &uart_config));