From 59f001da65e1a2482817ca20882cf24d102cfce2 Mon Sep 17 00:00:00 2001 From: Chris Vig Date: Wed, 27 Aug 2025 10:42:04 -0500 Subject: [PATCH] Hard-code version number in source code. --- .vscode/c_cpp_properties.json | 3 --- configuration.cmake | 17 ----------------- src/main/core/version.c | 30 ++++++++++++++++++++++++------ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 905350c..94ca3d1 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -12,9 +12,6 @@ "F_CPU=8000000", "_DEBUG=1", "_BUILD_TYPE=\"Debug\"", - "_VERSION_MAJOR=0", - "_VERSION_MINOR=0", - "_VERSION_REVISION=0", "_CONFIG_DFLT_WPM=200", "_CONFIG_DFLT_BUZZER_ENABLED=true", "_CONFIG_DFLT_BUZZER_FREQUENCY=700", diff --git a/configuration.cmake b/configuration.cmake index e94355f..375837e 100644 --- a/configuration.cmake +++ b/configuration.cmake @@ -6,23 +6,6 @@ # @date 2025-08-19 # -# -- Versioning -- - -# Define values -set(VERSION_MAJOR 0 - CACHE STRING "The major version number.") -set(VERSION_MINOR 1 - CACHE STRING "The minor version number.") -set(VERSION_REVISION 0 - CACHE STRING "The revision version number.") - -# Set compile definitions -add_compile_definitions( - _VERSION_MAJOR=${VERSION_MAJOR} - _VERSION_MINOR=${VERSION_MINOR} - _VERSION_REVISION=${VERSION_REVISION} -) - # -- Configuration Defaults -- # Define values diff --git a/src/main/core/version.c b/src/main/core/version.c index 158617a..7636268 100644 --- a/src/main/core/version.c +++ b/src/main/core/version.c @@ -14,17 +14,35 @@ /* --------------------------------------------------- CONSTANTS ---------------------------------------------------- */ +/** + * @def VERSION_MAJOR + * @brief The application's major version number. + */ +#define VERSION_MAJOR 0 + +/** + * @def VERSION_MINOR + * @brief The application's minor version number. + */ +#define VERSION_MINOR 1 + +/** + * @def VERSION_REVISION + * @brief The application's revision version number. + */ +#define VERSION_REVISION 0 + // Public variables -uint8_t const PRODUCT_VERSION_MAJOR = _VERSION_MAJOR; -uint8_t const PRODUCT_VERSION_MINOR = _VERSION_MINOR; -uint8_t const PRODUCT_VERSION_REVISION = _VERSION_REVISION; +uint8_t const PRODUCT_VERSION_MAJOR = VERSION_MAJOR; +uint8_t const PRODUCT_VERSION_MINOR = VERSION_MINOR; +uint8_t const PRODUCT_VERSION_REVISION = VERSION_REVISION; // Auto-generated variables static char const * const PRODUCT_NAME = _EXECUTABLE_PROJECT_NAME; static char const * const EXECUTABLE_NAME = _EXECUTABLE_NAME; -static char const * const VERSION = stringize_value( _VERSION_MAJOR ) "." - stringize_value( _VERSION_MINOR ) "." - stringize_value( _VERSION_REVISION ); +static char const * const VERSION = stringize_value( VERSION_MAJOR ) "." + stringize_value( VERSION_MINOR ) "." + stringize_value( VERSION_REVISION ); static char const * const BUILD_TYPE = _BUILD_TYPE; static char const * const BUILD_DIR = _EXECUTABLE_PROJECT_BUILD_DIR; static char const * const BUILD_DATE = _EXECUTABLE_BUILD_DATE;