Fixes to M122

Author: dc42

src/CAN/CanInterface.cpp

@@ -1261,12 +1261,13 @@ GCodeResult CanInterface::RemoteDiagnostics(MessageType mt, uint32_t boardAddres
 		do
 		{
 			// We can use 'reply' to buffer the returned data
+			reply.Clear();
 			res = GetRemoteInfo(CanMessageReturnInfo::typeDiagnosticsPart0 + currentPart, boardAddress, type, gb, reply, &lastPart);
 			if (res != GCodeResult::ok)
 			{
 				return res;
 			}
-			if (type == 0 && currentPart == 0)
+			if (currentPart == 0)
 			{
 				p.MessageF(mt, "Diagnostics for board %u:\n", (unsigned int)boardAddress);
 			}
@@ -1277,6 +1278,7 @@ GCodeResult CanInterface::RemoteDiagnostics(MessageType mt, uint32_t boardAddres
 			}
 			++currentPart;
 		} while (currentPart <= lastPart);
+		reply.Clear();
 		return res;
 	}
 

src/CAN/CommandProcessor.cpp

@@ -239,8 +239,9 @@ static GCodeResult EutGetInfo(const CanMessageReturnInfo& msg, const StringRef&
 	default:
 		if (msg.type >= CanMessageReturnInfo::typeDiagnosticsPart0 && msg.type < CanMessageReturnInfo::typeDiagnosticsPart0 + reprap.GetNumberOfDiagnosticParts())
 		{
+			reply.Clear();
 			reprap.GetDiagnosticsPart(msg.type - CanMessageReturnInfo::typeDiagnosticsPart0, reply);
-			extra = reprap.GetNumberOfDiagnosticParts();
+			extra = reprap.GetNumberOfDiagnosticParts() - 1;
 		}
 		else
 		{