Created Platform and PrintMonitor folders within /src

20 files changed, 78 insertions, 78 deletions

diff --git a/src/GCodes/GCodeBuffer/BinaryParser.cpp b/src/GCodes/GCodeBuffer/BinaryParser.cpp
index 86ea38eb..d65334b4 100644
--- a/src/GCodes/GCodeBuffer/BinaryParser.cpp
+++ b/src/GCodes/GCodeBuffer/BinaryParser.cpp
@@ -11,8 +11,8 @@
 
 #include "GCodeBuffer.h"
 #include "ExpressionParser.h"
-#include <Platform.h>
-#include <RepRap.h>
+#include <Platform/Platform.h>
+#include <Platform/RepRap.h>
 #include <Networking/NetworkDefs.h>
 
 BinaryParser::BinaryParser(GCodeBuffer& gcodeBuffer) noexcept : gb(gcodeBuffer)
diff --git a/src/GCodes/GCodeBuffer/BinaryParser.h b/src/GCodes/GCodeBuffer/BinaryParser.h
index d10df9cb..a20b516b 100644
--- a/src/GCodes/GCodeBuffer/BinaryParser.h
+++ b/src/GCodes/GCodeBuffer/BinaryParser.h
@@ -13,7 +13,7 @@
 #if HAS_LINUX_INTERFACE
 
 #include <Linux/LinuxMessageFormats.h>
-#include <MessageType.h>
+#include <Platform/MessageType.h>
 #include <GCodes/GCodeException.h>
 
 class GCodeBuffer;
diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.cpp b/src/GCodes/GCodeBuffer/ExpressionParser.cpp
index 2a2f0586..13e18652 100644
--- a/src/GCodes/GCodeBuffer/ExpressionParser.cpp
+++ b/src/GCodes/GCodeBuffer/ExpressionParser.cpp
@@ -8,8 +8,8 @@
 #include "ExpressionParser.h"
 
 #include "GCodeBuffer.h"
-#include <RepRap.h>
-#include <Platform.h>
+#include <Platform/RepRap.h>
+#include <Platform/Platform.h>
 #include <General/NamedEnum.h>
 #include <General/NumericConverter.h>
 
diff --git a/src/GCodes/GCodeBuffer/GCodeBuffer.cpp b/src/GCodes/GCodeBuffer/GCodeBuffer.cpp
index 6b63afbf..f957a23f 100644
--- a/src/GCodes/GCodeBuffer/GCodeBuffer.cpp
+++ b/src/GCodes/GCodeBuffer/GCodeBuffer.cpp
@@ -17,8 +17,8 @@
 #include "BinaryParser.h"
 #include "StringParser.h"
 #include <GCodes/GCodeException.h>
-#include <RepRap.h>
-#include <Platform.h>
+#include <Platform/RepRap.h>
+#include <Platform/Platform.h>
 
 // Macros to reduce the amount of explicit conditional compilation in this file
 #if HAS_LINUX_INTERFACE
diff --git a/src/GCodes/GCodeBuffer/GCodeBuffer.h b/src/GCodes/GCodeBuffer/GCodeBuffer.h
index 9f7dcfc1..b4e721f4 100644
--- a/src/GCodes/GCodeBuffer/GCodeBuffer.h
+++ b/src/GCodes/GCodeBuffer/GCodeBuffer.h
@@ -11,13 +11,13 @@
 #include "BinaryParser.h"
 #include "StringParser.h"
 
-#include "RepRapFirmware.h"
-#include "GCodes/GCodeChannel.h"
-#include "GCodes/GCodeMachineState.h"
-#include "GCodes/GCodeResult.h"
-#include "Linux/LinuxMessageFormats.h"
-#include "MessageType.h"
-#include "ObjectModel/ObjectModel.h"
+#include <RepRapFirmware.h>
+#include <GCodes/GCodeChannel.h>
+#include <GCodes/GCodeMachineState.h>
+#include <GCodes/GCodeResult.h>
+#include <Linux/LinuxMessageFormats.h>
+#include <Platform/MessageType.h>
+#include <ObjectModel/ObjectModel.h>
 
 class FileGCodeInput;
 
diff --git a/src/GCodes/GCodeBuffer/StringParser.cpp b/src/GCodes/GCodeBuffer/StringParser.cpp
index 9e8ec5a5..2ebce1e2 100644
--- a/src/GCodes/GCodeBuffer/StringParser.cpp
+++ b/src/GCodes/GCodeBuffer/StringParser.cpp
@@ -12,8 +12,8 @@
 #include "ExpressionParser.h"
 
 #include <GCodes/GCodes.h>
