Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-13 00:09:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #529 from jLynx/version_automation

Browse Source 
Version automation/injection
This commit is contained in:
Erwin Ried 2022-04-03 12:28:14 +02:00 committed by GitHub
commit 58bdd358c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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{VERSION_STRING}" 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}
@ -38,7 +38,7 @@ if (NOT DEFINED VERSION)
if (GIT_VERSION_FOUND) if (GIT_VERSION_FOUND)
set(VERSION "unknown") set(VERSION "unknown")
else (GIT_VERSION_FOUND) else (GIT_VERSION_FOUND)
set(VERSION "local-${GIT_VERSION}") set(VERSION "${GIT_VERSION}")
endif (GIT_VERSION_FOUND) endif (GIT_VERSION_FOUND)
endif() endif()

6
firmware/application/ui_navigation.hpp
View File

@ -190,7 +190,7 @@ namespace ui
void on_speaker(); void on_speaker();
void on_stealth(); void on_stealth();
void on_bias_tee(); void on_bias_tee();
//void on_textentry(); // void on_textentry();
void on_camera(); void on_camera();
void on_title(); void on_title();
void refresh(); void refresh();
@ -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"; // This is commented out as we are now setting the version via ENV (VERSION_STRING=v1.0.0)
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}};