Repository navigation
fix(companion): fix the 8 boards that failed the companion release build - #21
Merged
Merged
Conversation
PlatformIO's library finder ignores the #if around the include, and the current RP2040 framework ships a library (iLabs Hearth) with its own Preferences.h, which then got built for the PicoW companions and failed. Use the IDF NVS API, the same storage Preferences wraps.
The Heltec mesh solar's meshsolar library defines NONE, which broke InterfaceType::NONE in Heltec_mesh_solar_companion_radio_ble. Push the macro out for the length of MultiSerialInterface.h.
…panions The boards have 16 MB flash but no partition table, so they got the 4 MB default with 1.25 MB app slots: the companion builds overflowed (BLE ones already, Wi-Fi ones with SNMP and OTA). Their companion envs now use default_16MB.csv (6.25 MB app slots). Moving a device to it needs the full -merged.bin flash once.
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.
Fixes the 8 boards that failed in the first companion release run (run 38939032112,
firmware=companion,channel=dev).PicoW_companion_radio_wifi,PicoW_companion_radio_bleMeshcomodImport.cpp(#18) includes<Preferences.h>behind#if ESP32, but PlatformIO's library finder ignores the#if. The current RP2040 framework (arduinopico 1.60100) shipsiLabs Hearth, which has its ownPreferences.h, so it got built and hit its#error.nvs.h), the same storagePreferenceswraps.Heltec_mesh_solar_companion_radio_blemeshsolarlibrary#definesNONE, breakingInterfaceType::NONEinMultiSerialInterface.h(an upstream clash).#pragma push_macro/pop_macro("NONE")around the header.Station_G2_companion_radio_{ble,wifi},Station_G3_ESP32_companion_radio_{ble,wifi},LilyGo_TBeam_1W_companion_radio_wifiboard_build.partitions = default_16MB.csvon those companion envs (6.25 MB app slots, OTA kept).Note: moving an existing Station G2/G3 or T-Beam 1W companion to this build changes the partition table, so it needs the full
-merged.binflash once, which resets stored data (identity, contacts). After that, OTA works normally (partSigmatches).Verification
Heltec_mesh_solar_companion_radio_ble,Heltec_v3_companion_radio_wifi,PicoW_companion_radio_wifi, and the five 16 MB envs viabuild.sh(20-21% flash,.partsig= 16 MB table).companion,dev) after merge.🤖 Generated with Claude Code