diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-08-16 17:47:24 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-08-16 17:47:24 +0300 |
| commit | ed937836566b766a9066547e0b3be863a4f7260b (patch) | |
| tree | b71703e2905d28fad6bf5c8808d160347979d4a3 /src/GCodes/GCodeMachineState.h | |
| parent | c6940b6da038000285250accbe287738cb5e0db0 (diff) | |
| parent | 71014add98c00e3cbb50703c646bde7da0b32baa (diff) | |
Merge branch '3.4-dev' into 3.4-nosdcard3.4-nosdcard3.4-dev-no-input-shaping
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
| -rw-r--r-- | src/GCodes/GCodeMachineState.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index eb388738..edf64e5f 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -69,11 +69,12 @@ enum class GCodeState : uint8_t resuming2, resuming3, + cancelling, + flashing1, flashing2, stoppingWithHeatersOff, - stoppingWithHeatersOn, // These next 9 must be contiguous gridProbing1, |