From 5933ff31781ca508f720e83b0664868d049623cd Mon Sep 17 00:00:00 2001 From: Jakub <106778416+MarekZegare4@users.noreply.github.com> Date: Sat, 29 Aug 2026 19:23:08 +0200 Subject: [PATCH] fix(version): splash screen showed 1.17, not the actual 1.17.1 upstream base release-notes.md's v1.25 section already documents "Updated upstream base to companion-v1.17.1", and that merge (68527e7b) is confirmed in main's history -- but every MESHCORE_VERSION string, including UITask.cpp's fallback default for boards that don't set it explicitly (Heltec v3/v4, ThinkNode, Mesh Pocket, T-Echo), was still hardcoded to the pre-bump "1.17". Bumped every occurrence to "1.17.1" to match what actually shipped. Co-Authored-By: Claude Sonnet 5 --- examples/companion_radio/ui-new/UITask.cpp | 2 +- solo/gat562_30s_mesh_kit/platformio.ini | 2 +- solo/gat562_mesh_watch13/platformio.ini | 2 +- solo/lilygo_techo_lite/platformio.ini | 2 +- solo/m5stack_cardputer_adv/platformio.ini | 2 +- variants/lilygo_techo_lite/platformio.ini | 2 +- variants/wio-tracker-l1-eink/platformio.ini | 2 +- variants/wio-tracker-l1/platformio.ini | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp index 38e01f02..71e98c2c 100644 --- a/examples/companion_radio/ui-new/UITask.cpp +++ b/examples/companion_radio/ui-new/UITask.cpp @@ -18,7 +18,7 @@ // outright rather than fall back, which quietly made every ui-new env on those // boards unbuildable (heltec v3/v4, thinknode m1/m5, mesh pocket, techo). #ifndef MESHCORE_VERSION - #define MESHCORE_VERSION "1.17" + #define MESHCORE_VERSION "1.17.1" #endif #define BOOT_SCREEN_MILLIS 3000 // 3 seconds diff --git a/solo/gat562_30s_mesh_kit/platformio.ini b/solo/gat562_30s_mesh_kit/platformio.ini index 2d83aaac..6defbc9d 100644 --- a/solo/gat562_30s_mesh_kit/platformio.ini +++ b/solo/gat562_30s_mesh_kit/platformio.ini @@ -25,7 +25,7 @@ build_flags = -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D UI_SENSORS_PAGE=1 -D UI_HAS_JOYSTICK_UPDOWN=1 -D ADVERT_NAME='"@@MAC"' diff --git a/solo/gat562_mesh_watch13/platformio.ini b/solo/gat562_mesh_watch13/platformio.ini index e8413143..8c7992dc 100644 --- a/solo/gat562_mesh_watch13/platformio.ini +++ b/solo/gat562_mesh_watch13/platformio.ini @@ -23,7 +23,7 @@ build_flags = -D OFFLINE_QUEUE_SIZE=256 -D DUAL_SERIAL=1 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D UI_SENSORS_PAGE=1 -D ADVERT_NAME='"@@MAC"' ; GPS — re-enable (base undefines it); Serial1 pins 15/16 from variant diff --git a/solo/lilygo_techo_lite/platformio.ini b/solo/lilygo_techo_lite/platformio.ini index fccfdc27..1d3c0af5 100644 --- a/solo/lilygo_techo_lite/platformio.ini +++ b/solo/lilygo_techo_lite/platformio.ini @@ -30,7 +30,7 @@ build_flags = ; -D MESH_DEBUG=1 -D ENV_USE_TCA8418=1 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D ENABLE_SCREENSHOT -Os build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} diff --git a/solo/m5stack_cardputer_adv/platformio.ini b/solo/m5stack_cardputer_adv/platformio.ini index 42201b93..cb6692b9 100644 --- a/solo/m5stack_cardputer_adv/platformio.ini +++ b/solo/m5stack_cardputer_adv/platformio.ini @@ -15,7 +15,7 @@ build_flags = -D DUAL_SERIAL=1 -D OFFLINE_QUEUE_SIZE=256 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D UI_SENSORS_PAGE=1 ; misc-fixed 6x9 font (full Latin/Greek/Cyrillic), same as the Wio L1/Heltec ; solo builds. Solo only: it costs ~14 KB of flash, and this board's own diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini index a0b833c8..fc2a53b1 100644 --- a/variants/lilygo_techo_lite/platformio.ini +++ b/variants/lilygo_techo_lite/platformio.ini @@ -92,7 +92,7 @@ build_flags = ; -D MESH_DEBUG=1 -D AUTO_SHUTDOWN_MILLIVOLTS=3300 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} + +<../examples/companion_radio/*.cpp> diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index c4fb4834..d3d3d1b5 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -35,7 +35,7 @@ build_flags = ${nrf52_base.build_flags} -D PIN_BUZZER=12 -D QSPIFLASH=1 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D UI_SENSORS_PAGE=1 -D BLE_PIN_CODE=123456 build_src_filter = ${nrf52_base.build_src_filter} diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index c77ec713..78bb0bc6 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -70,7 +70,7 @@ build_flags = ${WioTrackerL1.build_flags} -D PIN_BUZZER=12 -D QSPIFLASH=1 -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D UI_SENSORS_PAGE=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 @@ -112,7 +112,7 @@ build_flags = ${WioTrackerL1.build_flags} -D QSPIFLASH=1 -D ADVERT_NAME='"@@MAC"' -D FIRMWARE_SOLO_BUILD=1 - -D MESHCORE_VERSION='"1.17"' + -D MESHCORE_VERSION='"1.17.1"' -D UI_SENSORS_PAGE=1 -D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SCL=PIN_WIRE1_SCL