diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-05-19 10:55:27 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-05-19 10:55:27 +0300 |
| commit | a7df20f42cda081c53ef052240369a3c48759227 (patch) | |
| tree | 68fcc17f246ecbb027c8c9be0dd4c53b7e082404 /src/GCodes/GCodes2.cpp | |
| parent | ec8cd18f80bf011b018c4a059c86a8578018ed6d (diff) | |
| parent | 167b119185ff72d395bddb90aa75d33e6fb80341 (diff) | |
Merge branch '3.4-dev' into 3.4-input-shaping
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 dc5eecea..cc5940d6 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 } } |