From ca2876671de50de8a9f5bd61f7992ed1407e82a3 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 6 Jul 2023 15:34:49 -0400 Subject: [PATCH] Fix #77: Revert merge of PR #52. This reverts commit df7401f338ae3c9298bae92bd03370ba9133714d, reversing changes made to da7ef700434bcf661b78805cc7923cdea1c95465. --- fsw/src/mm_dump.c | 2 +- fsw/src/mm_dump.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsw/src/mm_dump.c b/fsw/src/mm_dump.c index 77e73a7..46c9840 100644 --- 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 index 52f6af8..9684487 100644 --- 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