-#include <Platform.h>
-#include <RepRap.h>
+#include <Platform/Platform.h>
+#include <Platform/RepRap.h>
 #include <General/StringBuffer.h>
 #include <Networking/NetworkDefs.h>
 
diff --git a/src/GCodes/GCodeBuffer/StringParser.h b/src/GCodes/GCodeBuffer/StringParser.h
index 496884de..e30de69a 100644
--- a/src/GCodes/GCodeBuffer/StringParser.h
+++ b/src/GCodes/GCodeBuffer/StringParser.h
@@ -11,7 +11,7 @@
 #include <RepRapFirmware.h>
 #include <GCodes/GCodeInput.h>
 #include <GCodes/GCodeMachineState.h>
-#include <MessageType.h>
+#include <Platform/MessageType.h>
 #include <ObjectModel/ObjectModel.h>
 #include <GCodes/GCodeException.h>
 #include <Networking/NetworkDefs.h>
diff --git a/src/GCodes/GCodeInput.cpp b/src/GCodes/GCodeInput.cpp
index 15cb9d2e..f5699419 100644
--- a/src/GCodes/GCodeInput.cpp
+++ b/src/GCodes/GCodeInput.cpp
@@ -7,7 +7,7 @@
 
 #include "GCodeInput.h"
 
-#include "RepRap.h"
+#include <Platform/RepRap.h>
 #include "GCodes.h"
 #include "GCodeBuffer/GCodeBuffer.h"
 
diff --git a/src/GCodes/GCodeInput.h b/src/GCodes/GCodeInput.h
index 625fd3a6..8c21f9e8 100644
--- a/src/GCodes/GCodeInput.h
+++ b/src/GCodes/GCodeInput.h
@@ -8,10 +8,10 @@
 #ifndef GCODEINPUT_H
 #define GCODEINPUT_H
 
-#include "RepRapFirmware.h"
-#include "Storage/FileData.h"
-#include "MessageType.h"
-#include "RTOSIface/RTOSIface.h"
+#include <RepRapFirmware.h>
+#include <Storage/FileData.h>
+#include <Platform/MessageType.h>
+#include <RTOSIface/RTOSIface.h>
 
 #include <Stream.h>
 
diff --git a/src/GCodes/GCodeMachineState.cpp b/src/GCodes/GCodeMachineState.cpp
index e2f3e9cc..e0868f08 100644
--- a/src/GCodes/GCodeMachineState.cpp
+++ b/src/GCodes/GCodeMachineState.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GCodeMachineState.h"
-#include "RepRap.h"
+#include <Platform/RepRap.h>
 
 #include <limits>
 
diff --git a/src/GCodes/GCodeQueue.cpp b/src/GCodes/GCodeQueue.cpp
index 53449991..7bba2ec7 100644
--- a/src/GCodes/GCodeQueue.cpp
+++ b/src/GCodes/GCodeQueue.cpp
@@ -7,10 +7,10 @@
 
 #include "GCodeQueue.h"
 
-#include "RepRap.h"
+#include <Platform/RepRap.h>
 #include "GCodes.h"
 #include "GCodeBuffer/GCodeBuffer.h"
-#include "Movement/Move.h"
+#include <Movement/Move.h>
 
 // GCodeQueue class
 
diff --git a/src/GCodes/GCodeResult.h b/src/GCodes/GCodeResult.h
index aa6ea33c..389356ff 100644
--- a/src/GCodes/GCodeResult.h
+++ b/src/GCodes/GCodeResult.h
@@ -9,7 +9,7 @@
 #define SRC_GCODES_GCODERESULT_H_
 
 #include <cctype>
-#include <MessageType.h>
+#include <Platform/MessageType.h>
 
 // Enumeration to specify the result of attempting to process a GCode command
 // These are ordered such that errors > warnings > ok
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp
index 3dcea262..8989d149 100644
--- a/src/GCodes/GCodes.cpp
+++ b/src/GCodes/GCodes.cpp
@@ -27,22 +27,22 @@
 
 #include "GCodeBuffer/GCodeBuffer.h"
 #include "GCodeQueue.h"
