diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-03-06 21:42:25 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-03-06 21:42:25 +0300 |
| commit | 4cf8ed602d836ff2846786ed287f72ca5b4bb709 (patch) | |
| tree | 20e135cae914ee2fcdd798033d6bb8b69ee961da /src/GCodes/GCodeMachineState.h | |
| parent | 0e34efd380543cbcf86ff077d3a820b7e9c15c9b (diff) | |
Started adding support for variables and parameters
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
| -rw-r--r-- | src/GCodes/GCodeMachineState.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index 96b17d5c..1fda630b 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -13,6 +13,7 @@ #include <General/FreelistManager.h> #include <General/NamedEnum.h> #include <GCodes/GCodeResult.h> +#include <GCodes/Variable.h> // Enumeration to list all the possible states that the Gcode processing machine may be in enum class GCodeState : uint8_t @@ -184,12 +185,13 @@ public: GCodeMachineState *GetPrevious() const noexcept { return previous; } + VariableSet variables; // local variables and parameters float feedRate; #if HAS_MASS_STORAGE FileData fileState; #endif #if HAS_LINUX_INTERFACE - FileId fileId; // virtual ID to distinguish files in different stack levels (only unique per GB) + FileId fileId; // virtual ID to distinguish files in different stack levels (only unique per GB) #endif ResourceBitmap lockedResources; BlockState blockStates[MaxBlockIndent]; @@ -209,7 +211,8 @@ public: usingInches : 1, // true if units are inches not mm waitingForAcknowledgement : 1, messageAcknowledged : 1, - messageCancelled : 1 + messageCancelled : 1, + localPush : 1 // true if this stack frame was created by M120, so we use the parent variables #if HAS_LINUX_INTERFACE , lastCodeFromSbc : 1, macroStartedByCode : 1, |