Skip to content

Commit e39d3ad

Browse files
committed
Corrected reporting of unexpected CAN replies
1 parent 467ffe2 commit e39d3ad

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/CAN/CanInterface.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,12 +843,12 @@ GCodeResult CanInterface::SendRequestAndGetCustomReply(CanMessageBuffer *buf, Ca
843843
// We received an unexpected message. Don't tack it on to 'reply' because some replies contain important data, e.g. request for board short name.
844844
if (buf->id.MsgType() == CanMessageType::standardReply)
845845
{
846-
reprap.GetPlatform().MessageF(WarningMessage, "Discarded std reply src=%u RID=%u exp %u \"%s\"\n",
847-
buf->id.Src(), (unsigned int)buf->msg.standardReply.requestId, rid, buf->msg.standardReply.text);
846+
reprap.GetPlatform().MessageF(WarningMessage, "Discarded std reply src=%u RID=%u exp=%u \"%.*s\"\n",
847+
buf->id.Src(), (unsigned int)buf->msg.standardReply.requestId, rid, buf->msg.standardReply.GetTextLength(buf->dataLength), buf->msg.standardReply.text);
848848
}
849849
else
850850
{
851-
reprap.GetPlatform().MessageF(WarningMessage, "Discarded msg src=%u typ=%u RID=%u exp %u\n",
851+
reprap.GetPlatform().MessageF(WarningMessage, "Discarded msg src=%u typ=%u RID=%u exp=%u\n",
852852
buf->id.Src(), (unsigned int)buf->id.MsgType(), (unsigned int)buf->msg.standardReply.requestId, rid);
853853
}
854854
}

src/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#ifndef VERSION
1212
// Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
13-
# define MAIN_VERSION "3.4.2rc3+"
13+
# define MAIN_VERSION "3.4.2rc3+1"
1414
# ifdef USE_CAN0
1515
# define VERSION_SUFFIX "(CAN0)"
1616
# else

0 commit comments

Comments
 (0)