Merge branch 'master' into dismiss_frames

protobufs

@@ -1 +1 @@
-Subproject commit f6448be7770a3521bf52407ff8f5fa5b9b06da7b
+Subproject commit 15c1fbde882de953dec279160fa984d0e00569d0

src/mesh/eth/ethClient.cpp

@@ -68,9 +68,11 @@ static int32_t reconnectETH()
                 initApiServer();
             }
 #endif
+#if HAS_UDP_MULTICAST
             if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
                 udpHandler->start();
             }
+#endif
 
             ethStartupComplete = true;
         }

src/mesh/generated/meshtastic/config.pb.h

@@ -480,7 +480,8 @@ typedef struct _meshtastic_Config_DisplayConfig {
     /* Number of seconds the screen stays on after pressing the user button or receiving a message
  0 for default of one minute MAXUINT for always on */
     uint32_t screen_on_secs;
-    /* How the GPS coordinates are formatted on the OLED screen. */
+    /* Deprecated in 2.7.4: Unused
+ How the GPS coordinates are formatted on the OLED screen. */
     meshtastic_Config_DisplayConfig_GpsCoordinateFormat gps_format;
     /* Automatically toggles to the next page on the screen like a carousel, based the specified interval in seconds.
  Potentially useful for devices without user buttons. */

src/mesh/generated/meshtastic/mesh.pb.h

@@ -426,7 +426,10 @@ typedef enum _meshtastic_Routing_Error {
     /* Admin packet otherwise checks out, but uses a bogus or expired session key */
     meshtastic_Routing_Error_ADMIN_BAD_SESSION_KEY = 36,
     /* Admin packet sent using PKC, but not from a public key on the admin key list */
-    meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37
+    meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37,
+    /* Airtime fairness rate limit exceeded for a packet
+ This typically enforced per portnum and is used to prevent a single node from monopolizing airtime */
+    meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38
 } meshtastic_Routing_Error;
 
 /* The priority of this message for sending.
@@ -1222,8 +1225,8 @@ extern "C" {
 #define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1))
 
 #define _meshtastic_Routing_Error_MIN meshtastic_Routing_Error_NONE
-#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED
-#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED+1))
+#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED
+#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED+1))
 
 #define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
 #define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX

src/mesh/generated/meshtastic/telemetry.pb.h

@@ -93,7 +93,11 @@ typedef enum _meshtastic_TelemetrySensorType {
     /* PCT2075 Temperature Sensor */
     meshtastic_TelemetrySensorType_PCT2075 = 39,
     /* ADS1X15 ADC */
-    meshtastic_TelemetrySensorType_ADS1X15 = 40
+    meshtastic_TelemetrySensorType_ADS1X15 = 40,
+    /* ADS1X15 ADC_ALT */
+    meshtastic_TelemetrySensorType_ADS1X15_ALT = 41,
+    /* Sensirion SFA30 Formaldehyde sensor */
+    meshtastic_TelemetrySensorType_SFA30 = 42
 } meshtastic_TelemetrySensorType;
 
 /* Struct definitions */
@@ -287,6 +291,15 @@ typedef struct _meshtastic_AirQualityMetrics {
     /* CO2 sensor relative humidity in % */
     bool has_co2_humidity;
     float co2_humidity;
+    /* Formaldehyde sensor formaldehyde concentration in ppb */
+    bool has_form_formaldehyde;
+    float form_formaldehyde;
+    /* Formaldehyde sensor relative humidity in %RH */
+    bool has_form_humidity;
+    float form_humidity;
+    /* Formaldehyde sensor temperature in degrees Celsius */
+    bool has_form_temperature;
+    float form_temperature;
 } meshtastic_AirQualityMetrics;
 
 /* Local device mesh statistics */
@@ -398,8 +411,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_ADS1X15
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_ADS1X15+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SFA30
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SFA30+1))
 
 
 
