Merge pull request #54 from jphickey/fix-53-opaque-msgid

Fix #53, Opaque CFE_SB_MsgId_t values
nasa · May 8, 2020 · 8a77aa7 · 8a77aa7
2 parents 7050751 + e691304
commit 8a77aa7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c
@@ -278,7 +278,7 @@ void SAMPLE_ProcessCommandPacket( CFE_SB_MsgPtr_t Msg )
             CFE_EVS_SendEvent(SAMPLE_INVALID_MSGID_ERR_EID,
                               CFE_EVS_EventType_ERROR,
          	              "SAMPLE: invalid command packet,MID = 0x%x",
-                              MsgId);
+                              (unsigned int)CFE_SB_MsgIdToValue(MsgId));
             break;
     }
 
@@ -488,7 +488,7 @@ bool SAMPLE_VerifyCmdLength( CFE_SB_MsgPtr_t Msg, uint16 ExpectedLength )
         CFE_EVS_SendEvent(SAMPLE_LEN_ERR_EID,
                           CFE_EVS_EventType_ERROR,
                           "Invalid Msg length: ID = 0x%X,  CC = %d, Len = %d, Expected = %d",
-                          MessageID,
+                          (unsigned int)CFE_SB_MsgIdToValue(MessageID),
                           CommandCode,
                           ActualLength,
                           ExpectedLength);

diff --git a/unit-test/coveragetest/coveragetest_sample_app.c b/unit-test/coveragetest/coveragetest_sample_app.c
@@ -275,7 +275,7 @@ void Test_SAMPLE_ProcessCommandPacket(void)
     SAMPLE_ProcessCommandPacket(&TestMsg.Base);
 
     /* invalid message id */
-    TestMsgId = 0;
+    TestMsgId = CFE_SB_INVALID_MSG_ID;
     UT_SetDataBuffer(UT_KEY(CFE_SB_GetMsgId), &TestMsgId,
             sizeof(TestMsgId), false);
     SAMPLE_ProcessCommandPacket(&TestMsg.Base);