Merge pull request #46 from jphickey/fix-45-opaque-msgid

Fix #45, Opaque CFE_SB_MsgId_t values
nasa · May 8, 2020 · c4ec2a7 · c4ec2a7
2 parents fe9e3ef + 1eacca0
commit c4ec2a7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -225,7 +225,7 @@ void CI_LAB_ProcessCommandPacket(void)
     CFE_SB_MsgId_t MsgId;
     MsgId = CFE_SB_GetMsgId(CI_LAB_Global.MsgPtr);
 
-    switch (MsgId)
+    switch (CFE_SB_MsgIdToValue(MsgId))
     {
         case CI_LAB_CMD_MID:
             CI_LAB_ProcessGroundCommand();
@@ -238,7 +238,7 @@ void CI_LAB_ProcessCommandPacket(void)
         default:
             CI_LAB_Global.HkBuffer.HkTlm.Payload.CommandErrorCounter++;
             CFE_EVS_SendEvent(CI_LAB_COMMAND_ERR_EID, CFE_EVS_EventType_ERROR, "CI: invalid command packet,MID = 0x%x",
-                              MsgId);
+                              (unsigned int)CFE_SB_MsgIdToValue(MsgId));
             break;
     }
 
@@ -407,8 +407,9 @@ bool CI_LAB_VerifyCmdLength(CFE_SB_MsgPtr_t msg, uint16 ExpectedLength)
         uint16         CommandCode = CFE_SB_GetCmdCode(msg);
 
         CFE_EVS_SendEvent(CI_LAB_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
-                          "Invalid msg length: ID = 0x%X,  CC = %d, Len = %d, Expected = %d", MessageID, CommandCode,
-                          ActualLength, ExpectedLength);
+                          "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);
         result = false;
         CI_LAB_Global.HkBuffer.HkTlm.Payload.CommandErrorCounter++;
     }