Version 1.16rc1

Merged in chrishamm's changes to support tmie stamping of uploaded files
(thanks chrishamm)
Added fan mapping in M563 command

1 files changed, 123 insertions, 0 deletions

diff --git a/src/Storage/FileData.h b/src/Storage/FileData.h
new file mode 100644
index 00000000..00c7e47f
--- /dev/null
+++ b/src/Storage/FileData.h
@@ -0,0 +1,123 @@
+/*
+ * FileData.h
+ *
+ *  Created on: 16 Sep 2016
+ *      Author: Christian
+ */
+
+#ifndef FILEDATA_H_
+#define FILEDATA_H_
+
+#include "FileStore.h"
+
+class FileGCodeInput;
+
+// Small class to hold an open file and data relating to it.
+// This is designed so that files are never left open and we never duplicate a file reference.
+class FileData
+{
+public:
+	friend class FileGCodeInput;
+
+	FileData() : f(NULL) {}
+
+	// Set this to refer to a newly-opened file
+	void Set(FileStore* pfile)
+	{
+		Close();	// close any existing file
+		f = pfile;
+	}
+
+	bool IsLive() const { return f != NULL; }
+
+	bool Close()
+	{
+		if (f != NULL)
+		{
+			bool ok = f->Close();
+			f = NULL;
+			return ok;
+		}
+		return false;
+	}
+
+	bool Read(char& b)
+	{
+		return f->Read(b);
+	}
+
+	int Read(char* buf, size_t nBytes)
+	{
+		return f->Read(buf, nBytes);
+	}
+
+	bool Write(char b)
+	{
+		return f->Write(b);
+	}
+
+	bool Write(const char *s, unsigned int len)
+	{
+		return f->Write(s, len);
+	}
+
+	bool Flush()
+	{
+		return f->Flush();
+	}
+
+	FilePosition GetPosition() const
+	{
+		return f->Position();
+	}
+
+	bool Seek(FilePosition position)
+	{
+		return f->Seek(position);
+	}
+
+	float FractionRead() const
+	{
+		return (f == NULL ? -1.0 : f->FractionRead());
+	}
+
+	FilePosition Length() const
+	{
+		return f->Length();
+	}
+
+	// Assignment operator
+	void CopyFrom(const FileData& other)
+	{
+		Close();
+		f = other.f;
+		if (f != NULL)
+		{
+			f->Duplicate();
+		}
+	}
+
+	// Move operator
+	void MoveFrom(FileData& other)
+	{
+		Close();
+		f = other.f;
+		other.Init();
+	}
+
+private:
+	FileStore *f;
+
+	void Init()
+	{
+		f = NULL;
+	}
+
+	// Private assignment operator to prevent us assigning these objects
+	FileData& operator=(const FileData&);
+
+	// Private copy constructor to prevent us copying these objects
+	FileData(const FileData&);
+};
+
+#endif