From 75ae38453f848ffe2f4eb9e530f5784ca3f7323b Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 4 Nov 2020 12:00:16 -0500 Subject: [PATCH 1/3] Fix #57, Use MSG APIs --- fsw/src/ci_lab_app.c | 51 ++++++++++++++++++++++++-------------------- fsw/src/ci_lab_app.h | 3 ++- fsw/src/ci_lab_msg.h | 2 +- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index 9019125..4b98c9e 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -43,28 +43,28 @@ /* * Declaring the CI_LAB_IngestBuffer as a union * ensures it is aligned appropriately to - * store a CFE_SB_Msg_t type. + * store a CFE_MSG_Message_t type. */ typedef union { - CFE_SB_Msg_t MsgHdr; - uint8 bytes[CI_LAB_MAX_INGEST]; - uint16 hwords[2]; + CFE_MSG_Message_t MsgHdr; + uint8 bytes[CI_LAB_MAX_INGEST]; + uint16 hwords[2]; } CI_LAB_IngestBuffer_t; typedef union { - CFE_SB_Msg_t MsgHdr; - CI_LAB_HkTlm_t HkTlm; + CFE_MSG_Message_t MsgHdr; + CI_LAB_HkTlm_t HkTlm; } CI_LAB_HkTlm_Buffer_t; typedef struct { - bool SocketConnected; - CFE_SB_PipeId_t CommandPipe; - CFE_SB_MsgPtr_t MsgPtr; - osal_id_t SocketID; - OS_SockAddr_t SocketAddress; + bool SocketConnected; + CFE_SB_PipeId_t CommandPipe; + CFE_MSG_Message_t *MsgPtr; + osal_id_t SocketID; + OS_SockAddr_t SocketAddress; CI_LAB_HkTlm_Buffer_t HkBuffer; CI_LAB_IngestBuffer_t IngestBuffer; @@ -201,7 +201,7 @@ void CI_LAB_TaskInit(void) */ OS_TaskInstallDeleteHandler(&CI_LAB_delete_callback); - CFE_SB_InitMsg(&CI_LAB_Global.HkBuffer.HkTlm, CI_LAB_HK_TLM_MID, CI_LAB_HK_TLM_LNGTH, true); + CFE_MSG_Init(&CI_LAB_Global.HkBuffer.HkTlm.TlmHeader.BaseMsg, CI_LAB_HK_TLM_MID, CI_LAB_HK_TLM_LNGTH); CFE_EVS_SendEvent(CI_LAB_STARTUP_INF_EID, CFE_EVS_EventType_INFORMATION, "CI Lab Initialized.%s", CI_LAB_VERSION_STRING); @@ -222,8 +222,9 @@ void CI_LAB_TaskInit(void) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ void CI_LAB_ProcessCommandPacket(void) { - CFE_SB_MsgId_t MsgId; - MsgId = CFE_SB_GetMsgId(CI_LAB_Global.MsgPtr); + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; + + CFE_MSG_GetMsgId(CI_LAB_Global.MsgPtr, &MsgId); switch (CFE_SB_MsgIdToValue(MsgId)) { @@ -254,9 +255,9 @@ void CI_LAB_ProcessCommandPacket(void) void CI_LAB_ProcessGroundCommand(void) { - uint16 CommandCode; + CFE_MSG_FcnCode_t CommandCode = 0; - CommandCode = CFE_SB_GetCmdCode(CI_LAB_Global.MsgPtr); + CFE_MSG_GetFcnCode(CI_LAB_Global.MsgPtr, &CommandCode); /* Process "known" CI task ground commands */ switch (CommandCode) @@ -393,23 +394,27 @@ void CI_LAB_ReadUpLink(void) /* CI_LAB_VerifyCmdLength() -- Verify command packet length */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/ -bool CI_LAB_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength) +bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t ExpectedLength) { - bool result = true; - uint16 ActualLength = CFE_SB_GetTotalMsgLength(msg); + bool result = true; + CFE_MSG_Size_t ActualLength = 0; + CFE_MSG_FcnCode_t FcnCode = 0; + CFE_SB_MsgId_t MsgId = CFE_SB_INVALID_MSG_ID; + + CFE_MSG_GetSize(MsgPtr, &ActualLength); /* ** Verify the command packet length... */ if (ExpectedLength != ActualLength) { - CFE_SB_MsgId_t MessageID = CFE_SB_GetMsgId(msg); - uint16 CommandCode = CFE_SB_GetCmdCode(msg); + CFE_MSG_GetMsgId(MsgPtr, &MsgId); + CFE_MSG_GetFcnCode(MsgPtr, &FcnCode); CFE_EVS_SendEvent(CI_LAB_LEN_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid msg length: ID = 0x%X, CC = %u, Len = %u, Expected = %u", - (unsigned int)CFE_SB_MsgIdToValue(MessageID), (unsigned int)CommandCode, - (unsigned int)ActualLength, (unsigned int)ExpectedLength); + (unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)FcnCode, (unsigned int)ActualLength, + (unsigned int)ExpectedLength); result = false; CI_LAB_Global.HkBuffer.HkTlm.Payload.CommandErrorCounter++; } diff --git a/fsw/src/ci_lab_app.h b/fsw/src/ci_lab_app.h index 8a5a473..9702e98 100644 --- a/fsw/src/ci_lab_app.h +++ b/fsw/src/ci_lab_app.h @@ -36,6 +36,7 @@ #include "cfe_evs.h" #include "cfe_sb.h" #include "cfe_es.h" +#include "cfe_msg_api.h" #include "osapi.h" @@ -67,6 +68,6 @@ void CI_LAB_ProcessGroundCommand(void); void CI_LAB_ResetCounters_Internal(void); void CI_LAB_ReadUpLink(void); -bool CI_LAB_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength); +bool CI_LAB_VerifyCmdLength(CFE_MSG_Message_t *MsgPtr, CFE_MSG_Size_t ExpectedLength); #endif /* _ci_lab_app_h_ */ diff --git a/fsw/src/ci_lab_msg.h b/fsw/src/ci_lab_msg.h index 66f089b..4332b68 100644 --- a/fsw/src/ci_lab_msg.h +++ b/fsw/src/ci_lab_msg.h @@ -74,7 +74,7 @@ typedef struct typedef struct { - uint8 TlmHeader[CFE_SB_TLM_HDR_SIZE]; + CFE_SB_TlmHdr_t TlmHeader; CI_LAB_HkTlm_Payload_t Payload; } OS_PACK CI_LAB_HkTlm_t; From 51b8398711ba9e83f8dfd78ac9a377747e054891 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 13 Nov 2020 08:54:02 -0500 Subject: [PATCH 2/3] Fix #59, Remove non-portable OS_PACK --- fsw/src/ci_lab_msg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/src/ci_lab_msg.h b/fsw/src/ci_lab_msg.h index 66f089b..63d8e1d 100644 --- a/fsw/src/ci_lab_msg.h +++ b/fsw/src/ci_lab_msg.h @@ -76,7 +76,7 @@ typedef struct { uint8 TlmHeader[CFE_SB_TLM_HDR_SIZE]; CI_LAB_HkTlm_Payload_t Payload; -} OS_PACK CI_LAB_HkTlm_t; +} CI_LAB_HkTlm_t; #define CI_LAB_HK_TLM_LNGTH sizeof(CI_LAB_HkTlm_t) From a401a3c822fd54e19e1e79f3bc66497418eee762 Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Fri, 13 Nov 2020 16:12:35 -0500 Subject: [PATCH 3/3] Bump to v2.4.0-rc1+dev8 and update ReadMe --- README.md | 5 +++++ fsw/src/ci_lab_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 79a5372..68185d0 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,11 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac ## Version History +### Development Build: 2.4.0-rc1+dev8 + +- Replaces deprecated SB API's with MSG +- No behavior impact, removes undesirable pattern use of `OS_PACK` +- See ### Development Build: 2.4.0-rc1+dev2 diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index 86172d2..50f59b0 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 2 /*!< Development Build: Number of commits since baseline */ +#define CI_LAB_BUILD_NUMBER 8 /*!< 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 */