Fixes for espruino#2609 - Initial testing

Author: SimonGAndrews

targets/esp32/IDF4/sdkconfig_c3

@@ -801,8 +801,8 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
-CONFIG_ESP_CONSOLE_UART_DEFAULT=y
-# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set
+CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
 # CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set

targets/esp32/IDF4/sdkconfig_s3

@@ -845,9 +845,9 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_ESP_MAIN_TASK_AFFINITY=0x0
 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
-CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+CONFIG_ESP_CONSOLE_UART_DEFAULT=n
 # CONFIG_ESP_CONSOLE_USB_CDC is not set
-# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
 # CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set

targets/esp32/jshardware.c

@@ -592,7 +592,7 @@ void jshUSARTKick(IOEventFlags device) {
 #endif
     case EV_SERIAL1:
       uart_tx_one_char((uint8_t)c);
-#ifdef CONFIG_IDF_TARGET_ESP32C3
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
       // The USB CDC UART on the C3 only writes the data to USB after a newline. Ensure uartTask in main.c knows to flush the UART next time
       extern void esp32USBUARTWasUsed();
       esp32USBUARTWasUsed();

targets/esp32/jshardwareUart.c

@@ -21,8 +21,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <jsdevices.h>
+#include "jsinteractive.h"  // jsDebug() ??
 
-#ifdef CONFIG_IDF_TARGET_ESP32C3
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
 #include "driver/usb_serial_jtag.h"
 #endif
 
@@ -86,14 +87,12 @@ void initSerial(IOEventFlags device,JshUSARTInfo *inf){
 }
 
 void initConsole(){
-#ifdef CONFIG_IDF_TARGET_ESP32C3
-  #ifdef USB_CDC
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
   /* Configure USB-CDC */
   usb_serial_jtag_driver_config_t usb_serial_config = {.tx_buffer_size = 128,
                                                        .rx_buffer_size = 128};
-
+  jsDebug(DBG_INFO, "initConsole: Installing usb_serial_jtag_driver \n");
   ESP_ERROR_CHECK(usb_serial_jtag_driver_install(&usb_serial_config));
-  #endif
 #endif
 
   uart_config_t uart_config = {
@@ -114,17 +113,14 @@ void initConsole(){
 
 uint8_t rxbuf[256];
 void consoleToEspruino(){
+#if ESP_IDF_VERSION_MAJOR >= 4
+  TickType_t ticksToWait = 50 / portTICK_RATE_MS;
+#else
   TickType_t ticksToWait = 100;
-#if ESP_IDF_VERSION_MAJOR>=4
-  ticksToWait = 50 / portTICK_RATE_MS;
 #endif
-#ifdef CONFIG_IDF_TARGET_ESP32C3
-  #ifdef USB_CDC
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
   int len = usb_serial_jtag_read_bytes(rxbuf, sizeof(rxbuf), ticksToWait);
-  #else
-  int len = uart_read_bytes(uart_console, rxbuf, sizeof(rxbuf), ticksToWait);  // Read data from UART
-  #endif
-#else
+#else 
   int len = uart_read_bytes(uart_console, rxbuf, sizeof(rxbuf), ticksToWait);  // Read data from UART
 #endif
   if(len > 0) jshPushIOCharEvents(EV_SERIAL1, rxbuf, len);

targets/esp32/main.c

@@ -19,6 +19,8 @@
 #include "jshardwareESP32.h"
 #include "jswrap_wifi.h" // jswrap_wifi_restore
 #include "jswrapper.h"
+#include "sdkconfig.h"
+
 
 #ifdef BLUETOOTH
 #include "libs/bluetooth/bluetooth.h"
@@ -37,15 +39,21 @@
 
 #include "jsvar.h"
 
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
+  #pragma message ("USB Serial JTAG console is enabled")
+#else
+  #pragma message ("Using UART console")
+#endif
+
 extern void *espruino_stackHighPtr;  //Name spaced because this has to be a global variable.
                                      //Used in jsuGetFreeStack().
-#ifdef CONFIG_IDF_TARGET_ESP32C3
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
 #include "hal/usb_serial_jtag_ll.h"
 volatile bool usbUARTIsNotFlushed;
 #endif
 
 void esp32USBUARTWasUsed() {
-#ifdef CONFIG_IDF_TARGET_ESP32C3
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
   usbUARTIsNotFlushed = true;
 #endif
 }
@@ -57,7 +65,7 @@ static void uartTask(void *data) {
   while(1) {
     consoleToEspruino();
     serialToEspruino();
-#ifdef CONFIG_IDF_TARGET_ESP32C3
+#if defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) && !defined(ESP_FORCE_NO_USB_SERIAL)
     /* The USB CDC UART on the C3 only writes the data to USB after a newline.
     We don't want that, so we call flush in this uart task if any data has been sent. */
     if (usbUARTIsNotFlushed) {