@@ -415,7 +428,7 @@ extern "C" {
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_default    {false, 0, false, 0, false, 0}
 #define meshtastic_HostMetrics_init_default      {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
@@ -424,7 +437,7 @@ extern "C" {
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_zero       {false, 0, false, 0, false, 0}
 #define meshtastic_HostMetrics_init_zero         {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
@@ -490,6 +503,9 @@ extern "C" {
 #define meshtastic_AirQualityMetrics_co2_tag     13
 #define meshtastic_AirQualityMetrics_co2_temperature_tag 14
 #define meshtastic_AirQualityMetrics_co2_humidity_tag 15
+#define meshtastic_AirQualityMetrics_form_formaldehyde_tag 16
+#define meshtastic_AirQualityMetrics_form_humidity_tag 17
+#define meshtastic_AirQualityMetrics_form_temperature_tag 18
 #define meshtastic_LocalStats_uptime_seconds_tag 1
 #define meshtastic_LocalStats_channel_utilization_tag 2
 #define meshtastic_LocalStats_air_util_tx_tag    3
@@ -597,7 +613,10 @@ X(a, STATIC,   OPTIONAL, UINT32,   particles_50um,   11) \
 X(a, STATIC,   OPTIONAL, UINT32,   particles_100um,  12) \
 X(a, STATIC,   OPTIONAL, UINT32,   co2,              13) \
 X(a, STATIC,   OPTIONAL, FLOAT,    co2_temperature,  14) \
-X(a, STATIC,   OPTIONAL, FLOAT,    co2_humidity,     15)
+X(a, STATIC,   OPTIONAL, FLOAT,    co2_humidity,     15) \
+X(a, STATIC,   OPTIONAL, FLOAT,    form_formaldehyde,  16) \
+X(a, STATIC,   OPTIONAL, FLOAT,    form_humidity,    17) \
+X(a, STATIC,   OPTIONAL, FLOAT,    form_temperature,  18)
 #define meshtastic_AirQualityMetrics_CALLBACK NULL
 #define meshtastic_AirQualityMetrics_DEFAULT NULL
 
@@ -686,7 +705,7 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
-#define meshtastic_AirQualityMetrics_size        88
+#define meshtastic_AirQualityMetrics_size        106
 #define meshtastic_DeviceMetrics_size            27
 #define meshtastic_EnvironmentMetrics_size       113
 #define meshtastic_HealthMetrics_size            11

src/platform/nrf52/AsyncUDP.cpp

@@ -1,5 +1,7 @@
 #include "AsyncUDP.h"
 
+#if HAS_ETHERNET
+
 AsyncUDP::AsyncUDP() : OSThread("AsyncUDP"), localPort(0) {}
 
 bool AsyncUDP::listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl)
@@ -67,3 +69,5 @@ int32_t AsyncUDP::runOnce()
     }
     return 5; // check every 5ms
 }
+
+#endif // HAS_ETHERNET

src/platform/nrf52/AsyncUDP.h

@@ -1,6 +1,10 @@
 #ifndef ASYNC_UDP_H
 #define ASYNC_UDP_H
 
+#include "configuration.h"
+
+#if HAS_ETHERNET
+
 #include "concurrency/OSThread.h"
 #include <IPAddress.h>
 #include <Print.h>
@@ -54,4 +58,6 @@ inline bool isMulticast(const IPAddress &ip)
     return (ip[0] & 0xF0) == 0xE0;
 }
 
+#endif // HAS_ETHERNET
+
 #endif // ASYNC_UDP_H

variants/diy/platformio.ini

@@ -78,22 +78,3 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/seeed-xiao-n
 lib_deps =
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
-
-; NanoVHF T-Energy-S3 + E22(0)-xxxM - DIY
-[env:t-energy-s3_e22]
-extends = esp32s3_base
-board = esp32-s3-devkitc-1
-board_build.partitions = default_16MB.csv
-board_level = extra
-board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
-board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -D ARDUINO_USB_MODE=1
-build_flags =
-  ${esp32s3_base.build_flags}
-  -D EBYTE_ESP32_S3
-  -D BOARD_HAS_PSRAM
-  -D ARDUINO_USB_MODE=0
-  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -I variants/diy/t-energy-s3_e22

variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini

@@ -4,5 +4,5 @@ board = CDEBYTE_EoRa-S3
 build_flags =
   ${esp32s3_base.build_flags}
   -D CDEBYTE_EORA_S3
-  -I variants/CDEBYTE_EoRa-S3
-  -D GPS_POWER_TOGGLE
+  -I variants/esp32s3/CDEBYTE_EoRa-S3
+  -D GPS_POWER_TOGGLE

variants/esp32s3/EBYTE_ESP32-S3/platformio.ini

@@ -6,4 +6,4 @@ board_level = extra
 build_flags =
   ${esp32s3_base.build_flags}
   -D EBYTE_ESP32_S3
-  -I variants/EBYTE_ESP32-S3
+  -I variants/esp32s3/EBYTE_ESP32-S3

variants/esp32s3/ELECROW-ThinkNode-M2/platformio.ini

@@ -4,4 +4,4 @@ board = ESP32-S3-WROOM-1-N4
 build_flags =
   ${esp32s3_base.build_flags}
   -D ELECROW_ThinkNode_M2
-  -I variants/ELECROW-ThinkNode-M2
+  -I variants/esp32s3/ELECROW-ThinkNode-M2

variants/esp32s3/bpi_picow_esp32_s3/platformio.ini

@@ -11,4 +11,6 @@ lib_deps =
   ${esp32_base.lib_deps}
   caveman99/ESP32 Codec2@^1.0.1
 build_flags = 
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/bpi_picow_esp32_s3
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/bpi_picow_esp32_s3

variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini

@@ -11,7 +11,9 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags}
+  -D CROWPANEL_ESP32S3_5_EPAPER
+  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -39,7 +41,9 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags}
+  -D CROWPANEL_ESP32S3_4_EPAPER
+  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -67,7 +71,9 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags}
+  -D CROWPANEL_ESP32S3_2_EPAPER
+  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE

variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini

@@ -8,8 +8,6 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM1
 upload_speed = 921600
