From e39d3ad2767a2404fa59c03a494b3d5ad7c5c841 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Sun, 4 Sep 2022 11:59:39 +0100 Subject: Corrected reporting of unexpected CAN replies --- src/CAN/CanInterface.cpp | 6 +++--- src/Version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CAN/CanInterface.cpp b/src/CAN/CanInterface.cpp index 4dc17ec1..96bfd602 100644 --- a/src/CAN/CanInterface.cpp +++ b/src/CAN/CanInterface.cpp @@ -843,12 +843,12 @@ GCodeResult CanInterface::SendRequestAndGetCustomReply(CanMessageBuffer *buf, Ca // 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. if (buf->id.MsgType() == CanMessageType::standardReply) { - reprap.GetPlatform().MessageF(WarningMessage, "Discarded std reply src=%u RID=%u exp %u \"%s\"\n", - buf->id.Src(), (unsigned int)buf->msg.standardReply.requestId, rid, buf->msg.standardReply.text); + reprap.GetPlatform().MessageF(WarningMessage, "Discarded std reply src=%u RID=%u exp=%u \"%.*s\"\n", + buf->id.Src(), (unsigned int)buf->msg.standardReply.requestId, rid, buf->msg.standardReply.GetTextLength(buf->dataLength), buf->msg.standardReply.text); } else { - reprap.GetPlatform().MessageF(WarningMessage, "Discarded msg src=%u typ=%u RID=%u exp %u\n", + reprap.GetPlatform().MessageF(WarningMessage, "Discarded msg src=%u typ=%u RID=%u exp=%u\n", buf->id.Src(), (unsigned int)buf->id.MsgType(), (unsigned int)buf->msg.standardReply.requestId, rid); } } diff --git a/src/Version.h b/src/Version.h index 66366b90..c624f546 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // 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. -# define MAIN_VERSION "3.4.2rc3+" +# define MAIN_VERSION "3.4.2rc3+1" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else -- cgit v1.2.3