Allow USB Serial to be disabled, redirect to UART Serial

This will set the default Serial output to UART if USB CDC is disabled by setting USB_CDC_DEFAULT_SERIAL to 0.

If the board has serial1 pins defined they will be redefined to Serial and Serial1 will be aliased to Serial

Author: h2zero

cores/nRF5/Arduino.h

@@ -54,16 +54,11 @@ void loop( void ) ;
   #include "WMath.h"
   #include "HardwareSerial.h"
   #include "pulse.h"
-#endif
-#include "delay.h"
-#include "binary.h"
-#ifdef __cplusplus
   #include "Uart.h"
 #endif
 
-#ifdef USE_TINYUSB
-  #include "Adafruit_USBD_CDC.h"
-#endif
+#include "delay.h"
+#include "binary.h"
 
 // Include board variant
 #include "variant.h"

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore/Adafruit_TinyUSB_API.cpp

@@ -27,6 +27,7 @@
 #if CFG_TUD_ENABLED || CFG_TUH_ENABLED
 
 #include "Adafruit_USBD_Device.h"
+#include "Adafruit_USBD_CDC.h"
 #include "Arduino.h"
 
 extern "C" {

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore/Adafruit_TinyUSB_nrf.cpp

@@ -31,6 +31,7 @@
 
 #include "Arduino.h"
 #include "Adafruit_USBD_Device.h"
+#include "Adafruit_TinyUSB_API.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore/Adafruit_USBD_CDC.h

@@ -93,11 +93,9 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
   bool isValid(void) { return _instance != INVALID_INSTANCE; }
 };
 
-extern Adafruit_USBD_CDC SerialTinyUSB;
-
 // Built-in support "Serial" is assigned to TinyUSB CDC
 // CH32 defines Serial as alias in WSerial.h
-#if defined(USE_TINYUSB) && !defined(ARDUINO_ARCH_CH32)
+#if defined(USE_TINYUSB) && !defined(ARDUINO_ARCH_CH32) && USB_CDC_DEFAULT_SERIAL
 #define SerialTinyUSB Serial
 #endif
 

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore/Adafruit_USBD_Device.cpp

@@ -259,8 +259,6 @@ bool Adafruit_USBD_Device::begin(uint8_t rhport) {
   config->bNumInterfaces = _itf_count;
 #endif
 #else
-  SerialTinyUSB.begin(115200);
-
   // Init device hardware and call tusb_init()
   TinyUSB_Port_InitDevice(rhport);
 #endif

cores/nRF5/Uart.cpp

@@ -256,7 +256,7 @@ Uart::operator bool() {
   #define NRF_UART0_IRQn UART0_IRQn
 #endif
 
-#if !defined(USB_CDC_DEFAULT_SERIAL)
+#if !USB_CDC_DEFAULT_SERIAL
 #  if defined(PIN_SERIAL_CTS) && defined(PIN_SERIAL_RTS)
       Uart Serial( NRF_UART0, NRF_UART0_IRQn, PIN_SERIAL_RX, PIN_SERIAL_TX, PIN_SERIAL_CTS, PIN_SERIAL_RTS );
 #  else

cores/nRF5/Uart.h

@@ -28,6 +28,14 @@
 
 #include "variant.h"
 
+#ifndef USB_CDC_DEFAULT_SERIAL
+  #define USB_CDC_DEFAULT_SERIAL (0)
+#endif
+
+#if defined(USE_TINYUSB) && USB_CDC_DEFAULT_SERIAL
+  #include "Adafruit_USBD_CDC.h"
+#endif
+
 class Uart : public HardwareSerial
 {
   public:
@@ -78,7 +86,7 @@ class Uart : public HardwareSerial
 //
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
-#if defined(USB_CDC_DEFAULT_SERIAL)
+#if USB_CDC_DEFAULT_SERIAL
   #define SERIAL_PORT_MONITOR         Serial
   #define SERIAL_PORT_USBVIRTUAL      Serial
 

cores/nRF5/libc/printf/putchar.cpp

@@ -68,7 +68,7 @@ extern "C"
             Serial.write((const uint8_t *)pbuf->buffer, pbuf->index);
             pbuf->index = 0;
         }
-#ifdef USB_CDC_DEFAULT_SERIAL
+#if USB_CDC_DEFAULT_SERIAL
         Serial.flush();
 #endif
     }
@@ -85,7 +85,7 @@ extern "C"
                 Serial.write('\r');
             }
             Serial.write(c);
-#ifdef USB_CDC_DEFAULT_SERIAL
+#if USB_CDC_DEFAULT_SERIAL
             Serial.flush();
 #endif
             return;

cores/nRF5/utils/debug_utils.cpp

@@ -177,7 +177,7 @@ static size_t capture_backtrace(uint32_t* backtrace_buffer, size_t buffer_size,
  */
 static void store_fault_to_ram(exception_frame* ef, uint32_t exc_return_val)
 {
-#ifdef USB_CDC_DEFAULT_SERIAL
+#if USB_CDC_DEFAULT_SERIAL
     volatile fault_data_t* fault = FAULT_DATA_ADDR;
     fault->magic = FAULT_DATA_MAGIC;
     fault->pc = ef->pc;
@@ -240,7 +240,7 @@ static void store_fault_to_ram(exception_frame* ef, uint32_t exc_return_val)
 static void print_exception_data(exception_frame* ef)
 {
 // If USB is used for Serial we must avoid using it in HardFault handler
-#ifndef USB_CDC_DEFAULT_SERIAL
+#if !USB_CDC_DEFAULT_SERIAL
     if (Serial)
     {
         Serial.println("\n======== HARD FAULT DETECTED ========");
@@ -320,7 +320,7 @@ static void print_exception_data(exception_frame* ef)
  */
 void check_and_report_fault()
 {
-#ifdef USB_CDC_DEFAULT_SERIAL
+#if USB_CDC_DEFAULT_SERIAL
     volatile fault_data_t* fault = FAULT_DATA_ADDR;
 
     if (fault->magic == FAULT_DATA_MAGIC)

variants/Seeed_XIAO_nRF52840_Sense/variant.h

@@ -85,9 +85,18 @@ static const uint8_t A5  = PIN_A5;
 #define PIN_NFC2                (31)
 
 // Serial interfaces
-#define PIN_SERIAL1_RX          (7)
-#define PIN_SERIAL1_TX          (6)
-#define USB_CDC_DEFAULT_SERIAL  1
+#ifndef USB_CDC_DEFAULT_SERIAL
+  #define USB_CDC_DEFAULT_SERIAL (1)
+#endif
+
+#if USB_CDC_DEFAULT_SERIAL
+  #define PIN_SERIAL1_RX         (7)
+  #define PIN_SERIAL1_TX         (6)
+#else
+  #define PIN_SERIAL_RX          (7)
+  #define PIN_SERIAL_TX          (6)
+  #define Serial1                Serial
+#endif
 
 // SPI Interfaces
 #define SPI_INTERFACES_COUNT    (2)