-platform_packages =
-  platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
   ${esp32_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
@@ -18,12 +16,13 @@ build_unflags =
   ${esp32s3_base.build_unflags}
   -DARDUINO_USB_MODE=1
 build_flags = 
-  ;${esp32_base.build_flags} -D MY_ESP32S3_DIY -I variants/my_esp32s3_diy_eink
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_eink
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/diy/my_esp32s3_diy_eink
   -Dmy
   -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
   -DEINK_WIDTH=296
   -DEINK_HEIGHT=128
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0

variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini

@@ -8,8 +8,6 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
-platform_packages =
-  platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit NeoPixel @ ^1.12.0
@@ -17,8 +15,9 @@ build_unflags =
   ${esp32s3_base.build_unflags}
   -DARDUINO_USB_MODE=1
 build_flags = 
-  ;${esp32_base.build_flags} -D MY_ESP32S3_DIY -I variants/my_esp32s3_diy_oled
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_oled
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/diy/my_esp32s3_diy_oled
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0

variants/esp32s3/diy/t-energy-s3_e22/platformio.ini

@@ -0,0 +1,18 @@
+; NanoVHF T-Energy-S3 + E22(0)-xxxM - DIY
+[env:t-energy-s3_e22]
+extends = esp32s3_base
+board = esp32-s3-devkitc-1
+board_build.partitions = default_16MB.csv
+board_level = extra
+board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
+board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
+build_unflags =
+  ${esp32s3_base.build_unflags}
+  -D ARDUINO_USB_MODE=1
+build_flags =
+  ${esp32s3_base.build_flags}
+  -D EBYTE_ESP32_S3
+  -D BOARD_HAS_PSRAM
+  -D ARDUINO_USB_MODE=0
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -I variants/esp32s3/diy/t-energy-s3_e22

variants/esp32s3/dreamcatcher/platformio.ini

@@ -8,7 +8,7 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D PRIVATE_HW
   -D OTHERNET_DC_REV=2301
-  -I variants/dreamcatcher
+  -I variants/esp32s3/dreamcatcher
   -D ARDUINO_USB_CDC_ON_BOOT=1
 
 lib_deps = ${esp32s3_base.lib_deps}
@@ -25,5 +25,5 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D PRIVATE_HW
   -D OTHERNET_DC_REV=2206
-  -I variants/dreamcatcher
+  -I variants/esp32s3/dreamcatcher
   -D ARDUINO_USB_CDC_ON_BOOT=1

variants/esp32s3/elecrow_panel/platformio.ini

@@ -5,7 +5,7 @@ board_check = true
 upload_protocol = esptool
 board_build.partitions = default_16MB.csv ; must be here for some reason, board.json is not enough !?
 build_flags = ${esp32s3_base.build_flags} -Os
-  -I variants/elecrow_panel
+  -I variants/esp32s3/elecrow_panel
   -D ELECROW_PANEL
   -D CONFIG_ARDUHAL_LOG_COLORS
   -D RADIOLIB_DEBUG_SPI=0

variants/esp32s3/esp32-s3-pico/platformio.ini

@@ -15,7 +15,7 @@ board_upload.require_upload_port = yes
 build_flags = ${esp32s3_base.build_flags}
   -DESP32_S3_PICO
   ;-DPRIVATE_HW
-  -Ivariants/esp32-s3-pico
+  -Ivariants/esp32s3/esp32-s3-pico
   -DBOARD_HAS_PSRAM
   -DEINK_DISPLAY_MODEL=GxEPD2_290_T94_V2
   -DEINK_WIDTH=296

variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini

@@ -4,7 +4,7 @@ board = heltec_wifi_lora_32_V3
 board_check = true
 board_build.partitions = default_8MB.csv
 build_flags = 
-  ${esp32s3_base.build_flags} -I variants/heltec_capsule_sensor_v3
+  ${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
   -D HELTEC_CAPSULE_SENSOR_V3
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
+  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

variants/esp32s3/heltec_sensor_hub/platformio.ini

@@ -4,7 +4,8 @@ board = heltec_wifi_lora_32_V3
 board_check = true
 
 build_flags = 
-  ${esp32s3_base.build_flags} -I variants/heltec_sensor_hub
+  ${esp32s3_base.build_flags}
+  -I variants/esp32s3/heltec_sensor_hub
   -D HELTEC_SENSOR_HUB
 
 lib_deps = ${esp32s3_base.lib_deps}

variants/esp32s3/heltec_v3/platformio.ini

@@ -4,5 +4,7 @@ board = heltec_wifi_lora_32_V3
 board_check = true
 board_build.partitions = default_8MB.csv
 build_flags = 
-  ${esp32s3_base.build_flags} -D HELTEC_V3 -I variants/heltec_v3
+  ${esp32s3_base.build_flags}
+  -D HELTEC_V3
+  -I variants/esp32s3/heltec_v3
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

variants/esp32s3/heltec_vision_master_e213/platformio.ini

@@ -4,7 +4,7 @@ board = heltec_vision_master_e213
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
-  -Ivariants/heltec_vision_master_e213 
+  -Ivariants/esp32s3/heltec_vision_master_e213 
   -DHELTEC_VISION_MASTER_E213
   -DUSE_EINK
   -DGXEPD2_DRIVER_0=GxEPD2_213_FC1
@@ -31,9 +31,9 @@ build_src_filter =
 build_flags =  
   ${esp32s3_base.build_flags}
   ${inkhud.build_flags}
-  -I variants/heltec_vision_master_e213
+  -I variants/esp32s3/heltec_vision_master_e213
   -D HELTEC_VISION_MASTER_E213
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}
-upload_speed = 921600
+upload_speed = 921600

variants/esp32s3/heltec_vision_master_e290/platformio.ini

@@ -5,7 +5,7 @@ board = heltec_vision_master_e290
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
-  -I variants/heltec_vision_master_e290
+  -I variants/esp32s3/heltec_vision_master_e290
   -D DISPLAY_FLIP_SCREEN ; Orient so the LoRa antenna faces up
   -D HELTEC_VISION_MASTER_E290
   -D BUTTON_CLICK_MS=200
@@ -34,9 +34,9 @@ build_src_filter =
 build_flags = 
   ${esp32s3_base.build_flags}
   ${inkhud.build_flags}
-  -I variants/heltec_vision_master_e290
+  -I variants/esp32s3/heltec_vision_master_e290
   -D HELTEC_VISION_MASTER_E290
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}
-upload_speed = 921600
+upload_speed = 921600

