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(version): splash screen showed 1.17, not the actual 1.17.1 upstream base

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-08-29 19:23:08 +02:00
co-authored by Claude Sonnet 5
parent 5323cd9e6b
commit 5933ff3178
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/UITask.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
// outright rather than fall back, which quietly made every ui-new env on those // 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). // boards unbuildable (heltec v3/v4, thinknode m1/m5, mesh pocket, techo).
#ifndef MESHCORE_VERSION #ifndef MESHCORE_VERSION
#define MESHCORE_VERSION "1.17" #define MESHCORE_VERSION "1.17.1"
#endif #endif
#define BOOT_SCREEN_MILLIS 3000 // 3 seconds #define BOOT_SCREEN_MILLIS 3000 // 3 seconds
solo/gat562_30s_mesh_kit/platformio.ini
+1 -1
View File
@@ -25,7 +25,7 @@ build_flags =
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D UI_SENSORS_PAGE=1 -D UI_SENSORS_PAGE=1
-D UI_HAS_JOYSTICK_UPDOWN=1 -D UI_HAS_JOYSTICK_UPDOWN=1
-D ADVERT_NAME='"@@MAC"' -D ADVERT_NAME='"@@MAC"'
solo/gat562_mesh_watch13/platformio.ini
+1 -1
View File
@@ -23,7 +23,7 @@ build_flags =
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
-D DUAL_SERIAL=1 -D DUAL_SERIAL=1
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D UI_SENSORS_PAGE=1 -D UI_SENSORS_PAGE=1
-D ADVERT_NAME='"@@MAC"' -D ADVERT_NAME='"@@MAC"'
; GPS — re-enable (base undefines it); Serial1 pins 15/16 from variant ; GPS — re-enable (base undefines it); Serial1 pins 15/16 from variant
solo/lilygo_techo_lite/platformio.ini
+1 -1
View File
@@ -30,7 +30,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
-D ENV_USE_TCA8418=1 -D ENV_USE_TCA8418=1
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D ENABLE_SCREENSHOT -D ENABLE_SCREENSHOT
-Os -Os
build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter}
solo/m5stack_cardputer_adv/platformio.ini
+1 -1
View File
@@ -15,7 +15,7 @@ build_flags =
-D DUAL_SERIAL=1 -D DUAL_SERIAL=1
-D OFFLINE_QUEUE_SIZE=256 -D OFFLINE_QUEUE_SIZE=256
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D UI_SENSORS_PAGE=1 -D UI_SENSORS_PAGE=1
; misc-fixed 6x9 font (full Latin/Greek/Cyrillic), same as the Wio L1/Heltec ; 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 ; solo builds. Solo only: it costs ~14 KB of flash, and this board's own
variants/lilygo_techo_lite/platformio.ini
+1 -1
View File
@@ -92,7 +92,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
-D AUTO_SHUTDOWN_MILLIVOLTS=3300 -D AUTO_SHUTDOWN_MILLIVOLTS=3300
-D FIRMWARE_SOLO_BUILD=1 -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} build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter}
+<helpers/nrf52/SerialBLEInterface.cpp> +<helpers/nrf52/SerialBLEInterface.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
variants/wio-tracker-l1-eink/platformio.ini
+1 -1
View File
@@ -35,7 +35,7 @@ build_flags = ${nrf52_base.build_flags}
-D PIN_BUZZER=12 -D PIN_BUZZER=12
-D QSPIFLASH=1 -D QSPIFLASH=1
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D UI_SENSORS_PAGE=1 -D UI_SENSORS_PAGE=1
-D BLE_PIN_CODE=123456 -D BLE_PIN_CODE=123456
build_src_filter = ${nrf52_base.build_src_filter} build_src_filter = ${nrf52_base.build_src_filter}
variants/wio-tracker-l1/platformio.ini
+2 -2
View File
@@ -70,7 +70,7 @@ build_flags = ${WioTrackerL1.build_flags}
-D PIN_BUZZER=12 -D PIN_BUZZER=12
-D QSPIFLASH=1 -D QSPIFLASH=1
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D UI_SENSORS_PAGE=1 -D UI_SENSORS_PAGE=1
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
@@ -112,7 +112,7 @@ build_flags = ${WioTrackerL1.build_flags}
-D QSPIFLASH=1 -D QSPIFLASH=1
-D ADVERT_NAME='"@@MAC"' -D ADVERT_NAME='"@@MAC"'
-D FIRMWARE_SOLO_BUILD=1 -D FIRMWARE_SOLO_BUILD=1
-D MESHCORE_VERSION='"1.17"' -D MESHCORE_VERSION='"1.17.1"'
-D UI_SENSORS_PAGE=1 -D UI_SENSORS_PAGE=1
-D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SDA=PIN_WIRE1_SDA
-D ENV_PIN_SCL=PIN_WIRE1_SCL -D ENV_PIN_SCL=PIN_WIRE1_SCL