Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-27 15:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): show MeshCore version large and plus version in splash bar

Browse Source 
Add MESHCORE_VERSION build flag ("1.15") to companion base configs.
Splash screen now shows MESHCORE_VERSION in the large text and the
plus firmware version (stripped of commit hash) in the Plus bar,
e.g. "1.15" large + "Plus v1.11 for Wio" below.

Change CI tag pattern to v* and simplify version extraction so tag
v1.11 maps directly to FIRMWARE_VERSION=v1.11.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-24 00:35:07 +02:00
parent 62cae314f7
commit 34fcab6bd5
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
examples/companion_radio/ui-new/UITask.cpp
View File

@@ -40,26 +40,17 @@ class SplashScreen : public UIScreen {
public:
SplashScreen(UITask* task) : _task(task) {
// strip off dash and commit hash: v1.2.3-abcdef -> v1.2.3
// MeshCore upstream version shown large (e.g. "1.15")
strncpy(_version_info, MESHCORE_VERSION, sizeof(_version_info) - 1);
_version_info[sizeof(_version_info) - 1] = '\0';
// Plus firmware version: strip commit hash suffix (v1.11-abcdef -> v1.11)
const char *ver = FIRMWARE_VERSION;
const char *dash = strchr(ver, '-');
int len = dash ? dash - ver : strlen(ver);
if (len >= sizeof(_version_info)) len = sizeof(_version_info) - 1;
memcpy(_version_info, ver, len);
_version_info[len] = 0;
// extract plus version: v1.15-plus.1.4-SHA -> "1.4"
_plus_ver[0] = '\0';
const char *plus = strstr(ver, "plus.");
if (plus) {
plus += 5; // skip "plus."
const char *end = strchr(plus, '-');
int plen = end ? end - plus : strlen(plus);
if (plen >= (int)sizeof(_plus_ver)) plen = sizeof(_plus_ver) - 1;
memcpy(_plus_ver, plus, plen);
_plus_ver[plen] = '\0';
}
int plen = dash ? (int)(dash - ver) : (int)strlen(ver);
if (plen >= (int)sizeof(_plus_ver)) plen = sizeof(_plus_ver) - 1;
memcpy(_plus_ver, ver, plen);
_plus_ver[plen] = '\0';
dismiss_after = millis() + BOOT_SCREEN_MILLIS;
}