variants/esp32s3/heltec_vision_master_t190/platformio.ini

@@ -4,10 +4,10 @@ board = heltec_vision_master_t190
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
-  -Ivariants/heltec_vision_master_t190
-  -DHELTEC_VISION_MASTER_T190
+  -I variants/esp32s3/heltec_vision_master_t190
+  -D HELTEC_VISION_MASTER_T190
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
   https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip
-upload_speed = 921600
+upload_speed = 921600

variants/esp32s3/heltec_wireless_paper/platformio.ini

@@ -5,7 +5,7 @@ board = heltec_wifi_lora_32_V3
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
-  -I variants/heltec_wireless_paper
+  -I variants/esp32s3/heltec_wireless_paper
   -D HELTEC_WIRELESS_PAPER 
   -D GXEPD2_DRIVER_0=GxEPD2_213_FC1
   -D GXEPD2_DRIVER_1=GxEPD2_213_E0213A367
@@ -32,9 +32,9 @@ build_src_filter =
 build_flags =
   ${esp32s3_base.build_flags}
   ${inkhud.build_flags}
-  -I variants/heltec_wireless_paper
+  -I variants/esp32s3/heltec_wireless_paper
   -D HELTEC_WIRELESS_PAPER
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}
-upload_speed = 921600
+upload_speed = 921600

variants/esp32s3/heltec_wireless_paper_v1/platformio.ini

@@ -5,7 +5,7 @@ board = heltec_wifi_lora_32_V3
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
-  -I variants/heltec_wireless_paper_v1 
+  -I variants/esp32s3/heltec_wireless_paper_v1 
   -D HELTEC_WIRELESS_PAPER_V1_0
   -D EINK_DISPLAY_MODEL=GxEPD2_213_BN
   -D EINK_WIDTH=250
@@ -17,4 +17,4 @@ lib_deps =
   ${esp32s3_base.lib_deps}
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
   lewisxhe/PCF8563_Library@^1.0.1
-upload_speed = 115200
+upload_speed = 115200

variants/esp32s3/heltec_wireless_tracker/platformio.ini

@@ -5,7 +5,8 @@ board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = 
-  ${esp32s3_base.build_flags} -I variants/heltec_wireless_tracker
+  ${esp32s3_base.build_flags}
+  -I variants/esp32s3/heltec_wireless_tracker
   -D HELTEC_TRACKER_V1_1
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini

@@ -5,7 +5,8 @@ board = heltec_wireless_tracker
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -I variants/heltec_wireless_tracker_V1_0
+  ${esp32s3_base.build_flags}
+  -I variants/esp32s3/heltec_wireless_tracker_V1_0
   -D HELTEC_TRACKER_V1_0
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

variants/esp32s3/heltec_wsl_v3/platformio.ini

@@ -4,5 +4,7 @@ board = heltec_wifi_lora_32_V3
 board_build.partitions = default_8MB.csv
 # Temporary until espressif creates a release with this new target
 build_flags = 
-  ${esp32s3_base.build_flags} -D HELTEC_WSL_V3 -I variants/heltec_wsl_v3
+  ${esp32s3_base.build_flags}
+  -D HELTEC_WSL_V3
+  -I variants/esp32s3/heltec_wsl_v3
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

variants/esp32s3/icarus/platformio.ini

