Merge pull request #78 from nasa/fix-77

Fix #77: Revert merge of PR #52.
nasa · Jul 6, 2023 · 9535a04 · 9535a04
2 parents e76c2d3 + ca28766
commit 9535a04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fsw/src/mm_dump.c b/fsw/src/mm_dump.c
@@ -535,7 +535,7 @@ bool MM_DumpInEventCmd(const CFE_SB_Buffer_t *BufPtr)
                     BytePtr = (uint8 *)DumpBuffer;
                     for (i = 0; i < CmdPtr->NumOfBytes; i++)
                     {
-                        snprintf(TempString, MM_DUMPINEVENT_TEMP_CHARS, "%02X ", *BytePtr);
+                        snprintf(TempString, MM_DUMPINEVENT_TEMP_CHARS, "0x%02X ", *BytePtr);
                         CFE_SB_MessageStringGet(&EventString[EventStringTotalLength], TempString, NULL,
                                                 sizeof(EventString) - EventStringTotalLength, sizeof(TempString));
                         EventStringTotalLength = strlen(EventString);

diff --git a/fsw/src/mm_dump.h b/fsw/src/mm_dump.h
@@ -44,10 +44,10 @@
  *
  * The event message format is:
  *    Message head "Memory Dump: "             13 characters
- *    Message body "FF"                         2 characters per dump byte
+ *    Message body "0xFF "                      5 characters per dump byte
  *    Message tail "from address: 0xFFFFFFFF"  33 characters including NUL on 64-bit system
  */
-#define MM_MAX_DUMP_INEVENT_BYTES ((CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - (13 + 33)) / 2)
+#define MM_MAX_DUMP_INEVENT_BYTES ((CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - (13 + 33)) / 5)
 
 /**
  * \brief Dump in an event scratch string size