From 20ece719cfda8c48cfe9e1d457c8cc3291520156 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Tue, 30 Jan 2024 11:14:05 +1000 Subject: [PATCH 1/3] Fix #190, Add an event for `ResetCountersCmd` --- fsw/inc/to_lab_eventids.h | 1 + fsw/src/to_lab_cmds.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/fsw/inc/to_lab_eventids.h b/fsw/inc/to_lab_eventids.h index ddf3dde..4279f69 100644 --- 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 index 980d7d7..d035f70 100644 --- a/fsw/src/to_lab_cmds.c +++ b/fsw/src/to_lab_cmds.c @@ -75,6 +75,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; } From 23a5728cb7c82de7bbd759fe207fb94d1395ad0c Mon Sep 17 00:00:00 2001 From: Avi Date: Sat, 22 Oct 2022 21:13:59 +1000 Subject: [PATCH 2/3] Fix #135, Add version information to NOOP event --- fsw/src/to_lab_cmds.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fsw/src/to_lab_cmds.c b/fsw/src/to_lab_cmds.c index 980d7d7..456c4aa 100644 --- 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; } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ From b32aab53b3fc63e210bd5e16b693cf451cfeaec7 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 23 Feb 2024 08:13:22 -0500 Subject: [PATCH 3/3] Updating documentation and version numbers for equuleus-rc1+dev44 --- CHANGELOG.md | 5 +++++ fsw/src/to_lab_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42fc8f1..b51384a 100644 --- 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 and + ## Development Build: equuleus-rc1+dev38 - updating to_lab to use new versioning system - See diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index e4ff0b2..a6b0e0e 100644 --- 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 */