Split companion radio Internet OTA into separate opt-in _cloud_ota envs

build_firmware.sh

@@ -75,15 +75,15 @@ declare -a BUILD_DEFS=(
     "repeater|heltec_v4||heltec_v4_repeater_cloud_ota"
     "repeater|heltec_v3||Heltec_v3_repeater_cloud_ota"
     "repeater|xiao_s3_wio||Xiao_S3_WIO_repeater_cloud_ota"
-    "companion|heltec_v4|usb|heltec_v4_companion_radio_usb"
-    "companion|heltec_v4|ble|heltec_v4_companion_radio_ble"
-    "companion|heltec_v4|wifi|heltec_v4_companion_radio_wifi"
-    "companion|heltec_v3|usb|Heltec_v3_companion_radio_usb"
-    "companion|heltec_v3|ble|Heltec_v3_companion_radio_ble"
-    "companion|heltec_v3|wifi|Heltec_v3_companion_radio_wifi"
-    "companion|xiao_s3_wio|usb|Xiao_S3_WIO_companion_radio_usb"
-    "companion|xiao_s3_wio|ble|Xiao_S3_WIO_companion_radio_ble"
-    "companion|xiao_s3_wio|wifi|Xiao_S3_WIO_companion_radio_wifi"
+    "companion|heltec_v4|usb|heltec_v4_companion_radio_usb_cloud_ota"
+    "companion|heltec_v4|ble|heltec_v4_companion_radio_ble_cloud_ota"
+    "companion|heltec_v4|wifi|heltec_v4_companion_radio_wifi_cloud_ota"
+    "companion|heltec_v3|usb|Heltec_v3_companion_radio_usb_cloud_ota"
+    "companion|heltec_v3|ble|Heltec_v3_companion_radio_ble_cloud_ota"
+    "companion|heltec_v3|wifi|Heltec_v3_companion_radio_wifi_cloud_ota"
+    "companion|xiao_s3_wio|usb|Xiao_S3_WIO_companion_radio_usb_cloud_ota"
+    "companion|xiao_s3_wio|ble|Xiao_S3_WIO_companion_radio_ble_cloud_ota"
+    "companion|xiao_s3_wio|wifi|Xiao_S3_WIO_companion_radio_wifi_cloud_ota"
 )
 
 # ─── Argument parsing ─────────────────────────────────────────────────────────

poli_version.txt

@@ -1 +1 @@
-v1.16.0.2
+v1.16.0.4

variants/heltec_v3/platformio.ini

