mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-09-18 17:16:37 +00:00
loadPrefsInt()'s "sentinel mismatch" block had accumulated ~62 lines of one-shot backfills tied to specific old NodePrefs::SCHEMA_SENTINEL values (favourites/map home-page bits, split bot-command toggles, trail_units_idx, bot_trigger_ch seed, scope mask/index zeroing). Reduce it to just the sentinel read + mismatch log line -- an upgrade from a version old enough to hit any of these now lands on today's plain defaults for that field instead of a silently-seeded value, same outcome a fresh device already gets. The ongoing per-field range clamps (defensive against any corrupt or out-of-range byte, not version-specific) are untouched. Same treatment for DataStore::loadScopeList()'s one-time synthesis of a scope-list entry from the old single default_scope_name/key field: removed, along with the scope_migrated_legacy plumbing in MyMesh::begin() that only ran once that migration had just fired. loadScopeList() drops its now- unused NodePrefs parameter and bool return. Also trimmed ~25 per-field comments that over-specified which exact old sentinel produced which stray byte, down to what the clamp actually defends against -- except where the hex value explained a genuinely non-obvious byte-aliasing interaction, which stays. One comment (scope mask/index) was flagged and rewritten because it described the very zeroing logic this change removes. Drive-by: two comments still said Settings > Sound > "Msg wake" -- it's been under Settings > Display for a while, per the enum's section grouping in SettingsScreen.h. Verified: sim_companion_radio and WioTrackerL1_companion_solo_dual build clean, RAM/Flash usage unchanged (pure logic removal, no schema/layout change). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>