Merge pull request #101 from astrogeco/integration-candidate

ci_lab Integration candidate: Caelum+dev1
nasa · Dec 6, 2021 · 812d20e · 812d20e
2 parents 12b8cdd + c075480
commit 812d20e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac
 
 ## Version History
 
+### Development Build: v2.5.0-rc4+dev4
+
+- Use CFE_MSG_PTR conversion macro
+- Update baseline for cFS-Caelum-rc4 to v2.5.0-rc4
+- See <https://github.com/nasa/ci_lab/pull/101> and <https://github.com/nasa/cFS/pull/390>
+
 ### Development Build: v2.4.0-rc1+dev46
 
 - Apply CFE_SB_ValueToMsgId where required

diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -186,7 +186,7 @@ void CI_LAB_TaskInit(void)
     */
     OS_TaskInstallDeleteHandler(&CI_LAB_delete_callback);
 
-    CFE_MSG_Init(&CI_LAB_Global.HkTlm.TlmHeader.Msg, CFE_SB_ValueToMsgId(CI_LAB_HK_TLM_MID),
+    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_EVS_SendEvent(CI_LAB_STARTUP_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s",
@@ -314,8 +314,8 @@ int32 CI_LAB_ResetCounters(const CI_LAB_ResetCountersCmd_t *data)
 int32 CI_LAB_ReportHousekeeping(const CFE_MSG_CommandHeader_t *data)
 {
     CI_LAB_Global.HkTlm.Payload.SocketConnected = CI_LAB_Global.SocketConnected;
-    CFE_SB_TimeStampMsg(&CI_LAB_Global.HkTlm.TlmHeader.Msg);
-    CFE_SB_TransmitMsg(&CI_LAB_Global.HkTlm.TlmHeader.Msg, true);
+    CFE_SB_TimeStampMsg(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader));
+    CFE_SB_TransmitMsg(CFE_MSG_PTR(CI_LAB_Global.HkTlm.TelemetryHeader), true);
     return CFE_SUCCESS;
 
 } /* End of CI_LAB_ReportHousekeeping() */

diff --git a/fsw/src/ci_lab_msg.h b/fsw/src/ci_lab_msg.h
@@ -74,7 +74,7 @@ typedef struct
 
 typedef struct
 {
-    CFE_MSG_TelemetryHeader_t TlmHeader;
+    CFE_MSG_TelemetryHeader_t TelemetryHeader;
     CI_LAB_HkTlm_Payload_t    Payload;
 } CI_LAB_HkTlm_t;
 

diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h
@@ -32,16 +32,23 @@
 
 /* Development Build Macro Definitions */
 
-#define CI_LAB_BUILD_NUMBER 46 /*!< Development Build: Number of commits since baseline */
+#define CI_LAB_BUILD_NUMBER 4 /*!< Development Build: Number of commits since baseline */
 #define CI_LAB_BUILD_BASELINE \
-    "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */
+    "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */
 
 /* Version Macro Definitions */
 
-#define CI_LAB_MAJOR_VERSION 2  /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
-#define CI_LAB_MINOR_VERSION 3  /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
-#define CI_LAB_REVISION      99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
-#define CI_LAB_MISSION_REV   0  /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
+#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
+#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
+#define CI_LAB_REVISION      0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
+
+/*!
+ * @brief Mission revision.
+ *
+ * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
+ * Values 1-254 are reserved for mission use to denote patches/customizations as needed.
+ */
+#define CI_LAB_MISSION_REV 0xFF
 
 #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 */