build(esp32-devkit): apply suggestions from community

tspopp · Jan 21, 2025 · cc9ff6d · cc9ff6d
1 parent b6e8bf0
commit cc9ff6d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/AquaMQTT/include/config/Configuration.h b/AquaMQTT/include/config/Configuration.h
@@ -137,11 +137,21 @@ constexpr uint16_t MQTT_MAX_PAYLOAD_SIZE  = 1024;
 
 /**
  * Pin assignments for AquaMQTT Board Rev 1.0
- */
+ * There are different GPIO ports depending on the hardware.
+ * The ENV_DEVKIT_ESP32 macro is set by the platformio environment.
+ * By default we use the pin assignments of the Arduino Nano ESP32
+ */
+#ifdef ENV_DEVKIT_ESP32
+constexpr uint8_t GPIO_MAIN_RX = 5;
+constexpr uint8_t GPIO_MAIN_TX = 6;
+constexpr uint8_t GPIO_HMI_RX  = 7;
+constexpr uint8_t GPIO_HMI_TX  = 8;
+#else
 constexpr uint8_t GPIO_MAIN_RX = 2;
 constexpr uint8_t GPIO_MAIN_TX = 3;
 constexpr uint8_t GPIO_HMI_RX  = 4;
 constexpr uint8_t GPIO_HMI_TX  = 5;
+#endif
 constexpr uint8_t GPIO_SDA_RTC = A4;
 constexpr uint8_t GPIO_SCL_RTC = A5;
 

diff --git a/AquaMQTT/platformio.ini b/AquaMQTT/platformio.ini
@@ -41,7 +41,11 @@ board = arduino_nano_esp32
 
 [env:esp32-s3-devkitc-1]
 framework = arduino
-build_flags = -std=c++11
+build_flags =
+    -std=c++11
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_DFU_ON_BOOT=1
+    -DENV_DEVKIT_ESP32
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.05/platform-espressif32.zip
 board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
diff --git a/tools/AquaDebug/include/config/Configuration.h b/tools/AquaDebug/include/config/Configuration.h
@@ -31,11 +31,21 @@ constexpr uint8_t  MQTT_MAX_PAYLOAD_SIZE = 255;
 
 /**
  * Pin assignments for AquaMQTT Board Rev 1.0
+ * There are different GPIO ports depending on the hardware.
+ * The ENV_DEVKIT_ESP32 macro is set by the platformio environment.
+ * By default we use the pin assignments of the Arduino Nano ESP32
  */
+#ifdef ENV_DEVKIT_ESP32
+constexpr uint8_t GPIO_MAIN_RX = 5;
+constexpr uint8_t GPIO_MAIN_TX = 6;
+constexpr uint8_t GPIO_HMI_RX  = 7;
+constexpr uint8_t GPIO_HMI_TX  = 8;
+#else
 constexpr uint8_t GPIO_MAIN_RX = 2;
 constexpr uint8_t GPIO_MAIN_TX = 3;
 constexpr uint8_t GPIO_HMI_RX  = 4;
 constexpr uint8_t GPIO_HMI_TX  = 5;
+#endif
 constexpr uint8_t GPIO_SDA_RTC = A4;
 constexpr uint8_t GPIO_SCL_RTC = A5;
 

diff --git a/tools/AquaDebug/platformio.ini b/tools/AquaDebug/platformio.ini
@@ -31,7 +31,11 @@ board = arduino_nano_esp32
 
 [env:esp32-s3-devkitc-1]
 framework = arduino
-build_flags = -std=c++11
+build_flags =
+    -std=c++11
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DARDUINO_USB_DFU_ON_BOOT=1
+    -DENV_DEVKIT_ESP32
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.05/platform-espressif32.zip
 board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3