Merge pull request #192 from nasa/integration-candidate

to_lab Integration candidate: Equuleus-rc1+dev5
nasa · Feb 23, 2024 · 276eaf3 · 276eaf3
2 parents d9bef53 + b32aab5
commit 276eaf3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev44
+- Add an event for ResetCountersCmd
+- Add version information to NOOP event
+- See <https://github.com/nasa/to_lab/pull/191> and <https://github.com/nasa/to_lab/pull/136>
+
 ## Development Build: equuleus-rc1+dev38
 - updating to_lab to use new versioning system
 - See <https://github.com/nasa/to_lab/pull/186>

diff --git a/fsw/inc/to_lab_eventids.h b/fsw/inc/to_lab_eventids.h
@@ -40,6 +40,7 @@
 #define TO_LAB_ADDPKT_ERR_EID        10
 #define TO_LAB_REMOVEPKT_ERR_EID     11
 #define TO_LAB_REMOVEALLPTKS_ERR_EID 12
+#define TO_LAB_RESET_INF_EID         13
 #define TO_LAB_ADDPKT_INF_EID        15
 #define TO_LAB_REMOVEPKT_INF_EID     16
 #define TO_LAB_REMOVEALLPKTS_INF_EID 17

diff --git a/fsw/src/to_lab_cmds.c b/fsw/src/to_lab_cmds.c
@@ -22,12 +22,14 @@
  */
 
 #include "cfe.h"
+#include "cfe_config.h" // For CFE_Config_GetVersionString
 
 #include "to_lab_app.h"
 #include "to_lab_cmds.h"
 #include "to_lab_msg.h"
 #include "to_lab_eventids.h"
 #include "to_lab_msgids.h"
+#include "to_lab_version.h"
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */
@@ -61,9 +63,15 @@ CFE_Status_t TO_LAB_EnableOutputCmd(const TO_LAB_EnableOutputCmd_t *data)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 CFE_Status_t TO_LAB_NoopCmd(const TO_LAB_NoopCmd_t *data)
 {
-    CFE_EVS_SendEvent(TO_LAB_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op command");
-    ++TO_LAB_Global.HkTlm.Payload.CommandCounter;
-    return CFE_SUCCESS;
+  char VersionString[TO_LAB_CFG_MAX_VERSION_STR_LEN];
+
+  CFE_Config_GetVersionString(VersionString, TO_LAB_CFG_MAX_VERSION_STR_LEN, "TO Lab",
+                        TO_LAB_VERSION, TO_LAB_BUILD_CODENAME, TO_LAB_LAST_OFFICIAL);
+
+  CFE_EVS_SendEvent(TO_LAB_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "TO: NOOP command. %s", VersionString);
+
+  ++TO_LAB_Global.HkTlm.Payload.CommandCounter;
+  return CFE_SUCCESS;
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -75,6 +83,9 @@ CFE_Status_t TO_LAB_ResetCountersCmd(const TO_LAB_ResetCountersCmd_t *data)
 {
     TO_LAB_Global.HkTlm.Payload.CommandErrorCounter = 0;
     TO_LAB_Global.HkTlm.Payload.CommandCounter      = 0;
+
+    CFE_EVS_SendEvent(TO_LAB_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, "Reset counters command");
+
     return CFE_SUCCESS;
 }
 

diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h
@@ -24,7 +24,7 @@
 #define TO_LAB_VERSION_H
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER     38 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER     44 /*!< Development Build: Number of commits since baseline */
 #define TO_LAB_BUILD_BASELINE   "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
 #define TO_LAB_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define TO_LAB_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */