From c1bc0405035d9d27689be28cc934d98bdc02fbc7 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Wed, 31 Jan 2024 13:43:06 +0300 Subject: [PATCH] Update GitHub Actions workflow to latest version with Node.js 20 --- .github/workflows/main.yml | 2 +- software/firmware/source/SoftRF/src/platform/ESP32.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3140c7ee..f302aceb1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 #- name: Setup tmate session # uses: mxschmitt/action-tmate@v3 diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp index b7231f952..083a9f4c4 100644 --- a/software/firmware/source/SoftRF/src/platform/ESP32.cpp +++ b/software/firmware/source/SoftRF/src/platform/ESP32.cpp @@ -4691,6 +4691,9 @@ static void ESP32CX_USB_setup() /* native CDC (HWCDC) */ USBSerial.setRxBufferSize(USB_RX_FIFO_SIZE); USBSerial.setTxBufferSize(USB_TX_FIFO_SIZE); +#if !ARDUINO_USB_CDC_ON_BOOT + USBSerial.begin(SERIAL_OUT_BR); +#endif /* ARDUINO_USB_CDC_ON_BOOT */ } static void ESP32CX_USB_loop() @@ -4700,7 +4703,7 @@ static void ESP32CX_USB_loop() static void ESP32CX_USB_fini() { - + /* TBD */ } static int ESP32CX_USB_available()