added explicit dependency on paulstoffregen/Time to resolve potential pio compile issues

variants/heltec_v3/platformio.ini

@@ -146,6 +146,8 @@ lib_deps =
           bblanchon/ArduinoJson
           arduino-libraries/NTPClient
           JChristensen/Timezone
+          ; Time library required by Timezone library (explicit dependency for compatibility)
+          paulstoffregen/Time
 
 [env:Heltec_v3_room_server]
 extends = Heltec_lora32_v3

variants/heltec_v4/platformio.ini

@@ -89,12 +89,12 @@ lib_deps =
   ${Heltec_lora32_v4.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:heltec_v4_repeater_observer_mqtt]
+[env:heltec_v4_repeater_bridge_mqtt]
 extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"MQTT Observer"'
+  -D ADVERT_NAME='"MQTT Bridge"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -121,42 +121,13 @@ build_src_filter = ${Heltec_lora32_v4.build_src_filter}
 lib_deps =
   ${Heltec_lora32_v4.lib_deps}
   ${esp32_ota.lib_deps}
+  ; PsychicMqttClient - unified MQTT client with WebSocket support
   elims/PsychicMqttClient@^0.2.4
+  ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching
   bblanchon/ArduinoJson
   arduino-libraries/NTPClient
   JChristensen/Timezone
