diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-05-19 10:54:52 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-05-19 10:54:52 +0300 |
| commit | 167b119185ff72d395bddb90aa75d33e6fb80341 (patch) | |
| tree | 489048c4e55380f68c25bf481d834db2aa6b81c4 /src/GCodes/GCodes2.cpp | |
| parent | 4d42a06de0aa2a9e7cb38007577c157553fa8b0f (diff) | |
| parent | 07a3c744f0ec55be9a2097389db9b99124171525 (diff) | |
Merge branch '3.3-dev' into 3.4-dev
Diffstat (limited to 'src/GCodes/GCodes2.cpp')
| -rw-r--r-- | src/GCodes/GCodes2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index a84497d4..b89c9e25 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -2498,10 +2498,10 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx gb.SetState(GCodeState::waitingForAcknowledgement); } #endif - if (Push(gb, true)) // stack the machine state including the file position + if (Push(gb, true)) // stack the machine state including the file position { - UnlockMovement(gb); // allow movement so that e.g. an SD card print can call M291 and then DWC or PanelDue can be used to jog axes - gb.WaitForAcknowledgement(); // flag that we are waiting for acknowledgement + UnlockMovement(gb); // allow movement so that e.g. an SD card print can call M291 and then DWC or PanelDue can be used to jog axes + gb.WaitForAcknowledgement(); // flag that we are waiting for acknowledgement } } |