TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-13 18:39:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
jLynx
2022-04-02 22:00:46 +13:00
parent 486b064e08
commit 03057546e1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -25,8 +25,8 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex
project(portapack-h1) project(portapack-h1)
#set(VERSION "") set(VERSION "$ENV{VERSION_STRING}")
if (NOT DEFINED VERSION) if ("$ENV{EnvironmentVariableName}" STREQUAL "")
execute_process( execute_process(
COMMAND git log -n 1 --format=%h COMMAND git log -n 1 --format=%h
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}

4
firmware/application/ui_navigation.hpp
View File

@@ -212,7 +212,7 @@ namespace ui
void refresh(); void refresh();
private: private:
static constexpr auto version_string = "v1.4.4"; // static constexpr auto version_string = "v1.4.4";
NavigationView &nav_; NavigationView &nav_;
Rectangle backdrop{ Rectangle backdrop{
@@ -221,7 +221,7 @@ namespace ui
Text version{ Text version{
{2, 0, 11 * 8, 16}, {2, 0, 11 * 8, 16},
version_string}; VERSION_STRING};
LiveDateTime ltime{ LiveDateTime ltime{
{86, 0, 19 * 8, 16}}; {86, 0, 19 * 8, 16}};