Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2020-10-26 12:51:26 +0300
committerDavid Crocker <dcrocker@eschertech.com>2020-10-26 12:51:26 +0300
commit4aa0d32ed3d173588e1b700ff253e1959461bf00 (patch)
treee613297abf98593d219ca5b3fe337ef8bb66cf03 /src/GCodes/GCodeMachineState.h
parentaf1cc41faf492fedd93cf00c2159cb358108c52a (diff)
Implemented filament-error macro files
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
-rw-r--r--src/GCodes/GCodeMachineState.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h
index 2a11e0d0..0c45552b 100644
--- a/src/GCodes/GCodeMachineState.h
+++ b/src/GCodes/GCodeMachineState.h
@@ -52,6 +52,9 @@ enum class GCodeState : uint8_t
filamentChangePause1,
filamentChangePause2,
+ filamentErrorPause1,
+ filamentErrorPause2,
+
resuming1,
resuming2,
resuming3,
@@ -184,7 +187,6 @@ public:
BlockState blockStates[MaxBlockIndent];
uint32_t lineNumber;
- Compatibility compatibility;
uint32_t
drivesRelative : 1,
axesRelative : 1,
@@ -209,7 +211,9 @@ public:
messageAcknowledged : 1,
messageCancelled : 1;
+ Compatibility compatibility;
uint8_t blockNesting;
+ uint16_t stateParameter; // a parameter, the meaning of which depends on what state we are in
bool DoingFile() const noexcept;
void CloseFile() noexcept;