Fix ESP32-S2 build: USB.h, WDT API, remove duplicate flags

- Add #include <USB.h> to all .cpp files (required for HWCDCSerial)
- Use ESP-IDF v5.x esp_task_wdt_config_t struct instead of removed API
- Remove duplicate ARDUINO_USB_MODE/CDC flags from platformio.ini
  (board definition already provides these)
This commit is contained in:
Ryan Malloy 2026-02-02 21:27:24 -07:00
parent 613611d37a
commit fb835c9d5d
4 changed files with 10 additions and 5 deletions

View File

@ -9,6 +9,3 @@ monitor_speed = 115200
board_build.filesystem = littlefs board_build.filesystem = littlefs
build_flags = build_flags =
-DCORE_DEBUG_LEVEL=3 -DCORE_DEBUG_LEVEL=3
-DBOARD_HAS_PSRAM=1
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1

View File

@ -1,4 +1,5 @@
#include "attenuator.h" #include "attenuator.h"
#include <USB.h>
#include <soc/gpio_struct.h> #include <soc/gpio_struct.h>
Attenuator::Attenuator() : _step(0) {} Attenuator::Attenuator() : _step(0) {}

View File

@ -1,4 +1,5 @@
#include <Arduino.h> #include <Arduino.h>
#include <USB.h>
#include <WiFi.h> #include <WiFi.h>
#include <ESPmDNS.h> #include <ESPmDNS.h>
#include <esp_task_wdt.h> #include <esp_task_wdt.h>
@ -196,8 +197,13 @@ void setup() {
pinMode(PIN_LED, OUTPUT); pinMode(PIN_LED, OUTPUT);
setLEDState(LEDState::Off); setLEDState(LEDState::Off);
// Initialize watchdog // Initialize watchdog (ESP-IDF v5.x API)
esp_task_wdt_init(WDT_TIMEOUT_S, true); esp_task_wdt_config_t wdt_config = {
.timeout_ms = WDT_TIMEOUT_S * 1000,
.idle_core_mask = (1 << portNUM_PROCESSORS) - 1, // All cores
.trigger_panic = true
};
esp_task_wdt_init(&wdt_config);
esp_task_wdt_add(NULL); esp_task_wdt_add(NULL);
Serial.printf("[WDT] Initialized, timeout=%d s\n", WDT_TIMEOUT_S); Serial.printf("[WDT] Initialized, timeout=%d s\n", WDT_TIMEOUT_S);

View File

@ -1,6 +1,7 @@
#include "web_server.h" #include "web_server.h"
#include <Arduino.h> #include <Arduino.h>
#include <USB.h>
#include <WiFi.h> #include <WiFi.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>