Fix #145, updating ci_lab to use new versioning system.

nasa · Dec 26, 2023 · 0ca768f · 0ca768f
1 parent 92edb74
commit 0ca768f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git 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[CFE_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, CFE_CFG_MAX_VERSION_STR_LEN, "CI Lab App", CI_LAB_BUILD_TYPE,
+        CI_LAB_SRC_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
@@ -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
@@ -25,9 +25,11 @@
 
 /* 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_TYPE       "Development Build" /**< @brief: Development: Type of build (Development Build or Release) */
+#define CI_LAB_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
@@ -36,14 +38,19 @@
 #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.*/
 
+/**
+ * @brief Last official release.
+ */
+#define CI_LAB_LAST_OFFICIAL "v2.3.0"
+
 /*!
  * @brief Mission revision.
  *
  * Reserved for mission use to denote patches/customizations as needed.
  * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
  * cFS open-source development use (pending resolution of nasa/cFS#440)
  */
-#define CI_LAB_MISSION_REV 0xFF
+#define CI_LAB_MISSION_REV 0x00
 
 #define CI_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
 #define CI_LAB_STR(x)        CI_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */
@@ -54,12 +61,4 @@
  */
 #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.
- */
-#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 */
-
 #endif