From ab9c6085c72c5fda7c95892798cc801c8bca21c3 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Fri, 10 Sep 2021 17:03:22 -0400 Subject: [PATCH 1/2] Fix #91, apply CFE_SB_ValueToMsgId where required Whenever an integer value is used as a CFE_SB_MsgId_t, it should go through the explicit conversion using the supplied inline function. --- fsw/src/ci_lab_app.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index 7cbf308..40364f2 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -150,8 +150,8 @@ void CI_LAB_TaskInit(void) CFE_EVS_EventFilter_BINARY); CFE_SB_CreatePipe(&CI_LAB_Global.CommandPipe, CI_LAB_PIPE_DEPTH, "CI_LAB_CMD_PIPE"); - CFE_SB_Subscribe(CI_LAB_CMD_MID, CI_LAB_Global.CommandPipe); - CFE_SB_Subscribe(CI_LAB_SEND_HK_MID, CI_LAB_Global.CommandPipe); + CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CI_LAB_CMD_MID), CI_LAB_Global.CommandPipe); + CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CI_LAB_SEND_HK_MID), CI_LAB_Global.CommandPipe); status = OS_SocketOpen(&CI_LAB_Global.SocketID, OS_SocketDomain_INET, OS_SocketType_DATAGRAM); if (status != OS_SUCCESS) @@ -186,7 +186,8 @@ void CI_LAB_TaskInit(void) */ OS_TaskInstallDeleteHandler(&CI_LAB_delete_callback); - CFE_MSG_Init(&CI_LAB_Global.HkTlm.TlmHeader.Msg, CI_LAB_HK_TLM_MID, sizeof(CI_LAB_Global.HkTlm)); + CFE_MSG_Init(&CI_LAB_Global.HkTlm.TlmHeader.Msg, 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", CI_LAB_VERSION_STRING); From 1e83ef6053d8c4163a93a7953b43a371b7653e24 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 21 Sep 2021 22:04:31 -0400 Subject: [PATCH 2/2] IC:2021-09-21, v2.4.0-rc1+dev46 --- README.md | 7 ++++++- fsw/src/ci_lab_version.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index afac372..82e193e 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,14 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac ## Version History +### Development Build: v2.4.0-rc1+dev46 + +- Apply CFE_SB_ValueToMsgId where required +- See and + ### Development Build: v2.4.0-rc1+dev42 -- Implement Coding Standard in CodeQL workflow +- Implement Coding Standard in CodeQL workflow - See and ### Development Build: v2.4.0-rc1+dev39 diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index b52fdcc..7d53a36 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -32,7 +32,7 @@ /* Development Build Macro Definitions */ -#define CI_LAB_BUILD_NUMBER 42 /*!< Development Build: Number of commits since baseline */ +#define CI_LAB_BUILD_NUMBER 46 /*!< 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 */