-  paulstoffregen/Time
-
-[env:heltec_v4_room_server_observer_mqtt]
-extends = Heltec_lora32_v4
-build_flags =
-  ${Heltec_lora32_v4.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"Heltec Room Observer"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-  -D WITH_MQTT_BRIDGE=1
-  -D MAX_MQTT_BROKERS=3
-  -D MQTT_MAX_PACKET_SIZE=1024
-;  -D MQTT_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-  -D CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
-build_src_filter = ${Heltec_lora32_v4.build_src_filter}
-  +<helpers/bridges/MQTTBridge.cpp>
-  +<helpers/MQTTMessageBuilder.cpp>
-  +<helpers/JWTHelper.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/simple_room_server>
-lib_deps =
-  ${Heltec_lora32_v4.lib_deps}
-  ${esp32_ota.lib_deps}
-  elims/PsychicMqttClient@^0.2.4
-  bblanchon/ArduinoJson
-  arduino-libraries/NTPClient
-  JChristensen/Timezone
+  ; Time library required by Timezone library (explicit dependency for compatibility)
   paulstoffregen/Time
 
 [env:heltec_v4_room_server]

variants/station_g2/platformio.ini

@@ -281,3 +281,5 @@ lib_deps =
   bblanchon/ArduinoJson
   arduino-libraries/NTPClient
   JChristensen/Timezone
+  ; Time library required by Timezone library (explicit dependency for compatibility)
+  paulstoffregen/Time

variants/xiao_s3_wio/platformio.ini

@@ -4,9 +4,7 @@ board = seeed_xiao_esp32s3
 board_check = true
 board_build.mcu = esp32s3
 build_flags = ${esp32_base.build_flags}
-  ${sensor_base.build_flags}
   -I variants/xiao_s3_wio
-  -UENV_INCLUDE_GPS
   -D SEEED_XIAO_S3
   -D P_LORA_DIO_1=39
   -D P_LORA_NSS=41
@@ -17,8 +15,6 @@ build_flags = ${esp32_base.build_flags}
   -D P_LORA_MOSI=9
   -D PIN_USER_BTN=21
   -D PIN_STATUS_LED=48
-  -D PIN_BOARD_SDA=D4
-  -D PIN_BOARD_SCL=D5
   -D SX126X_RXEN=38
   -D SX126X_TXEN=RADIOLIB_NC
   -D SX126X_DIO2_AS_RF_SWITCH=true
@@ -30,10 +26,6 @@ build_flags = ${esp32_base.build_flags}
   -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/xiao_s3_wio>
-  +<helpers/sensors>
-lib_deps =
-  ${esp32_base.lib_deps}
-  ${sensor_base.lib_deps}
 
 [env:Xiao_S3_WIO_repeater]
 extends = Xiao_S3_WIO
@@ -65,9 +57,8 @@ lib_deps =
 ;   -D ADMIN_PASSWORD='"password"'
 ;   -D MAX_NEIGHBOURS=50
 ;   -D WITH_RS232_BRIDGE=Serial2
-; RS232 bridge Pins have been relocated from 5,6 which is the i2c bus on xiao_s3
-;   -D WITH_RS232_BRIDGE_RX=3
-;   -D WITH_RS232_BRIDGE_TX=4
+;   -D WITH_RS232_BRIDGE_RX=5
+;   -D WITH_RS232_BRIDGE_TX=6
 ;  -D BRIDGE_DEBUG=1
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
@@ -95,11 +86,11 @@ lib_deps =
   ${Xiao_S3_WIO.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:Xiao_S3_WIO_repeater_observer_mqtt]
+[env:Xiao_S3_WIO_repeater_bridge_mqtt]
 extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  -D ADVERT_NAME='"MQTT Observer"'
+  -D ADVERT_NAME='"MQTT Bridge"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -118,6 +109,7 @@ build_flags =
 #  -D MQTT_USERNAME='"your-username"'
 #  -D MQTT_PASSWORD='"your-password"'
 
+; Use ESP32's built-in certificate bundle
 build_src_filter = ${Xiao_S3_WIO.build_src_filter}
   +<helpers/bridges/MQTTBridge.cpp>
   +<helpers/MQTTMessageBuilder.cpp>
@@ -126,40 +118,13 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 lib_deps =
   ${Xiao_S3_WIO.lib_deps}
   ${esp32_ota.lib_deps}
+  ; PsychicMqttClient - unified MQTT client with WebSocket support
   elims/PsychicMqttClient@^0.2.4
+  ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching
   bblanchon/ArduinoJson
   arduino-libraries/NTPClient
   JChristensen/Timezone
-  paulstoffregen/Time
-
-[env:Xiao_S3_WIO_room_server_observer_mqtt]
-extends = Xiao_S3_WIO
-build_flags =
-  ${Xiao_S3_WIO.build_flags}
-  -D ADVERT_NAME='"XiaoS3 Room Observer"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-  -D WITH_MQTT_BRIDGE=1
-  -D MAX_MQTT_BROKERS=3
-  -D MQTT_MAX_PACKET_SIZE=1024
-;  -D MQTT_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-  -D CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
-build_src_filter = ${Xiao_S3_WIO.build_src_filter}
-  +<helpers/bridges/MQTTBridge.cpp>
-  +<helpers/MQTTMessageBuilder.cpp>
-  +<helpers/JWTHelper.cpp>
-  +<../examples/simple_room_server>
-lib_deps =
-  ${Xiao_S3_WIO.lib_deps}
-  ${esp32_ota.lib_deps}
-  elims/PsychicMqttClient@^0.2.4
-  bblanchon/ArduinoJson
-  arduino-libraries/NTPClient
-  JChristensen/Timezone
+  ; Time library required by Timezone library (explicit dependency for compatibility)
   paulstoffregen/Time
 
 [env:Xiao_S3_WIO_room_server]
@@ -261,19 +226,3 @@ lib_deps =
   ${Xiao_S3_WIO.lib_deps}
   densaugeo/base64 @ ~1.4.0
   adafruit/Adafruit SSD1306 @ ^2.5.13
-
-[env:Xiao_S3_WIO_sensor]
-extends = Xiao_S3_WIO
-build_src_filter = ${Xiao_S3_WIO.build_src_filter}
-  +<../examples/simple_sensor>
-build_flags =
-  ${Xiao_S3_WIO.build_flags}
-  -D ADVERT_NAME='"XiaoS3 sensor"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-lib_deps =
-  ${Xiao_S3_WIO.lib_deps}
-  ${esp32_ota.lib_deps}