-#include "Heating/Heat.h"
-#include "Platform.h"
-#include "Movement/Move.h"
-#include "Scanner.h"
-#include "PrintMonitor.h"
-#include "RepRap.h"
-#include "Tasks.h"
-#include "Tools/Tool.h"
-#include "Endstops/ZProbe.h"
+#include <Heating/Heat.h>
+#include <Platform/Platform.h>
+#include <Movement/Move.h>
+#include <Platform/Scanner.h>
+#include <PrintMonitor/PrintMonitor.h>
+#include <Platform/RepRap.h>
+#include <Platform/Tasks.h>
+#include <Tools/Tool.h>
+#include <Endstops/ZProbe.h>
 
 #if SUPPORT_LED_STRIPS
 # include <Fans/LedStripDriver.h>
 #endif
 
 #if HAS_LINUX_INTERFACE
-# include "Linux/LinuxInterface.h"
+# include <Linux/LinuxInterface.h>
 #endif
 
 #if SUPPORT_REMOTE_COMMANDS
diff --git a/src/GCodes/GCodes.h b/src/GCodes/GCodes.h
index 7be1107d..63d74171 100644
--- a/src/GCodes/GCodes.h
+++ b/src/GCodes/GCodes.h
@@ -23,19 +23,19 @@ Licence: GPL
 #define GCODES_H
 
 #include "RepRapFirmware.h"
-#include "RepRap.h"			// for type ResponseSource
+#include <Platform/RepRap.h>			// for type ResponseSource
 #include "GCodeResult.h"
 #include "ObjectTracker.h"
-#include "Movement/RawMove.h"
-#include "Libraries/sha1/sha1.h"
-#include "Platform.h"		// for type EndStopHit
+#include <Movement/RawMove.h>
+#include <Libraries/sha1/sha1.h>
+#include <Platform/Platform.h>		// for type EndStopHit
 #include "GCodeChannel.h"
 #include "GCodeInput.h"
 #include "Trigger.h"
-#include "Tools/Filament.h"
-#include "FilamentMonitors/FilamentMonitor.h"
+#include <Tools/Filament.h>
+#include <FilamentMonitors/FilamentMonitor.h>
 #include "RestorePoint.h"
-#include "Movement/BedProbing/Grid.h"
+#include <Movement/BedProbing/Grid.h>
 
 const char feedrateLetter = 'F';						// GCode feedrate
 const char extrudeLetter = 'E'; 						// GCode extrude
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp
index 7f1f39f9..4d9c039a 100644
--- a/src/GCodes/GCodes2.cpp
+++ b/src/GCodes/GCodes2.cpp
@@ -14,24 +14,24 @@
 #include "GCodeQueue.h"
 #include "Heating/Heat.h"
 #if HAS_LINUX_INTERFACE
-# include "Linux/LinuxInterface.h"
+# include <Linux/LinuxInterface.h>
 #endif
-#include "Movement/Move.h"
-#include "Networking/Network.h"
-#include "Scanner.h"
-#include "PrintMonitor.h"
-#include "RepRap.h"
-#include "Tools/Tool.h"
-#include "Endstops/ZProbe.h"
-#include "FilamentMonitors/FilamentMonitor.h"
-#include "General/IP4String.h"
-#include "Movement/StepperDrivers/DriverMode.h"
+#include <Movement/Move.h>
+#include <Networking/Network.h>
+#include <Platform/Scanner.h>
+#include <PrintMonitor/PrintMonitor.h>
+#include <Platform/RepRap.h>
+#include <Tools/Tool.h>
+#include <Endstops/ZProbe.h>
+#include <FilamentMonitors/FilamentMonitor.h>
+#include <General/IP4String.h>
+#include <Movement/StepperDrivers/DriverMode.h>
 #include <Hardware/SoftwareReset.h>
 #include <Hardware/ExceptionHandlers.h>
-#include "Version.h"
+#include <Version.h>
 
 #if SUPPORT_IOBITS
-# include "PortControl.h"
+# include <Platform/PortControl.h>
 #endif
 
 #if HAS_WIFI_NETWORKING
@@ -39,7 +39,7 @@
 #endif
 
 #if SUPPORT_12864_LCD
-# include "Display/Display.h"
+# include <Display/Display.h>
 #endif
 
 #if SUPPORT_LED_STRIPS
@@ -56,7 +56,7 @@
 #endif
 
 #if HAS_MASS_STORAGE
