josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change where FW_VERSION_FULL is defined so it's less messy

This commit is contained in:
VintagePC 2023-09-23 13:10:04 -04:00
parent 4b66485f46
commit 52de576e0a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -94,9 +94,6 @@ set(FW_COMMIT_HASH "0") # Clear it, the code expects a binary...
set(PROJECT_VERSION_TIMESTAMP "0") set(PROJECT_VERSION_TIMESTAMP "0")
endif() endif()
#Rewrite to remove leading v, or set it entirely if the data came from Configuration.h
set(PROJECT_VERSION_FULL "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_REV}-${PROJECT_VERSION_FLV}${PROJECT_VERSION_FLV_VER}-${PROJECT_VERSION_COMMIT}")
# Language configuration # Language configuration
set(MAIN_LANGUAGES set(MAIN_LANGUAGES
cs de es fr it pl cs de es fr it pl
@ -370,7 +367,7 @@ function(add_base_binary variant_name)
target_compile_definitions( target_compile_definitions(
${variant_name} ${variant_name}
PRIVATE CMAKE_CONTROL FW_REPOSITORY="${PROJECT_REPOSITORY}" PRIVATE CMAKE_CONTROL FW_REPOSITORY="${PROJECT_REPOSITORY}"
FW_VERSION_FULL="${PROJECT_VERSION_FULL}" FW_COMMIT_HASH=0x${FW_COMMIT_HASH} FW_COMMIT_HASH=0x${FW_COMMIT_HASH}
FW_MAJOR=${PROJECT_VERSION_MAJOR} FW_MAJOR=${PROJECT_VERSION_MAJOR}
FW_MINOR=${PROJECT_VERSION_MINOR} FW_MINOR=${PROJECT_VERSION_MINOR}
FW_REVISION=${PROJECT_VERSION_REV} FW_REVISION=${PROJECT_VERSION_REV}

2
Firmware/Configuration.h
View File

@ -30,10 +30,12 @@ extern const char _sPrinterMmuName[] PROGMEM;
#ifndef FW_FLAVOR #ifndef FW_FLAVOR
#define FW_TWEAK (FIRMWARE_REVISION_RELEASED) #define FW_TWEAK (FIRMWARE_REVISION_RELEASED)
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION)
#define FW_VERSION_FULL STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_COMMITNR)
#else #else
// Construct the TWEAK value as it is expected from the enum. // Construct the TWEAK value as it is expected from the enum.
#define FW_TWEAK (CONCAT(FIRMWARE_REVISION_,FW_FLAVOR) + FW_FLAVERSION) #define FW_TWEAK (CONCAT(FIRMWARE_REVISION_,FW_FLAVOR) + FW_FLAVERSION)
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
#define FW_VERSION_FULL STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) "-" STR(FW_COMMITNR)
#endif #endif
// The full version string and repository source are set via cmake // The full version string and repository source are set via cmake