diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-02-27 00:27:36 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-02-27 00:27:36 +0300 |
| commit | 3fbc0f408c19aaa040e52771b834a7c4a3b0bf9c (patch) | |
| tree | 2e76704a0042e9d38d3f35043448fa95593564c5 /src/GPIO | |
| parent | 46eba53f32abc43abd3b3b1ee8b8165c74647907 (diff) | |
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
Diffstat (limited to 'src/GPIO')
| -rw-r--r-- | src/GPIO/GpioPorts.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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; |