-# include "Logger.h"
+# include <Platform/Logger.h>
 #endif
 
 #include <utility>			// for std::swap
diff --git a/src/GCodes/GCodes3.cpp b/src/GCodes/GCodes3.cpp
index 599caf83..79836356 100644
--- a/src/GCodes/GCodes3.cpp
+++ b/src/GCodes/GCodes3.cpp
@@ -10,27 +10,27 @@
 #include "GCodes.h"
 
 #include "GCodeBuffer/GCodeBuffer.h"
-#include "Heating/Heat.h"
-#include "Movement/Move.h"
-#include "RepRap.h"
-#include "Tools/Tool.h"
-#include "Endstops/ZProbe.h"
-#include "PrintMonitor.h"
-#include "Tasks.h"
-#include "Hardware/I2C.h"
+#include <Heating/Heat.h>
+#include <Movement/Move.h>
+#include <Platform/RepRap.h>
+#include <Tools/Tool.h>
+#include <Endstops/ZProbe.h>
+#include <PrintMonitor/PrintMonitor.h>
+#include <Platform/Tasks.h>
+#include <Hardware/I2C.h>
 
 #if HAS_WIFI_NETWORKING || HAS_AUX_DEVICES
 # include <Comms/FirmwareUpdater.h>
 #endif
 
 #if SUPPORT_TMC2660
-# include "Movement/StepperDrivers/TMC2660.h"
+# include <Movement/StepperDrivers/TMC2660.h>
 #endif
 #if SUPPORT_TMC22xx
-# include "Movement/StepperDrivers/TMC22xx.h"
+# include <Movement/StepperDrivers/TMC22xx.h>
 #endif
 #if SUPPORT_TMC51xx
-# include "Movement/StepperDrivers/TMC51xx.h"
+# include <Movement/StepperDrivers/TMC51xx.h>
 #endif
 
 #if SUPPORT_CAN_EXPANSION
diff --git a/src/GCodes/GCodes4.cpp b/src/GCodes/GCodes4.cpp
index a3ac2c51..6098b97b 100644
--- a/src/GCodes/GCodes4.cpp
+++ b/src/GCodes/GCodes4.cpp
@@ -2,11 +2,11 @@
 
 #include "GCodes.h"
 #include "GCodeBuffer/GCodeBuffer.h"
-#include "RepRap.h"
-#include "Movement/Move.h"
-#include "Tools/Tool.h"
-#include "Heating/Heat.h"
-#include "Endstops/ZProbe.h"
+#include <Platform/RepRap.h>
+#include <Movement/Move.h>
+#include <Tools/Tool.h>
+#include <Heating/Heat.h>
+#include <Endstops/ZProbe.h>
 
 #if HAS_WIFI_NETWORKING || HAS_AUX_DEVICES
 # include <Comms/FirmwareUpdater.h>
diff --git a/src/GCodes/ObjectTracker.cpp b/src/GCodes/ObjectTracker.cpp
index 6c19b12a..69a25f3f 100644
--- a/src/GCodes/ObjectTracker.cpp
+++ b/src/GCodes/ObjectTracker.cpp
@@ -7,7 +7,7 @@
 
 #include "ObjectTracker.h"
 #include <GCodes/GCodeBuffer/GCodeBuffer.h>
-#include <RepRap.h>
+#include <Platform/RepRap.h>
 #include "GCodes.h"
 
 #if TRACK_OBJECT_NAMES
diff --git a/src/GCodes/RestorePoint.cpp b/src/GCodes/RestorePoint.cpp
index 559e7be6..7ba04a31 100644
--- a/src/GCodes/RestorePoint.cpp
+++ b/src/GCodes/RestorePoint.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RestorePoint.h"
-#include <RepRap.h>
+#include <Platform/RepRap.h>
 #include <GCodes/GCodes.h>
 
 #if SUPPORT_OBJECT_MODEL
diff --git a/src/GCodes/Trigger.cpp b/src/GCodes/Trigger.cpp
index 7383e7e9..86bd5893 100644
--- a/src/GCodes/Trigger.cpp
+++ b/src/GCodes/Trigger.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "Trigger.h"
-#include "RepRap.h"
+#include <Platform/RepRap.h>
 #include "GCodes.h"
-#include "PrintMonitor.h"
+#include <PrintMonitor/PrintMonitor.h>
 #include "GCodeBuffer/GCodeBuffer.h"
 
 Trigger::Trigger() noexcept : condition(0)