From 9819046d4459fff7b14171c6e1b8037d5d6a1ae4 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 26 Dec 2023 09:45:41 -0500 Subject: [PATCH] Fix #145, updating ci_lab to use new versioning system. --- fsw/src/ci_lab_app.c | 6 +++++- fsw/src/ci_lab_app.h | 1 + fsw/src/ci_lab_version.h | 26 ++++++++++++++++---------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index c37b3c6..df5ef9b 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -104,6 +104,7 @@ void CI_LAB_TaskInit(void) { int32 status; uint16 DefaultListenPort; + char VersionString[CI_LAB_CFG_MAX_VERSION_STR_LEN]; memset(&CI_LAB_Global, 0, sizeof(CI_LAB_Global)); @@ -172,8 +173,11 @@ void CI_LAB_TaskInit(void) CFE_MSG_Init(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader), CFE_SB_ValueToMsgId(CI_LAB_HK_TLM_MID), sizeof(CI_LAB_Global.HkTlm)); + CFE_Config_GetVersionString(VersionString, CI_LAB_CFG_MAX_VERSION_STR_LEN, "CI Lab App", + CI_LAB_VERSION, CI_LAB_BUILD_CODENAME, CI_LAB_LAST_OFFICIAL); + CFE_EVS_SendEvent(CI_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s", - CI_LAB_VERSION_STRING); + VersionString); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h index cb1510e..bfda67a 100644 --- a/fsw/src/ci_lab_app.h +++ b/fsw/src/ci_lab_app.h @@ -29,6 +29,7 @@ #include "common_types.h" #include "osapi.h" #include "cfe.h" +#include "cfe_config.h" #include "ci_lab_mission_cfg.h" #include "ci_lab_platform_cfg.h" diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index 234e7d9..62b31ee 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -25,16 +25,22 @@ /* Development Build Macro Definitions */ -#define CI_LAB_BUILD_NUMBER 81 /*!< Development Build: Number of commits since baseline */ -#define CI_LAB_BUILD_BASELINE \ - "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */ +#define CI_LAB_BUILD_NUMBER 81 /*!< Development Build: Number of commits since baseline */ +#define CI_LAB_BUILD_BASELINE "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */ +#define CI_LAB_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ +#define CI_LAB_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */ /* * Version Macros, see \ref cfsversions for definitions. */ #define CI_LAB_MAJOR_VERSION 2 /*!< @brief Major version number */ #define CI_LAB_MINOR_VERSION 3 /*!< @brief Minor version number */ -#define CI_LAB_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/ +#define CI_LAB_REVISION 0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/ + +/** + * @brief Last official release. + */ +#define CI_LAB_LAST_OFFICIAL "v2.3.0" /*! * @brief Mission revision. @@ -54,12 +60,12 @@ */ #define CI_LAB_VERSION CI_LAB_BUILD_BASELINE "+dev" CI_LAB_STR(CI_LAB_BUILD_NUMBER) -/*! @brief Development Build Version String. - * @details Reports the current development build's baseline, number, and name. Also includes a note about the latest - * official version. @n See @ref cfsversions for format differences between development and release versions. +/** + * @brief Max Version String length. + * + * Maximum length that a CI Lab version string can be. + * */ -#define CI_LAB_VERSION_STRING \ - " CI Lab App DEVELOPMENT BUILD " CI_LAB_VERSION \ - ", Last Official Release: v2.3.0" /* For full support please use this version */ +#define CI_LAB_CFG_MAX_VERSION_STR_LEN 256 #endif