diff options
author | David Crocker <dcrocker@eschertech.com> | 2021-03-10 12:19:35 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2021-03-10 12:19:35 +0300 |
commit | 8b89aab7455a870574fed653738af5566e82beb3 (patch) | |
tree | cf76a26591d12b45f629cff8c3b025fd64ea53db /src/GCodes/GCodeMachineState.h | |
parent | dd4939d6c393fba1ba1c101ad848562998b5ea09 (diff) |
Implemented variables
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
-rw-r--r-- | src/GCodes/GCodeMachineState.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index 1fda630b..2ddc96d6 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -184,6 +184,7 @@ public: inline void AdvanceState() noexcept { state = static_cast<GCodeState>(static_cast<uint8_t>(state) + 1); } GCodeMachineState *GetPrevious() const noexcept { return previous; } + uint8_t GetBlockNesting() const noexcept { return blockNesting; } VariableSet variables; // local variables and parameters float feedRate; @@ -221,7 +222,6 @@ public: ; 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; @@ -247,7 +247,6 @@ public: BlockState& CurrentBlockState() noexcept; const BlockState& CurrentBlockState() const noexcept; int32_t GetIterations() const noexcept; - uint16_t CurrentBlockIndent() const noexcept { return CurrentBlockState().GetIndent(); } bool CreateBlock(uint16_t indentLevel) noexcept; void EndBlock() noexcept; @@ -255,6 +254,7 @@ public: private: GCodeMachineState *previous; const char *errorMessage; + uint8_t blockNesting; GCodeState state; GCodeResult stateMachineResult; // the worst status (ok, warning or error) that we encountered while running the state machine }; |