More work towards SPI communication

Implemented most of the communication. Work left:
- Merging BinaryGCodeBuffer and StringGCodeBuffer back together into a
single class (see note in GCodes::DoFilePrint)
- Flagging completed codes via the message type in GCodes::HandleReply
- Implementation of the Linux lock/unlock requests + responses
- Setting object model values
- Testing everything with DCS

1 files changed, 1 insertions, 19 deletions

diff --git a/src/Storage/FileInfoParser.h b/src/Storage/FileInfoParser.h
index 4d8648df..496441aa 100644
--- a/src/Storage/FileInfoParser.h
+++ b/src/Storage/FileInfoParser.h
@@ -9,6 +9,7 @@
 #define SRC_STORAGE_FILEINFOPARSER_H_
 
 #include "RepRapFirmware.h"
+#include "GCodes/GCodeFileInfo.h"
 #include "RTOSIface/RTOSIface.h"
 
 const FilePosition GCODE_HEADER_SIZE = 20000uL;		// How many bytes to read from the header - I (DC) have a Kisslicer file with a layer height comment 14Kb from the start
@@ -27,25 +28,6 @@ const size_t GCODE_OVERLAP_SIZE = 100;				// Size of the overlapping buffer for
 const uint32_t MAX_FILEINFO_PROCESS_TIME = 200;		// Maximum time to spend polling for file info in each call
 const uint32_t MaxFileParseInterval = 4000;			// Maximum interval between repeat requests to parse a file
 
-// Struct to hold Gcode file information
-struct GCodeFileInfo
-{
-	FilePosition fileSize;
-	time_t lastModifiedTime;
-	float layerHeight;
-	float firstLayerHeight;
-	float objectHeight;
-	float filamentNeeded[MaxExtruders];
-	uint32_t printTime;
-	uint32_t simulatedTime;
-	unsigned int numFilaments;
-	bool isValid;
-	bool incomplete;
-	String<50> generatedBy;
-
-	void Init();
-};
-
 enum FileParseState
 {
 	notParsing,