Merge upstream/dev into develop

variants/heltec_wireless_paper/platformio.ini

@@ -64,6 +64,25 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   bakercp/CRC32 @ ^2.0.0
 
+[env:Heltec_Wireless_Paper_companion_radio_usb]
+extends = Heltec_Wireless_Paper_base
+build_flags =
+  ${Heltec_Wireless_Paper_base.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D DISPLAY_CLASS=E213Display
+  -D OFFLINE_QUEUE_SIZE=256
+build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter}
+  +<helpers/ui/E213Display.cpp>
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps =
+  ${Heltec_Wireless_Paper_base.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+  bakercp/CRC32 @ ^2.0.0
+
 [env:Heltec_Wireless_Paper_repeater]
 extends = Heltec_Wireless_Paper_base
 build_flags =

variants/lilygo_tlora_c6/platformio.ini

@@ -46,7 +46,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${tlora_c6.lib_deps}
-;  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:LilyGo_Tlora_C6_room_server_]
 extends = tlora_c6
@@ -63,7 +63,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${tlora_c6.lib_deps}
-;  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:LilyGo_Tlora_C6_companion_radio_ble_]
 extends = tlora_c6

variants/xiao_c3/platformio.ini

@@ -3,9 +3,6 @@ extends = esp32_base
 board = seeed_xiao_esp32c3
 build_flags =
   ${esp32_base.build_flags}
-  ${sensor_base.build_flags}
-  -UENV_INCLUDE_GPS
-  -UENV_INCLUDE_VL53L0X
   -I variants/xiao_c3
   -D ESP32_CPU_FREQ=80
   -D PIN_VBAT_READ=D0
@@ -29,7 +26,6 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/sensors>
 lib_deps =
   ${esp32_base.lib_deps}
-  ${sensor_base.lib_deps}
 
 [env:Xiao_C3_repeater]
 extends = Xiao_esp32_C3
@@ -37,6 +33,9 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
+  ${sensor_base.build_flags}
+  -UENV_INCLUDE_GPS
+  -UENV_INCLUDE_VL53L0X
   -D ADVERT_NAME='"Xiao C3 Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -46,6 +45,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${Xiao_esp32_C3.lib_deps}
+  ${sensor_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
 
@@ -55,6 +55,9 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<../examples/simple_room_server/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
+  ${sensor_base.build_flags}
+  -UENV_INCLUDE_GPS
+  -UENV_INCLUDE_VL53L0X
   -D ADVERT_NAME='"Xiao C3 Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -64,6 +67,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${Xiao_esp32_C3.lib_deps}
+  ${sensor_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
 

variants/xiao_c6/platformio.ini

@@ -46,7 +46,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${Xiao_C6.lib_deps}
-;  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:Xiao_C6_companion_radio_ble_]
 extends = Xiao_C6
@@ -163,7 +163,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${WHY2025_badge.lib_deps}
-;  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
 
 [env:WHY2025_badge_companion_radio_ble_]
 extends = WHY2025_badge