@@ -168,14 +168,10 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"usb"'
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
@@ -187,18 +183,24 @@ lib_deps =
   ${Heltec_lora32_v3.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (USB) with internet OTA support — opt-in variant, see esp32_internet_ota.
+[env:Heltec_v3_companion_radio_usb_cloud_ota]
+extends = env:Heltec_v3_companion_radio_usb
+build_flags =
+  ${env:Heltec_v3_companion_radio_usb.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"usb"'
+
 [env:Heltec_v3_companion_radio_ble]
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"ble"'
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D AUTO_SHUTDOWN_MILLIVOLTS=3400
   -D BLE_DEBUG_LOGGING=1
@@ -215,21 +217,27 @@ lib_deps =
   ${Heltec_lora32_v3.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (BLE) with internet OTA support — opt-in variant, see esp32_internet_ota.
+[env:Heltec_v3_companion_radio_ble_cloud_ota]
+extends = env:Heltec_v3_companion_radio_ble
+build_flags =
+  ${env:Heltec_v3_companion_radio_ble.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"ble"'
+
 [env:Heltec_v3_companion_radio_wifi]
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"wifi"'
   -D OFFLINE_QUEUE_SIZE=256
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
@@ -243,6 +251,18 @@ lib_deps =
   ${Heltec_lora32_v3.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (WiFi) with internet OTA support — opt-in variant. Reuses the
+; existing WIFI_SSID/WIFI_PWD link for the OTA check (see companion_radio/main.cpp)
+; instead of a second WiFiConnect, which would disconnect the always-on app TCP bridge.
+[env:Heltec_v3_companion_radio_wifi_cloud_ota]
+extends = env:Heltec_v3_companion_radio_wifi
+build_flags =
+  ${env:Heltec_v3_companion_radio_wifi.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"wifi"'
+
 [env:Heltec_v3_sensor]
 extends = Heltec_lora32_v3
 build_flags =

variants/heltec_v4/platformio.ini

@@ -211,14 +211,10 @@ lib_deps =
 extends = heltec_v4_oled
 build_flags =
   ${heltec_v4_oled.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"usb"'
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${heltec_v4_oled.build_src_filter}
@@ -230,18 +226,24 @@ lib_deps =
   ${heltec_v4_oled.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (USB) with internet OTA support — opt-in variant, see esp32_internet_ota.
+[env:heltec_v4_companion_radio_usb_cloud_ota]
+extends = env:heltec_v4_companion_radio_usb
+build_flags =
+  ${env:heltec_v4_companion_radio_usb.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"usb"'
+
 [env:heltec_v4_companion_radio_ble]
 extends = heltec_v4_oled
 build_flags =
   ${heltec_v4_oled.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"ble"'
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D AUTO_SHUTDOWN_MILLIVOLTS=3400
   -D BLE_DEBUG_LOGGING=1
@@ -258,12 +260,20 @@ lib_deps =
   ${heltec_v4_oled.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (BLE) with internet OTA support — opt-in variant, see esp32_internet_ota.
+[env:heltec_v4_companion_radio_ble_cloud_ota]
+extends = env:heltec_v4_companion_radio_ble
+build_flags =
+  ${env:heltec_v4_companion_radio_ble.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"ble"'
+
 [env:heltec_v4_companion_radio_wifi]
 extends = heltec_v4_oled
 build_flags =
   ${heltec_v4_oled.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -272,8 +282,6 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"wifi"'
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${heltec_v4_oled.build_src_filter}
@@ -286,6 +294,18 @@ lib_deps =
   ${heltec_v4_oled.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (WiFi) with internet OTA support — opt-in variant. Reuses the
+; existing WIFI_SSID/WIFI_PWD link for the OTA check (see companion_radio/main.cpp)
+; instead of a second WiFiConnect, which would disconnect the always-on app TCP bridge.
+[env:heltec_v4_companion_radio_wifi_cloud_ota]
+extends = env:heltec_v4_companion_radio_wifi
+build_flags =
+  ${env:heltec_v4_companion_radio_wifi.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"wifi"'
+
 [env:heltec_v4_sensor]
 extends = heltec_v4_oled
 build_flags =

variants/xiao_s3_wio/platformio.ini

@@ -156,15 +156,11 @@ lib_deps =
 extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D OFFLINE_QUEUE_SIZE=256
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"usb"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Xiao_S3_WIO.build_src_filter}
@@ -178,20 +174,26 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
+; Companion (USB) with internet OTA support — opt-in variant, see esp32_internet_ota.
+[env:Xiao_S3_WIO_companion_radio_usb_cloud_ota]
+extends = env:Xiao_S3_WIO_companion_radio_usb
+build_flags =
+  ${env:Xiao_S3_WIO_companion_radio_usb.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"usb"'
+
 [env:Xiao_S3_WIO_companion_radio_ble]
 extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D DISPLAY_CLASS=SSD1306Display
   -D OFFLINE_QUEUE_SIZE=256
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"ble"'
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -206,6 +208,16 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
+; Companion (BLE) with internet OTA support — opt-in variant, see esp32_internet_ota.
+[env:Xiao_S3_WIO_companion_radio_ble_cloud_ota]
+extends = env:Xiao_S3_WIO_companion_radio_ble
+build_flags =
+  ${env:Xiao_S3_WIO_companion_radio_ble.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"ble"'
+
 [env:Xiao_S3_WIO_companion_radio_serial]
 extends = Xiao_S3_WIO
 build_flags =
@@ -238,24 +250,32 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  ${esp32_internet_ota.build_flags}
-  ${poli_build.build_flags}
   -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"password"'
-  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
-  -D OTA_VARIANT='"wifi"'
   ; -D BLE_DEBUG_LOGGING=1
   ; -D MESH_PACKET_LOGGING=1
   ; -D MESH_DEBUG=1
 lib_deps =
   ${Xiao_S3_WIO.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+; Companion (WiFi) with internet OTA support — opt-in variant. Reuses the
+; existing WIFI_SSID/WIFI_PWD link for the OTA check (see companion_radio/main.cpp)
+; instead of a second WiFiConnect, which would disconnect the always-on app TCP bridge.
+[env:Xiao_S3_WIO_companion_radio_wifi_cloud_ota]
+extends = env:Xiao_S3_WIO_companion_radio_wifi
+build_flags =
+  ${env:Xiao_S3_WIO_companion_radio_wifi.build_flags}
+  ${esp32_internet_ota.build_flags}
+  ${poli_build.build_flags}
+  -D OTA_BASE_URL='"https://meshcore.epila.pl/firmware/companion"'
+  -D OTA_VARIANT='"wifi"'
+
 [env:Xiao_S3_WIO_sensor]
 extends = Xiao_S3_WIO
 build_src_filter = ${Xiao_S3_WIO.build_src_filter}