From 0926e9e6e4233a8be6080c6bbdeca5686c6ff92d Mon Sep 17 00:00:00 2001 From: Dave Allie Date: Mon, 8 Dec 2025 23:13:33 +1100 Subject: [PATCH] Add version string to boot screen --- platformio.ini | 38 ++++++++++++++++++++-------------- src/main.cpp | 8 ++++--- src/screens/BootLogoScreen.cpp | 1 + 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/platformio.ini b/platformio.ini index ec1aa3c..facf8f3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,14 +1,8 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter -; Upload options: custom upload port, speed and extra flags -; Library options: dependencies, extra library storages -; Advanced options: extra scripting -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html +[platformio] +crosspoint_version = 0.2.0 +default_envs = default -[env:esp32-c3-devkitm-1] +[base] platform = espressif32 board = esp32-c3-devkitm-1 framework = arduino @@ -19,22 +13,34 @@ board_upload.flash_size = 16MB board_upload.maximum_size = 16777216 board_upload.offset_address = 0x10000 -; Board configuration -board_build.flash_mode = dio -board_build.flash_size = 16MB -board_build.partitions = partitions.csv - build_flags = -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 -DMINIZ_NO_ZLIB_COMPATIBLE_NAMES=1 - # https://libexpat.github.io/doc/api/latest/#XML_GE +# https://libexpat.github.io/doc/api/latest/#XML_GE -DXML_GE=0 -DXML_CONTEXT_BYTES=1024 +; Board configuration +board_build.flash_mode = dio +board_build.flash_size = 16MB +board_build.partitions = partitions.csv + ; Libraries lib_deps = https://github.com/leethomason/tinyxml2.git#11.0.0 BatteryMonitor=symlink://open-x4-sdk/libs/hardware/BatteryMonitor InputManager=symlink://open-x4-sdk/libs/hardware/InputManager EInkDisplay=symlink://open-x4-sdk/libs/display/EInkDisplay + +[env:default] +extends = base +build_flags = + ${base.build_flags} + -DCROSSPOINT_VERSION=\"${platformio.crosspoint_version}-dev\" + +[env:gh_release] +extends = base +build_flags = + ${base.build_flags} + -DCROSSPOINT_VERSION=\"${platformio.crosspoint_version}\" diff --git a/src/main.cpp b/src/main.cpp index caca492..c285a41 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -172,15 +172,17 @@ void onGoHome() { } void setup() { - inputManager.begin(); - verifyWakeupLongPress(); - // Begin serial only if USB connected pinMode(UART0_RXD, INPUT); if (digitalRead(UART0_RXD) == HIGH) { Serial.begin(115200); } + Serial.printf("[%lu] [ ] Starting CrossPoint version " CROSSPOINT_VERSION "\n", millis()); + + inputManager.begin(); + verifyWakeupLongPress(); + // Initialize pins pinMode(BAT_GPIO0, INPUT); diff --git a/src/screens/BootLogoScreen.cpp b/src/screens/BootLogoScreen.cpp index 216336a..0ec2c10 100644 --- a/src/screens/BootLogoScreen.cpp +++ b/src/screens/BootLogoScreen.cpp @@ -13,5 +13,6 @@ void BootLogoScreen::onEnter() { renderer.drawImage(CrossLarge, (pageWidth - 128) / 2, (pageHeight - 128) / 2, 128, 128); renderer.drawCenteredText(UI_FONT_ID, pageHeight / 2 + 70, "CrossPoint", true, BOLD); renderer.drawCenteredText(SMALL_FONT_ID, pageHeight / 2 + 95, "BOOTING"); + renderer.drawCenteredText(SMALL_FONT_ID, pageHeight - 30, CROSSPOINT_VERSION); renderer.displayBuffer(); }