@@ -14,6 +14,8 @@ build_unflags =
   ${esp32s3_base.build_unflags}
   -DARDUINO_USB_MODE=1
 build_flags = 
-  ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/icarus
-  -DBOARD_HAS_PSRAM 
+  ${esp32s3_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/icarus
+  -DBOARD_HAS_PSRAM
   -DARDUINO_USB_MODE=0

variants/esp32s3/link32_s3_v1/platformio.ini

@@ -2,7 +2,9 @@
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
 build_flags = 
-  ${esp32_base.build_flags} -D LINK_32 -I variants/link32_s3_v1
+  ${esp32_base.build_flags}
+  -D LINK_32
+  -I variants/esp32s3/link32_s3_v1
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DARDUINO_USB_CDC_ON_BOOT
   -DARDUINO_USB_MODE=1

variants/esp32s3/m5stack_cores3/platformio.ini

@@ -5,11 +5,9 @@ board = m5stack-cores3
 board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool
-
-build_flags = ${esp32_base.build_flags} 
-  -DPRIVATE_HW
-  -DM5STACK_CORES3
-  -Ivariants/m5stack_cores3
-
-lib_deps =
-   ${esp32_base.lib_deps}
+build_flags = 
+  ${esp32_base.build_flags} 
+  -D PRIVATE_HW
+  -D M5STACK_CORES3
+  -I variants/esp32s3/m5stack_cores3
+lib_deps = ${esp32_base.lib_deps}

variants/esp32s3/nibble_esp32/platformio.ini

@@ -3,4 +3,6 @@ extends = esp32s3_base
 board = esp32-s3-zero
 board_level = extra
 build_flags = 
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/nibble_esp32
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/nibble_esp32

variants/esp32s3/nugget_s3_lora/platformio.ini

@@ -3,4 +3,4 @@ extends = esp32s3_base
 board = lolin_s3_mini
 board_level = extra
 build_flags =
-  ${esp32s3_base.build_flags} -D ARDUINO_USB_CDC_ON_BOOT=1 -D PRIVATE_HW -I variants/nugget_s3_lora
+  ${esp32s3_base.build_flags} -D ARDUINO_USB_CDC_ON_BOOT=1 -D PRIVATE_HW -I variants/esp32s3/nugget_s3_lora

variants/esp32s3/picomputer-s3/platformio.ini

@@ -11,7 +11,7 @@ upload_protocol = esptool
 build_flags = 
   ${esp32s3_base.build_flags}
   -DPICOMPUTER_S3
-  -I variants/picomputer-s3
+  -I variants/esp32s3/picomputer-s3
 
 lib_deps = 
   ${esp32s3_base.lib_deps}

variants/esp32s3/rak3312/platformio.ini

@@ -5,4 +5,6 @@ board_check = true
 upload_protocol = esptool
 
 build_flags = 
-  ${esp32_base.build_flags} -D RAK3312 -I variants/rak3312
+  ${esp32_base.build_flags}
+  -D RAK3312
+  -I variants/esp32s3/rak3312

variants/esp32s3/seeed-sensecap-indicator/platformio.ini

@@ -10,7 +10,7 @@ board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags}
-  -Ivariants/seeed-sensecap-indicator
+  -Ivariants/esp32s3/seeed-sensecap-indicator
   -DSENSECAP_INDICATOR
   -DCONFIG_ARDUHAL_LOG_COLORS
   -DRADIOLIB_DEBUG_SPI=0

variants/esp32s3/seeed_xiao_s3/platformio.ini

@@ -11,7 +11,8 @@ build_unflags =
   ${esp32s3_base.build_unflags}
   -DARDUINO_USB_MODE=1
 build_flags = 
-  ${esp32s3_base.build_flags} -DSEEED_XIAO_S3 -I variants/seeed_xiao_s3
+  ${esp32s3_base.build_flags}
+  -D SEEED_XIAO_S3
+  -I variants/esp32s3/seeed_xiao_s3
   -DBOARD_HAS_PSRAM 
-
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0