From 3fbc0f408c19aaa040e52771b834a7c4a3b0bf9c Mon Sep 17 00:00:00 2001 From: David Crocker Date: Wed, 26 Feb 2020 21:27:36 +0000 Subject: More changes for 3.02-RC3 Support M122 P1001 and P1004 Return fan.actualValue to 2dp not 1dp Reworked heater fault generation code In delta kinematics, number of towers can't exceed number of total axes --- src/GPIO/GpioPorts.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/GPIO') diff --git a/src/GPIO/GpioPorts.cpp b/src/GPIO/GpioPorts.cpp index 7498dc8d..7c9cafba 100644 --- a/src/GPIO/GpioPorts.cpp +++ b/src/GPIO/GpioPorts.cpp @@ -71,9 +71,12 @@ GCodeResult GpInputPort::Configure(uint32_t gpinNumber, GCodeBuffer &gb, const S #if SUPPORT_CAN_EXPANSION if (boardAddress != CanId::MasterAddress) { - if (CanInterface::DeleteHandle(boardAddress, handle, reply) != GCodeResult::ok) + const GCodeResult rslt = CanInterface::DeleteHandle(boardAddress, handle, reply); + if (rslt != GCodeResult::ok) { - reprap.GetPlatform().Message(AddWarning(gb.GetResponseMessageType()), reply.c_str()); + reply.cat('\n'); + const MessageType mtype = (rslt == GCodeResult::warning) ? AddWarning(gb.GetResponseMessageType()) : AddError(gb.GetResponseMessageType()); + reprap.GetPlatform().Message(mtype, reply.c_str()); reply.Clear(); } boardAddress = CanId::MasterAddress; -- cgit v1.2.3