Split companion radio Internet OTA into separate opt-in _cloud_ota envs#7
Merged
Conversation
The 9 base companion_radio envs (heltec_v4/Heltec_v3/Xiao_S3_WIO × usb/ble/wifi) had Internet OTA support baked in directly, which created permanent drift from upstream MeshCore. Move the OTA-related build flags (esp32_internet_ota.build_flags, poli_build.build_flags, OTA_BASE_URL, OTA_VARIANT) into new derived *_cloud_ota envs that extend the base envs, restoring the base envs to be byte-identical to their upstream originals. This mirrors the existing heltec_v4_repeater / heltec_v4_repeater_cloud_ota convention. build_firmware.sh now builds the *_cloud_ota variants.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
*_companion_radio_{usb,ble,wifi}envs (heltec_v4 / Heltec_v3 / Xiao_S3_WIO) into new derived*_cloud_otaenvs thatextendsthe base envsdiffagainst the commit prior to PR Add Internet OTA support for companion radio (usb/ble/wifi) #6) — this keeps the project mergeable with upstreammeshcore-dev/MeshCorewith zero unintended driftheltec_v4_repeater/heltec_v4_repeater_cloud_otaconvention:${esp32_internet_ota.build_flags},${poli_build.build_flags},OTA_BASE_URL,OTA_VARIANTnow live only in the_cloud_otaenvsbuild_firmware.shto build the_cloud_otavariants for companion radioTest plan
*_companion_radio_{usb,ble,wifi}_cloud_otaenvs build successfully (pio run)diffthat all 9 base companion envs are byte-identical to the pre-OTA-feature originals (commitc035d2f1^1)_cloud_otaenvs across all three board families to confirm no regressions🤖 Generated with Claude Code