diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-09-04 13:59:39 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-09-04 13:59:39 +0300 |
| commit | e39d3ad2767a2404fa59c03a494b3d5ad7c5c841 (patch) | |
| tree | 5d5e51f65e1c318e39c6f8badde55a0c3f5f4e79 | |
| parent | 467ffe2752ef47f97f941c0eb739883f2585448e (diff) | |
Corrected reporting of unexpected CAN replies
| -rw-r--r-- | src/CAN/CanInterface.cpp | 6 | ||||
| -rw-r--r-- | 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 |