diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-12-13 20:40:30 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-12-13 20:40:30 +0300 |
| commit | 2e0ac365cccfce0a9a0ef51d07471fd76092dcb5 (patch) | |
| tree | c01a7d91e8bf945834cb39b72b033cf48f71fc09 | |
| parent | a72cf81b4b4fd22b464dff59c4ca08a3b1df38fd (diff) | |
Event handler bug fixes
| -rw-r--r-- | src/GCodes/GCodes.cpp | 2 | ||||
| -rw-r--r-- | src/Platform/Event.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index 72ea8fb4..65ec9d22 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -558,7 +558,7 @@ bool GCodes::StartNextGCode(GCodeBuffer& gb, const StringRef& reply) noexcept { return DoFilePrint(gb, reply); } - else if (&gb == autoPauseGCode) + else if (&gb == autoPauseGCode && !gb.LatestMachineState().waitingForAcknowledgement) { if (Event::StartProcessing()) { diff --git a/src/Platform/Event.cpp b/src/Platform/Event.cpp index 5439bed7..d145ce66 100644 --- a/src/Platform/Event.cpp +++ b/src/Platform/Event.cpp @@ -92,9 +92,7 @@ inline Event::Event(Event *_ecv_null p_next, EventType et, uint16_t p_param, uin if (ep != nullptr && ep->isBeingProcessed) { vars.InsertNewParameter("D", ExpressionValue((int32_t)(ep->deviceNumber))); -#if SUPPORT_CAN_EXPANSION - vars.InsertNewParameter("B", ExpressionValue((int32_t)(ep->boardAddress))); -#endif + vars.InsertNewParameter("B", ExpressionValue((int32_t)(ep->boardAddress))); // always include B so that the same macros can be used on all Duets vars.InsertNewParameter("P", ExpressionValue((int32_t)(ep->param))); } } |