Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-09-14 15:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(companion): stop the FIRMWARE_VERSION fallback claiming a fixed version

Browse Source 
Same staleness bug as the build-date fallback: bypassing build.sh (a
direct `pio run`, an IDE Build button, the sim) fell back to a hardcoded
"v1.27-dev" literal that would silently keep claiming to BE v1.27 forever,
even once development has moved well past it. build.sh/CI's real
git-tag-derived FIRMWARE_VERSION is untouched -- only the bypass fallback
changes, to a version-agnostic "dev-<build date>".

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-09-08 23:48:27 +02:00
co-authored by Claude Sonnet 5
parent 6426ef9319
commit de2fceca7c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/MyMesh.h
+12 -3
View File
@@ -11,16 +11,25 @@ class UITask;
/*------------ Frame Protocol --------------*/ /*------------ Frame Protocol --------------*/
#define FIRMWARE_VER_CODE 13 #define FIRMWARE_VER_CODE 13
// Fallback only -- every real build (local or CI) goes through build.sh, which
// always injects its own FIRMWARE_BUILD_DATE (today's date at build time).
// __DATE__ is the compiler's own "Mmm dd yyyy" build-date macro, so a
// `pio run` invoked directly (bypassing build.sh -- e.g. an IDE's Build
// button) still shows the date it was actually compiled, instead of a
// hardcoded string that would otherwise go stale and never change again.
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "19 Aug 2026" #define FIRMWARE_BUILD_DATE __DATE__
#endif #endif
// Fallback only -- every real build (local or CI) goes through build.sh, which // Fallback only -- every real build (local or CI) goes through build.sh, which
// always injects FIRMWARE_VERSION itself (the pushed tag name for a release, // always injects FIRMWARE_VERSION itself (the pushed tag name for a release,
// "dev-<commit>" otherwise; see build-solo-firmwares.yml). This default only // "dev-<commit>" otherwise; see build-solo-firmwares.yml). This default only
// shows up for a `pio run` invoked directly, bypassing build.sh entirely. // shows up for a `pio run` invoked directly, bypassing build.sh entirely --
// a plain "dev build" stamped with its compile date instead of a specific
// version number that would otherwise be hardcoded here and go stale (and
// misleadingly claim to BE that version) the moment development moves on.
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.27-dev" #define FIRMWARE_VERSION "dev-" __DATE__
#endif #endif
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM) #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)