diff options
author | David Crocker <dcrocker@eschertech.com> | 2019-03-03 23:10:52 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2019-03-03 23:10:52 +0300 |
commit | d57f9776902f6bd64405a757f11c95e43b890171 (patch) | |
tree | 3d22f9e87ad207ed130087e1e1eb96b24445b83b /src/GCodes/GCodeBuffer.cpp | |
parent | d9f051b6c658fa278b22535a8bd03d124bcf8fad (diff) |
Refectored DDARing and other changes
Added class DDARing to allow more than one DDA ring to be active
When a system macro is running, apply tool offsets again (but don't apply workplace coordinate offsets)
M591 no longer waits for movement to stop, unless axis jog buttons are requested
When switching a tool to standby, don't set its heaters to standby if they are active heaters for the current tool
Diffstat (limited to 'src/GCodes/GCodeBuffer.cpp')
-rw-r--r-- | src/GCodes/GCodeBuffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GCodes/GCodeBuffer.cpp b/src/GCodes/GCodeBuffer.cpp index 5f64d6c7..337e1bc8 100644 --- a/src/GCodes/GCodeBuffer.cpp +++ b/src/GCodes/GCodeBuffer.cpp @@ -416,7 +416,7 @@ void GCodeBuffer::SetFinished(bool f) } else { - machineState->useMachineCoordinates = false; // G53 does not persist beyond the current line + machineState->g53Active = false; // G53 does not persist beyond the current line Init(); } } @@ -1014,8 +1014,8 @@ bool GCodeBuffer::PushState() ms->runningM501 = machineState->runningM501; ms->runningM502 = machineState->runningM502; ms->volumetricExtrusion = false; - ms->useMachineCoordinates = false; - ms->useMachineCoordinatesSticky = machineState->useMachineCoordinatesSticky || machineState->useMachineCoordinates; + ms->g53Active = false; + ms->runningSystemMacro = machineState->runningSystemMacro; ms->messageAcknowledged = false; ms->waitingForAcknowledgement = false; machineState = ms; |