Started work on conditional GCode

Implemented the basic language constructs for conditional GCode. As part of this, improved the interface between the GCodeBuffer class and the various GCode input streams.
Created file GCodes4.cpp and moved the state machine implementation into it.

1 files changed, 22 insertions, 2 deletions

diff --git a/src/GCodes/GCodeMachineState.cpp b/src/GCodes/GCodeMachineState.cpp
index be73242a..a993572e 100644
--- a/src/GCodes/GCodeMachineState.cpp
+++ b/src/GCodes/GCodeMachineState.cpp
@@ -12,10 +12,11 @@ unsigned int GCodeMachineState::numAllocated = 0;
 
 // Create a default initialised GCodeMachineState
 GCodeMachineState::GCodeMachineState()
-	: previous(nullptr), feedRate(DefaultFeedRate * SecondsToMinutes), fileState(), lockedResources(0), errorMessage(nullptr), state(GCodeState::normal),
+	: previous(nullptr), feedRate(DefaultFeedRate * SecondsToMinutes), fileState(), lockedResources(0), errorMessage(nullptr), lineNumber(0),
 	  drivesRelative(false), axesRelative(false), doingFileMacro(false), runningM501(false), runningM502(false),
 	  volumetricExtrusion(false), g53Active(false), runningSystemMacro(false), usingInches(false),
-	  waitingForAcknowledgement(false), messageAcknowledged(false)
+	  waitingForAcknowledgement(false), messageAcknowledged(false),
+	  indentLevel(0), state(GCodeState::normal)
 {
 }
 
@@ -55,4 +56,23 @@ GCodeMachineState::GCodeMachineState()
 	return inUse;
 }
 
+GCodeMachineState::BlockState& GCodeMachineState::CurrentBlockState()
+{
+	return blockStates[min<size_t>(indentLevel, ARRAY_SIZE(blockStates) - 1)];
+}
+
+void GCodeMachineState::CreateBlock()
+{
+	++indentLevel;
+	CurrentBlockState().SetPlainBlock();
+}
+
+void GCodeMachineState::EndBlock()
+{
+	if (indentLevel != 0)
+	{
+		--indentLevel;
+	}
+}
+
 // End