diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-03-04 22:38:47 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-03-04 22:38:47 +0300 |
| commit | 44419feb34c968c5e87574099290b6f89bc8e97b (patch) | |
| tree | 79d1ca39b9ac04c9d23bd932c9c00bffc077e8cd /src | |
| parent | ce2e74bc10a7ee558bfb2e7dcac3e8352ac253c5 (diff) | |
Created Platform and PrintMonitor folders within /src
Diffstat (limited to 'src')
164 files changed, 502 insertions, 531 deletions
diff --git a/src/CAN/CanInterface.cpp b/src/CAN/CanInterface.cpp index 87e84b35..3182e457 100644 --- a/src/CAN/CanInterface.cpp +++ b/src/CAN/CanInterface.cpp @@ -17,7 +17,7 @@ #include <Movement/DriveMovement.h> #include <Movement/StepTimer.h> #include <RTOSIface/RTOSIface.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> #include <GCodes/GCodeException.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> diff --git a/src/CAN/CanInterface.h b/src/CAN/CanInterface.h index 68dd1993..46101b5c 100644 --- a/src/CAN/CanInterface.h +++ b/src/CAN/CanInterface.h @@ -12,8 +12,8 @@ #if SUPPORT_CAN_EXPANSION -#include "GCodes/GCodeResult.h" -#include "MessageType.h" +#include <GCodes/GCodeResult.h> +#include <Platform/MessageType.h> #include <CanId.h> #include <CanMessageFormats.h> diff --git a/src/CAN/CommandProcessor.cpp b/src/CAN/CommandProcessor.cpp index d133dfe7..b1050448 100644 --- a/src/CAN/CommandProcessor.cpp +++ b/src/CAN/CommandProcessor.cpp @@ -11,9 +11,9 @@ #include "CanInterface.h" #include <CanMessageBuffer.h> -#include "RepRap.h" -#include "Platform.h" -#include "Heating/Heat.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Heating/Heat.h> #include "ExpansionManager.h" #ifndef DUET3_ATE @@ -22,13 +22,13 @@ # include <Version.h> # 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 #endif diff --git a/src/CAN/ExpansionManager.cpp b/src/CAN/ExpansionManager.cpp index 5c5931e4..e4daa1b4 100644 --- a/src/CAN/ExpansionManager.cpp +++ b/src/CAN/ExpansionManager.cpp @@ -10,8 +10,8 @@ #if SUPPORT_CAN_EXPANSION #include <CAN/CanInterface.h> -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> ExpansionBoardData::ExpansionBoardData() noexcept : typeName(nullptr), state(BoardState::unknown), numDrivers(0) diff --git a/src/Comms/AuxDevice.cpp b/src/Comms/AuxDevice.cpp index f234b5f6..babc9d2d 100644 --- a/src/Comms/AuxDevice.cpp +++ b/src/Comms/AuxDevice.cpp @@ -8,8 +8,8 @@ #include "AuxDevice.h" #if HAS_AUX_DEVICES -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> AuxDevice::AuxDevice() noexcept : uart(nullptr), seq(0), enabled(false), raw(true) { diff --git a/src/Comms/AuxDevice.h b/src/Comms/AuxDevice.h index 8a2f4a0b..66167ad6 100644 --- a/src/Comms/AuxDevice.h +++ b/src/Comms/AuxDevice.h @@ -10,7 +10,7 @@ #include <RepRapFirmware.h> #if HAS_AUX_DEVICES -#include <OutputMemory.h> +#include <Platform/OutputMemory.h> #include <RTOSIface/RTOSIface.h> class AuxDevice diff --git a/src/Comms/FirmwareUpdater.cpp b/src/Comms/FirmwareUpdater.cpp index 8b60378b..3d7d2de7 100644 --- a/src/Comms/FirmwareUpdater.cpp +++ b/src/Comms/FirmwareUpdater.cpp @@ -7,18 +7,18 @@ #include "FirmwareUpdater.h" -#include "RepRapFirmware.h" -#include "Platform.h" -#include "RepRap.h" -#include "GCodes/GCodes.h" +#include <RepRapFirmware.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <GCodes/GCodes.h> #if HAS_WIFI_NETWORKING -# include "Network.h" -# include "ESP8266WiFi/WifiFirmwareUploader.h" +# include <Networking/Network.h> +# include <Networking/ESP8266WiFi/WifiFirmwareUploader.h> #endif #if HAS_AUX_DEVICES -# include "Comms/PanelDueUpdater.h" +# include <Comms/PanelDueUpdater.h> #endif namespace FirmwareUpdater diff --git a/src/Comms/PanelDueUpdater.cpp b/src/Comms/PanelDueUpdater.cpp index 373b9156..9b0da7a0 100644 --- a/src/Comms/PanelDueUpdater.cpp +++ b/src/Comms/PanelDueUpdater.cpp @@ -9,8 +9,8 @@ #if HAS_AUX_DEVICES -#include <Platform.h> -#include <RepRap.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> class AuxSerialPort : public SerialPort { diff --git a/src/Display/Menu.cpp b/src/Display/Menu.cpp index 55bbf906..92ff340e 100644 --- a/src/Display/Menu.cpp +++ b/src/Display/Menu.cpp @@ -70,13 +70,13 @@ #if SUPPORT_12864_LCD #include "Lcd/Lcd.h" -#include "RepRap.h" -#include "Platform.h" -#include "Display/Display.h" -#include "GCodes/GCodes.h" -#include "Heating/Heat.h" -#include "Storage/MassStorage.h" -#include "Tools/Tool.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include "Display.h" +#include <GCodes/GCodes.h> +#include <Heating/Heat.h> +#include <Storage/MassStorage.h> +#include <Tools/Tool.h> const uint32_t InactivityTimeout = 20000; // inactivity timeout const uint32_t ErrorTimeout = 6000; // how long we display an error message for diff --git a/src/Display/MenuItem.cpp b/src/Display/MenuItem.cpp index f245b8f5..2dbfbee6 100644 --- a/src/Display/MenuItem.cpp +++ b/src/Display/MenuItem.cpp @@ -9,19 +9,19 @@ #if SUPPORT_12864_LCD -#include "RepRap.h" -#include "Heating/Heat.h" -#include "Platform.h" -#include "GCodes/GCodes.h" -#include "Movement/Move.h" +#include <Platform/RepRap.h> +#include <Heating/Heat.h> +#include <Platform/Platform.h> +#include <GCodes/GCodes.h> +#include <Movement/Move.h> #include "Display.h" -#include "Tools/Tool.h" -#include "PrintMonitor.h" +#include <Tools/Tool.h> +#include <PrintMonitor/PrintMonitor.h> #ifdef __LPC17xx__ # include "Network.h" #else -# include "Networking/Network.h" +# include <Networking/Network.h> #endif MenuItem::MenuItem(PixelNumber r, PixelNumber c, PixelNumber w, Alignment a, FontNumber fn, Visibility vis) noexcept diff --git a/src/DuetNG/DueXn.cpp b/src/DuetNG/DueXn.cpp index fd902e8f..4706f7ba 100644 --- a/src/DuetNG/DueXn.cpp +++ b/src/DuetNG/DueXn.cpp @@ -7,11 +7,11 @@ #include "DueXn.h" #include "SX1509.h" -#include "Platform.h" -#include "RepRap.h" -#include "Wire.h" -#include "Hardware/I2C.h" -#include <TaskPriorities.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Wire.h> +#include <Hardware/I2C.h> +#include <Platform/TaskPriorities.h> #include <Interrupts.h> namespace DuetExpansion diff --git a/src/DuetNG/DueXn.h b/src/DuetNG/DueXn.h index 22efdb36..82cabcdd 100644 --- a/src/DuetNG/DueXn.h +++ b/src/DuetNG/DueXn.h @@ -8,9 +8,9 @@ #ifndef SRC_DUETNG_DUEXN_H_ #define SRC_DUETNG_DUEXN_H_ -#include "ecv.h" -#include "CoreIO.h" -#include "MessageType.h" +#include <ecv.h> +#include <CoreIO.h> +#include <Platform/MessageType.h> enum class ExpansionBoardType : uint8_t { diff --git a/src/DuetNG/SX1509.cpp b/src/DuetNG/SX1509.cpp index 208cf35b..4c6e4738 100644 --- a/src/DuetNG/SX1509.cpp +++ b/src/DuetNG/SX1509.cpp @@ -21,11 +21,11 @@ local, and you've found our code helpful, please buy us a round! Distributed as-is; no warranty is given. ******************************************************************************/ -#include "RepRapFirmware.h" -#include "Tasks.h" +#include <RepRapFirmware.h> +#include <Platform/Tasks.h> #include "SX1509.h" #include "SX1509Registers.h" -#include "Hardware/I2C.h" +#include <Hardware/I2C.h> #include <Interrupts.h> SX1509::SX1509() noexcept : _clkX(0) diff --git a/src/Endstops/EndstopsManager.cpp b/src/Endstops/EndstopsManager.cpp index 8456d41e..f010711d 100644 --- a/src/Endstops/EndstopsManager.cpp +++ b/src/Endstops/EndstopsManager.cpp @@ -16,11 +16,11 @@ #include "LocalZProbe.h" #include "RemoteZProbe.h" -#include "RepRap.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "GCodes/GCodes.h" -#include "Movement/Move.h" -#include <OutputMemory.h> +#include <Platform/RepRap.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <GCodes/GCodes.h> +#include <Movement/Move.h> +#include <Platform/OutputMemory.h> #include <Heating/Heat.h> #include <Heating/Sensors/TemperatureSensor.h> diff --git a/src/Endstops/LocalZProbe.cpp b/src/Endstops/LocalZProbe.cpp index adcca05e..98b8a94e 100644 --- a/src/Endstops/LocalZProbe.cpp +++ b/src/Endstops/LocalZProbe.cpp @@ -7,9 +7,9 @@ #include "LocalZProbe.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "RepRap.h" -#include "Platform.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <AnalogIn.h> using diff --git a/src/Endstops/RemoteZProbe.cpp b/src/Endstops/RemoteZProbe.cpp index 21ecf08e..f53014c5 100644 --- a/src/Endstops/RemoteZProbe.cpp +++ b/src/Endstops/RemoteZProbe.cpp @@ -12,8 +12,8 @@ #include <CanMessageBuffer.h> #include <CAN/CanInterface.h> #include <CAN/CanMessageGenericConstructor.h> -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> // Members of class RemoteZProbe diff --git a/src/Endstops/StallDetectionEndstop.cpp b/src/Endstops/StallDetectionEndstop.cpp index 987c6b48..194aa42b 100644 --- a/src/Endstops/StallDetectionEndstop.cpp +++ b/src/Endstops/StallDetectionEndstop.cpp @@ -9,8 +9,8 @@ #if HAS_STALL_DETECT -#include "Platform.h" -#include "Movement/Kinematics/Kinematics.h" +#include <Platform/Platform.h> +#include <Movement/Kinematics/Kinematics.h> // Stall detection endstop StallDetectionEndstop::StallDetectionEndstop(uint8_t p_axis, EndStopPosition pos, bool p_individualMotors) noexcept diff --git a/src/Endstops/SwitchEndstop.cpp b/src/Endstops/SwitchEndstop.cpp index 63716235..655c4eb9 100644 --- a/src/Endstops/SwitchEndstop.cpp +++ b/src/Endstops/SwitchEndstop.cpp @@ -7,16 +7,16 @@ #include <Endstops/SwitchEndstop.h> -#include "RepRap.h" -#include "Platform.h" -#include "Movement/Kinematics/Kinematics.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Movement/Kinematics/Kinematics.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_CAN_EXPANSION -# include "CanId.h" -# include "CanMessageBuffer.h" -# include "CanMessageFormats.h" -# include "CAN/CanInterface.h" +# include <CanId.h> +# include <CanMessageBuffer.h> +# include <CanMessageFormats.h> +# include <CAN/CanInterface.h> #endif // Switch endstop diff --git a/src/Endstops/ZProbe.cpp b/src/Endstops/ZProbe.cpp index e1dfbcb6..012d07f8 100644 --- a/src/Endstops/ZProbe.cpp +++ b/src/Endstops/ZProbe.cpp @@ -6,12 +6,12 @@ */ #include "ZProbe.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodes.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Storage/FileStore.h" -#include "Heating/Heat.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodes.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Storage/FileStore.h> +#include <Heating/Heat.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Endstops/ZProbeEndstop.cpp b/src/Endstops/ZProbeEndstop.cpp index bd02d813..816f6e3b 100644 --- a/src/Endstops/ZProbeEndstop.cpp +++ b/src/Endstops/ZProbeEndstop.cpp @@ -8,9 +8,9 @@ #include "ZProbeEndstop.h" #include "ZProbe.h" -#include "RepRap.h" -#include "Platform.h" -#include "Movement/Kinematics/Kinematics.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Movement/Kinematics/Kinematics.h> // Z probe endstop ZProbeEndstop::ZProbeEndstop(uint8_t p_axis, EndStopPosition pos) noexcept : Endstop(p_axis, pos), zProbeNumber(0) diff --git a/src/Fans/Fan.cpp b/src/Fans/Fan.cpp index 31ab7c6d..9573f0a6 100644 --- a/src/Fans/Fan.cpp +++ b/src/Fans/Fan.cpp @@ -6,7 +6,7 @@ */ #include "Fan.h" -#include <RepRap.h> +#include <Platform/RepRap.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Fans/FansManager.cpp b/src/Fans/FansManager.cpp index dea10be7..4f47c258 100644 --- a/src/Fans/FansManager.cpp +++ b/src/Fans/FansManager.cpp @@ -9,7 +9,7 @@ #include "LocalFan.h" #include "RemoteFan.h" -#include <RepRap.h> +#include <Platform/RepRap.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_CAN_EXPANSION diff --git a/src/Fans/LedStripDriver.cpp b/src/Fans/LedStripDriver.cpp index 378d2c58..9c346bc8 100644 --- a/src/Fans/LedStripDriver.cpp +++ b/src/Fans/LedStripDriver.cpp @@ -11,7 +11,7 @@ #include <GCodes/GCodeBuffer/GCodeBuffer.h> #include <Movement/StepTimer.h> -#include <RepRap.h> +#include <Platform/RepRap.h> #include <GCodes/GCodes.h> #if LEDSTRIP_USES_USART diff --git a/src/Fans/LocalFan.cpp b/src/Fans/LocalFan.cpp index 8b80de5c..eb461670 100644 --- a/src/Fans/LocalFan.cpp +++ b/src/Fans/LocalFan.cpp @@ -6,13 +6,13 @@ */ #include "LocalFan.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Hardware/IoPorts.h" -#include "Movement/StepTimer.h" -#include "RepRap.h" -#include "Platform.h" -#include "Heating/Heat.h" -#include "Heating/Sensors/TemperatureSensor.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Hardware/IoPorts.h> +#include <Movement/StepTimer.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Heating/Heat.h> +#include <Heating/Sensors/TemperatureSensor.h> void FanInterrupt(CallbackParameter cb) noexcept { diff --git a/src/FilamentMonitors/Duet3DFilamentMonitor.cpp b/src/FilamentMonitors/Duet3DFilamentMonitor.cpp index 4e049452..41c957c9 100644 --- a/src/FilamentMonitors/Duet3DFilamentMonitor.cpp +++ b/src/FilamentMonitors/Duet3DFilamentMonitor.cpp @@ -21,10 +21,10 @@ */ #include "Duet3DFilamentMonitor.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Platform.h" -#include "Movement/StepTimer.h" -#include "RepRap.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Platform/Platform.h> +#include <Movement/StepTimer.h> +#include <Platform/RepRap.h> // Constructors Duet3DFilamentMonitor::Duet3DFilamentMonitor(unsigned int extruder, unsigned int p_type) noexcept diff --git a/src/FilamentMonitors/FilamentMonitor.cpp b/src/FilamentMonitors/FilamentMonitor.cpp index 38ca4b47..11835933 100644 --- a/src/FilamentMonitors/FilamentMonitor.cpp +++ b/src/FilamentMonitors/FilamentMonitor.cpp @@ -10,11 +10,11 @@ #include "RotatingMagnetFilamentMonitor.h" #include "LaserFilamentMonitor.h" #include "PulsedFilamentMonitor.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/Move.h" -#include "PrintMonitor.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/Move.h> +#include <PrintMonitor/PrintMonitor.h> #if SUPPORT_CAN_EXPANSION # include <CAN/CanInterface.h> diff --git a/src/FilamentMonitors/FilamentMonitor.h b/src/FilamentMonitors/FilamentMonitor.h index 454a0fc9..8148c9d0 100644 --- a/src/FilamentMonitors/FilamentMonitor.h +++ b/src/FilamentMonitors/FilamentMonitor.h @@ -8,12 +8,12 @@ #ifndef SRC_FILAMENTSENSORS_FILAMENTMONITOR_H_ #define SRC_FILAMENTSENSORS_FILAMENTMONITOR_H_ -#include "RepRapFirmware.h" -#include "Hardware/IoPorts.h" -#include "MessageType.h" +#include <RepRapFirmware.h> +#include <Hardware/IoPorts.h> +#include <Platform/MessageType.h> #include "GCodes/GCodeResult.h" #include <ObjectModel/ObjectModel.h> -#include "RTOSIface/RTOSIface.h" +#include <RTOSIface/RTOSIface.h> #if defined(DUET3) || defined(DUET3MINI) # include <Duet3Common.h> diff --git a/src/FilamentMonitors/LaserFilamentMonitor.cpp b/src/FilamentMonitors/LaserFilamentMonitor.cpp index 117aee4a..206dcae9 100644 --- a/src/FilamentMonitors/LaserFilamentMonitor.cpp +++ b/src/FilamentMonitors/LaserFilamentMonitor.cpp @@ -6,10 +6,10 @@ */ #include "LaserFilamentMonitor.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Platform.h" -#include "RepRap.h" -#include "Movement/Move.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Movement/Move.h> // Unless we set the option to compare filament on all type of move, we reject readings if the last retract or reprime move wasn't completed // well before the start bit was received. This is because those moves have high accelerations and decelerations, so the measurement delay diff --git a/src/FilamentMonitors/PulsedFilamentMonitor.cpp b/src/FilamentMonitors/PulsedFilamentMonitor.cpp index 616fa846..3c865593 100644 --- a/src/FilamentMonitors/PulsedFilamentMonitor.cpp +++ b/src/FilamentMonitors/PulsedFilamentMonitor.cpp @@ -6,10 +6,10 @@ */ #include "PulsedFilamentMonitor.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Platform.h" -#include "RepRap.h" -#include "Movement/Move.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Movement/Move.h> // Unless we set the option to compare filament on all type of move, we reject readings if the last retract or reprime move wasn't completed // well before the start bit was received. This is because those moves have high accelerations and decelerations, so the measurement delay diff --git a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp index abbad96a..2c5b99f5 100644 --- a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp +++ b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp @@ -6,10 +6,10 @@ */ #include "RotatingMagnetFilamentMonitor.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Platform.h" -#include "RepRap.h" -#include "Movement/Move.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Movement/Move.h> // Unless we set the option to compare filament on all type of move, we reject readings if the last retract or reprime move wasn't completed // well before the start bit was received. This is because those moves have high accelerations and decelerations, so the measurement delay diff --git a/src/FilamentMonitors/SimpleFilamentMonitor.cpp b/src/FilamentMonitors/SimpleFilamentMonitor.cpp index 677ce29e..f8cf7892 100644 --- a/src/FilamentMonitors/SimpleFilamentMonitor.cpp +++ b/src/FilamentMonitors/SimpleFilamentMonitor.cpp @@ -6,9 +6,9 @@ */ #include "SimpleFilamentMonitor.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_OBJECT_MODEL 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) diff --git a/src/GPIO/GpInPort.cpp b/src/GPIO/GpInPort.cpp index e71c1d82..1d6094d9 100644 --- a/src/GPIO/GpInPort.cpp +++ b/src/GPIO/GpInPort.cpp @@ -7,8 +7,8 @@ #include "GpInPort.h" #include <GCodes/GCodeBuffer/GCodeBuffer.h> -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #if SUPPORT_CAN_EXPANSION # include <CAN/CanInterface.h> diff --git a/src/GPIO/GpOutPort.cpp b/src/GPIO/GpOutPort.cpp index 22729e53..f76daa54 100644 --- a/src/GPIO/GpOutPort.cpp +++ b/src/GPIO/GpOutPort.cpp @@ -7,8 +7,8 @@ #include "GpOutPort.h" #include <GCodes/GCodeBuffer/GCodeBuffer.h> -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #if SUPPORT_CAN_EXPANSION # include <CAN/CanInterface.h> diff --git a/src/Hardware/ExceptionHandlers.cpp b/src/Hardware/ExceptionHandlers.cpp index 1dda86ee..24a25bba 100644 --- a/src/Hardware/ExceptionHandlers.cpp +++ b/src/Hardware/ExceptionHandlers.cpp @@ -6,8 +6,8 @@ */ #include "ExceptionHandlers.h" -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <Hardware/NonVolatileMemory.h> #include <Cache.h> #if SAME70 || SAM4S || SAM4E diff --git a/src/Hardware/I2C.cpp b/src/Hardware/I2C.cpp index 50db157b..55005f13 100644 --- a/src/Hardware/I2C.cpp +++ b/src/Hardware/I2C.cpp @@ -6,7 +6,7 @@ */ #include "I2C.h" -#include "Tasks.h" +#include <Platform/Tasks.h> #if defined(I2C_IFACE) static bool i2cInitialised = false; diff --git a/src/Hardware/I2C.h b/src/Hardware/I2C.h index 12a57799..4fa87ecf 100644 --- a/src/Hardware/I2C.h +++ b/src/Hardware/I2C.h @@ -8,8 +8,8 @@ #ifndef SRC_HARDWARE_I2C_H_ #define SRC_HARDWARE_I2C_H_ -#include "RepRapFirmware.h" -#include "Tasks.h" +#include <RepRapFirmware.h> +#include <Platform/Tasks.h> #ifdef I2C_IFACE # include "Wire.h" diff --git a/src/Hardware/IoPorts.cpp b/src/Hardware/IoPorts.cpp index 91495264..c822a72c 100644 --- a/src/Hardware/IoPorts.cpp +++ b/src/Hardware/IoPorts.cpp @@ -6,13 +6,13 @@ */ #include "IoPorts.h" -#include "RepRap.h" -#include "Platform.h" -#include "Configuration.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Configuration.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #ifdef DUET_NG -# include "DuetNG/DueXn.h" +# include <DuetNG/DueXn.h> #endif #include <AnalogOut.h> diff --git a/src/Hardware/SAME5x/Devices.cpp b/src/Hardware/SAME5x/Devices.cpp index 54ee3b1f..23a335e4 100644 --- a/src/Hardware/SAME5x/Devices.cpp +++ b/src/Hardware/SAME5x/Devices.cpp @@ -10,7 +10,7 @@ #include <RepRapFirmware.h> #include <AnalogIn.h> #include <AnalogOut.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> #include <hal_gpio.h> #include <hal_usb_device.h> diff --git a/src/Hardware/SAME5x/Ethernet/GmacInterface.cpp b/src/Hardware/SAME5x/Ethernet/GmacInterface.cpp index 3e67ac1c..f555f1ae 100644 --- a/src/Hardware/SAME5x/Ethernet/GmacInterface.cpp +++ b/src/Hardware/SAME5x/Ethernet/GmacInterface.cpp @@ -26,7 +26,7 @@ extern "C" { #include <RepRapFirmware.h> #include <RTOSIface/RTOSIface.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> extern Mutex lwipMutex; diff --git a/src/Hardware/SAME70/Ethernet/GmacInterface.cpp b/src/Hardware/SAME70/Ethernet/GmacInterface.cpp index 540c6b76..e91541b7 100644 --- a/src/Hardware/SAME70/Ethernet/GmacInterface.cpp +++ b/src/Hardware/SAME70/Ethernet/GmacInterface.cpp @@ -32,9 +32,9 @@ */ #include "GmacInterface.h" -#include "pmc/pmc.h" +#include <pmc/pmc.h> -#include "conf_eth.h" +#include <conf_eth.h> #include <cstring> extern "C" { @@ -53,7 +53,7 @@ extern "C" { #include <RepRapFirmware.h> #include <RTOSIface/RTOSIface.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> extern Mutex lwipMutex; diff --git a/src/Hardware/SoftwareReset.cpp b/src/Hardware/SoftwareReset.cpp index f1e7bdf7..48831178 100644 --- a/src/Hardware/SoftwareReset.cpp +++ b/src/Hardware/SoftwareReset.cpp @@ -6,9 +6,9 @@ */ #include "SoftwareReset.h" -#include <Tasks.h> -#include <RepRap.h> -#include <Platform.h> +#include <Platform/Tasks.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <General/Portability.h> extern uint32_t _estack; // defined in the linker script diff --git a/src/Hardware/SoftwareReset.h b/src/Hardware/SoftwareReset.h index 6630694d..b7179a07 100644 --- a/src/Hardware/SoftwareReset.h +++ b/src/Hardware/SoftwareReset.h @@ -9,7 +9,7 @@ #define SRC_SOFTWARERESET_H_ #include <RepRapFirmware.h> -#include <MessageType.h> +#include <Platform/MessageType.h> #if SAM3XA # include <DueFlashStorage.h> diff --git a/src/Heating/Heat.cpp b/src/Heating/Heat.cpp index 19e9acc2..be8a3b98 100644 --- a/src/Heating/Heat.cpp +++ b/src/Heating/Heat.cpp @@ -21,12 +21,12 @@ Licence: GPL #include "Heat.h" #include "LocalHeater.h" #include "HeaterMonitor.h" -#include "Platform.h" -#include "RepRap.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #include "Sensors/TemperatureSensor.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #include <Tools/Tool.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> #include <General/Portability.h> #if SUPPORT_DHT_SENSOR diff --git a/src/Heating/Heat.h b/src/Heating/Heat.h index 872c72dc..bd1f9890 100644 --- a/src/Heating/Heat.h +++ b/src/Heating/Heat.h @@ -25,12 +25,12 @@ Licence: GPL * The master class that controls all the heaters in the RepRap machine */ -#include "RepRapFirmware.h" -#include "RepRap.h" +#include <RepRapFirmware.h> +#include <Platform/RepRap.h> #include "Heater.h" #include "TemperatureError.h" -#include "MessageType.h" -#include "GCodes/GCodeResult.h" +#include <Platform/MessageType.h> +#include <GCodes/GCodeResult.h> #include <RTOSIface/RTOSIface.h> class TemperatureSensor; diff --git a/src/Heating/Heater.cpp b/src/Heating/Heater.cpp index b0dc08f2..2d943e8f 100644 --- a/src/Heating/Heater.cpp +++ b/src/Heating/Heater.cpp @@ -6,8 +6,8 @@ */ #include "Heater.h" -#include "RepRap.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include "Heat.h" #include "HeaterMonitor.h" #include "Sensors/TemperatureSensor.h" diff --git a/src/Heating/HeaterMonitor.cpp b/src/Heating/HeaterMonitor.cpp index 1b895215..3f9255a2 100644 --- a/src/Heating/HeaterMonitor.cpp +++ b/src/Heating/HeaterMonitor.cpp @@ -7,8 +7,8 @@ #include "HeaterMonitor.h" -#include <Platform.h> -#include <RepRap.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #include "Heat.h" HeaterMonitor::HeaterMonitor() noexcept diff --git a/src/Heating/LocalHeater.cpp b/src/Heating/LocalHeater.cpp index d1480263..f9de4a96 100644 --- a/src/Heating/LocalHeater.cpp +++ b/src/Heating/LocalHeater.cpp @@ -6,12 +6,12 @@ */ #include "LocalHeater.h" -#include "GCodes/GCodes.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <GCodes/GCodes.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #include "Heat.h" #include "HeaterMonitor.h" -#include "Platform.h" -#include "RepRap.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #include <Tools/Tool.h> // Member functions and constructors diff --git a/src/Heating/RemoteHeater.cpp b/src/Heating/RemoteHeater.cpp index 131c945c..bf98ab99 100644 --- a/src/Heating/RemoteHeater.cpp +++ b/src/Heating/RemoteHeater.cpp @@ -9,11 +9,11 @@ #if SUPPORT_CAN_EXPANSION -#include "RepRap.h" +#include <Platform/RepRap.h> #include "Heat.h" -#include "Platform.h" -#include "CAN/CanMessageGenericConstructor.h" -#include "CAN/CanInterface.h" +#include <Platform/Platform.h> +#include <CAN/CanMessageGenericConstructor.h> +#include <CAN/CanInterface.h> #include <CanMessageFormats.h> #include <CanMessageBuffer.h> diff --git a/src/Heating/Sensors/AdditionalOutputSensor.cpp b/src/Heating/Sensors/AdditionalOutputSensor.cpp index 0ee7dd21..110fc4aa 100644 --- a/src/Heating/Sensors/AdditionalOutputSensor.cpp +++ b/src/Heating/Sensors/AdditionalOutputSensor.cpp @@ -7,9 +7,9 @@ #include <ctype.h> #include "AdditionalOutputSensor.h" -#include "RepRap.h" -#include "Heating/Heat.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Heating/Heat.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> AdditionalOutputSensor::AdditionalOutputSensor(unsigned int sensorNum, const char *type, bool enforcePollOrder) noexcept : TemperatureSensor(sensorNum, type), parentSensor(0), outputNumber(0), enforcePollOrder(enforcePollOrder) diff --git a/src/Heating/Sensors/CpuTemperatureSensor.cpp b/src/Heating/Sensors/CpuTemperatureSensor.cpp index 729011b3..bfd90c69 100644 --- a/src/Heating/Sensors/CpuTemperatureSensor.cpp +++ b/src/Heating/Sensors/CpuTemperatureSensor.cpp @@ -6,8 +6,8 @@ */ #include "CpuTemperatureSensor.h" -#include "Platform.h" -#include "RepRap.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #if HAS_CPU_TEMP_SENSOR diff --git a/src/Heating/Sensors/CurrentLoopTemperatureSensor.cpp b/src/Heating/Sensors/CurrentLoopTemperatureSensor.cpp index 7a7b4793..5b0be7f1 100644 --- a/src/Heating/Sensors/CurrentLoopTemperatureSensor.cpp +++ b/src/Heating/Sensors/CurrentLoopTemperatureSensor.cpp @@ -6,9 +6,9 @@ */ #include "CurrentLoopTemperatureSensor.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> const uint32_t MCP3204_Frequency = 1000000; // maximum for MCP3204 is 1MHz @ 2.7V, will be slightly higher at 3.3V diff --git a/src/Heating/Sensors/DhtSensor.cpp b/src/Heating/Sensors/DhtSensor.cpp index ca89796b..52c8a5a8 100644 --- a/src/Heating/Sensors/DhtSensor.cpp +++ b/src/Heating/Sensors/DhtSensor.cpp @@ -9,10 +9,10 @@ #if SUPPORT_DHT_SENSOR -#include "RepRap.h" -#include "Heating/Heat.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/StepTimer.h" +#include <Platform/RepRap.h> +#include <Heating/Heat.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/StepTimer.h> constexpr uint16_t MinimumReadInterval = 2000; // ms constexpr uint8_t MaximumReadTime = 20; // ms diff --git a/src/Heating/Sensors/LinearAnalogSensor.cpp b/src/Heating/Sensors/LinearAnalogSensor.cpp index 1a9ffda1..b1a40623 100644 --- a/src/Heating/Sensors/LinearAnalogSensor.cpp +++ b/src/Heating/Sensors/LinearAnalogSensor.cpp @@ -6,19 +6,18 @@ */ #include "LinearAnalogSensor.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Pins.h" -#include "RepRap.h" -#include "Platform.h" +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Pins.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <AnalogIn.h> -using + #if SAME5x - AnalogIn +using AnalogIn::AdcBits; #else - LegacyAnalogIn +using LegacyAnalogIn::AdcBits; #endif - ::AdcBits; // ADC resolution // For the theory behind ADC oversampling, see http://www.atmel.com/Images/doc8003.pdf diff --git a/src/Heating/Sensors/RtdSensor31865.cpp b/src/Heating/Sensors/RtdSensor31865.cpp index 54fba6b6..8815475c 100644 --- a/src/Heating/Sensors/RtdSensor31865.cpp +++ b/src/Heating/Sensors/RtdSensor31865.cpp @@ -6,9 +6,9 @@ */ #include "RtdSensor31865.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_REMOTE_COMMANDS # include <CanMessageGenericParser.h> diff --git a/src/Heating/Sensors/SpiTemperatureSensor.cpp b/src/Heating/Sensors/SpiTemperatureSensor.cpp index f3395e3e..fed34a72 100644 --- a/src/Heating/Sensors/SpiTemperatureSensor.cpp +++ b/src/Heating/Sensors/SpiTemperatureSensor.cpp @@ -6,7 +6,7 @@ */ #include "SpiTemperatureSensor.h" -#include "Tasks.h" +#include <Platform/Tasks.h> #include <Hardware/SharedSpi/SharedSpiDevice.h> SpiTemperatureSensor::SpiTemperatureSensor(unsigned int sensorNum, const char *name, SpiMode spiMode, uint32_t clockFrequency) noexcept diff --git a/src/Heating/Sensors/Thermistor.cpp b/src/Heating/Sensors/Thermistor.cpp index 47dc945a..a99e0533 100644 --- a/src/Heating/Sensors/Thermistor.cpp +++ b/src/Heating/Sensors/Thermistor.cpp @@ -7,9 +7,9 @@ */ #include "Thermistor.h" -#include "Platform.h" -#include "RepRap.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #if HAS_VREF_MONITOR # include <GCodes/GCodes.h> diff --git a/src/Heating/Sensors/ThermocoupleSensor31855.cpp b/src/Heating/Sensors/ThermocoupleSensor31855.cpp index 775d1503..92081791 100644 --- a/src/Heating/Sensors/ThermocoupleSensor31855.cpp +++ b/src/Heating/Sensors/ThermocoupleSensor31855.cpp @@ -46,9 +46,9 @@ // used by anything else as the Arduino Due leaves pin 78 unconnected. #include "ThermocoupleSensor31855.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_REMOTE_COMMANDS # include <CanMessageGenericParser.h> diff --git a/src/Heating/Sensors/ThermocoupleSensor31856.cpp b/src/Heating/Sensors/ThermocoupleSensor31856.cpp index d39b8c2f..6fe3e346 100644 --- a/src/Heating/Sensors/ThermocoupleSensor31856.cpp +++ b/src/Heating/Sensors/ThermocoupleSensor31856.cpp @@ -6,9 +6,9 @@ */ #include "ThermocoupleSensor31856.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_REMOTE_COMMANDS # include <CanMessageGenericParser.h> diff --git a/src/Heating/Sensors/TmcDriverTemperatureSensor.cpp b/src/Heating/Sensors/TmcDriverTemperatureSensor.cpp index d9612ea0..950b5c1f 100644 --- a/src/Heating/Sensors/TmcDriverTemperatureSensor.cpp +++ b/src/Heating/Sensors/TmcDriverTemperatureSensor.cpp @@ -6,8 +6,8 @@ */ #include "TmcDriverTemperatureSensor.h" -#include "Platform.h" -#include "RepRap.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #if HAS_SMART_DRIVERS diff --git a/src/Libraries/Fatfs/diskio.cpp b/src/Libraries/Fatfs/diskio.cpp index 3c9b9cf3..41b8e7fb 100644 --- a/src/Libraries/Fatfs/diskio.cpp +++ b/src/Libraries/Fatfs/diskio.cpp @@ -48,8 +48,8 @@ #include <Libraries/sd_mmc/conf_sd_mmc.h> #include "RepRapFirmware.h" -#include "RepRap.h" -#include "Tasks.h" +#include <Platform/RepRap.h> +#include <Platform/Tasks.h> #include <Movement/StepTimer.h> #include <cstring> diff --git a/src/Libraries/Fatfs/fattime_rtc.cpp b/src/Libraries/Fatfs/fattime_rtc.cpp index e41e40e4..a6a8df58 100644 --- a/src/Libraries/Fatfs/fattime_rtc.cpp +++ b/src/Libraries/Fatfs/fattime_rtc.cpp @@ -41,8 +41,8 @@ * */ #include "RepRapFirmware.h" -#include "RepRap.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> /** * \brief Current time returned is packed into a DWORD value. diff --git a/src/Linux/DataTransfer.cpp b/src/Linux/DataTransfer.cpp index efd679f8..ce3ab255 100644 --- a/src/Linux/DataTransfer.cpp +++ b/src/Linux/DataTransfer.cpp @@ -57,15 +57,15 @@ constexpr IRQn SBC_SPI_IRQn = SbcSpiSercomIRQn; # include <spi/spi.h> #endif -#include "RepRapFirmware.h" -#include "GCodes/GCodeMachineState.h" -#include "Movement/Move.h" -#include "Movement/BedProbing/Grid.h" -#include "ObjectModel/ObjectModel.h" -#include "OutputMemory.h" -#include "RepRap.h" +#include <RepRapFirmware.h> +#include <GCodes/GCodeMachineState.h> +#include <Movement/Move.h> +#include <Movement/BedProbing/Grid.h> +#include <ObjectModel/ObjectModel.h> +#include <Platform/OutputMemory.h> +#include <Platform/RepRap.h> #include <Cache.h> -#include "RTOSIface/RTOSIface.h" +#include <RTOSIface/RTOSIface.h> #include <General/IP4String.h> diff --git a/src/Linux/DataTransfer.h b/src/Linux/DataTransfer.h index b23d0f3a..4935d4d6 100644 --- a/src/Linux/DataTransfer.h +++ b/src/Linux/DataTransfer.h @@ -15,7 +15,7 @@ #include <GCodes/GCodeFileInfo.h> #include <GCodes/GCodeChannel.h> #include "LinuxMessageFormats.h" -#include <MessageType.h> +#include <Platform/MessageType.h> #include <RTOSIface/RTOSIface.h> class BinaryGCodeBuffer; diff --git a/src/Linux/LinuxInterface.cpp b/src/Linux/LinuxInterface.cpp index 4699b84d..2fa7688c 100644 --- a/src/Linux/LinuxInterface.cpp +++ b/src/Linux/LinuxInterface.cpp @@ -10,19 +10,19 @@ #if HAS_LINUX_INTERFACE -#include "GCodes/GCodeBuffer/ExpressionParser.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Heating/Heat.h" -#include "Movement/Move.h" -#include "Platform.h" -#include "PrintMonitor.h" -#include "Tools/Filament.h" -#include "RepRap.h" -#include "RepRapFirmware.h" -#include <Tasks.h> +#include <GCodes/GCodeBuffer/ExpressionParser.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Heating/Heat.h> +#include <Movement/Move.h> +#include <Platform/Platform.h> +#include <PrintMonitor/PrintMonitor.h> +#include <Tools/Filament.h> +#include <Platform/RepRap.h> +#include <RepRapFirmware.h> +#include <Platform/Tasks.h> #include <Hardware/SoftwareReset.h> #include <Hardware/ExceptionHandlers.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> extern char _estack; // defined by the linker diff --git a/src/Linux/LinuxInterface.h b/src/Linux/LinuxInterface.h index d826d90e..5fad27d2 100644 --- a/src/Linux/LinuxInterface.h +++ b/src/Linux/LinuxInterface.h @@ -19,7 +19,7 @@ #include "GCodes/GCodeFileInfo.h" #include "LinuxMessageFormats.h" #include "DataTransfer.h" -#include "MessageType.h" +#include <Platform/MessageType.h> class Platform; diff --git a/src/Linux/LinuxMessageFormats.h b/src/Linux/LinuxMessageFormats.h index d108559a..b8af2b44 100644 --- a/src/Linux/LinuxMessageFormats.h +++ b/src/Linux/LinuxMessageFormats.h @@ -12,8 +12,8 @@ #include <cstdint> #include <ctime> -#include "RepRapFirmware.h" -#include "MessageType.h" +#include <RepRapFirmware.h> +#include <Platform/MessageType.h> constexpr uint8_t LinuxFormatCode = 0x5F; // standard format code for RRF SPI protocol constexpr uint8_t LiunxFormatCodeStandalone = 0x60; // used to indicate that RRF is running in stand-alone mode diff --git a/src/Movement/BedProbing/Grid.cpp b/src/Movement/BedProbing/Grid.cpp index 5baaca88..b94b5744 100644 --- a/src/Movement/BedProbing/Grid.cpp +++ b/src/Movement/BedProbing/Grid.cpp @@ -6,10 +6,10 @@ */ #include "Grid.h" -#include "Platform.h" -#include "RepRap.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #include <GCodes/GCodes.h> -#include "Storage/FileStore.h" +#include <Storage/FileStore.h> #include <Math/Deviation.h> #include <cmath> diff --git a/src/Movement/BedProbing/RandomProbePointSet.cpp b/src/Movement/BedProbing/RandomProbePointSet.cpp index 5bbee02d..7bc305e8 100644 --- a/src/Movement/BedProbing/RandomProbePointSet.cpp +++ b/src/Movement/BedProbing/RandomProbePointSet.cpp @@ -6,8 +6,8 @@ */ #include "RandomProbePointSet.h" -#include "RepRap.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Movement/DDA.cpp b/src/Movement/DDA.cpp index d40c1bb9..3a3e14ec 100644 --- a/src/Movement/DDA.cpp +++ b/src/Movement/DDA.cpp @@ -6,16 +6,16 @@ */ #include "DDA.h" -#include "RepRap.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include "Move.h" #include "StepTimer.h" -#include "Endstops/EndstopsManager.h" +#include <Endstops/EndstopsManager.h> #include "Kinematics/LinearDeltaKinematics.h" -#include "Tools/Tool.h" +#include <Tools/Tool.h> #if SUPPORT_CAN_EXPANSION -# include "CAN/CanMotion.h" +# include <CAN/CanMotion.h> #endif #ifdef DUET_NG diff --git a/src/Movement/DDA.h b/src/Movement/DDA.h index b951e1c8..58532e25 100644 --- a/src/Movement/DDA.h +++ b/src/Movement/DDA.h @@ -11,7 +11,7 @@ #include <RepRapFirmware.h> #include "DriveMovement.h" #include "StepTimer.h" -#include <Tasks.h> +#include <Platform/Tasks.h> #include <GCodes/GCodes.h> // for class RawMove #ifdef DUET_NG diff --git a/src/Movement/DDARing.cpp b/src/Movement/DDARing.cpp index 58c280ef..40ec04ca 100644 --- a/src/Movement/DDARing.cpp +++ b/src/Movement/DDARing.cpp @@ -6,9 +6,9 @@ */ #include "DDARing.h" -#include "RepRap.h" +#include <Platform/RepRap.h> #include "Move.h" -#include <Tasks.h> +#include <Platform/Tasks.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_CAN_EXPANSION diff --git a/src/Movement/DriveMovement.cpp b/src/Movement/DriveMovement.cpp index 71bf4446..1110989f 100644 --- a/src/Movement/DriveMovement.cpp +++ b/src/Movement/DriveMovement.cpp @@ -9,8 +9,8 @@ #include "DDA.h" #include "Move.h" #include "StepTimer.h" -#include "RepRap.h" -#include "Math/Isqrt.h" +#include <Platform/RepRap.h> +#include <Math/Isqrt.h> #include "Kinematics/LinearDeltaKinematics.h" // Static members diff --git a/src/Movement/DriveMovement.h b/src/Movement/DriveMovement.h index 95fcce92..565894fc 100644 --- a/src/Movement/DriveMovement.h +++ b/src/Movement/DriveMovement.h @@ -9,7 +9,7 @@ #define DRIVEMOVEMENT_H_ #include <RepRapFirmware.h> -#include <Tasks.h> +#include <Platform/Tasks.h> class LinearDeltaKinematics; diff --git a/src/Movement/HeightControl/HeightController.cpp b/src/Movement/HeightControl/HeightController.cpp index c52e8503..d066d692 100644 --- a/src/Movement/HeightControl/HeightController.cpp +++ b/src/Movement/HeightControl/HeightController.cpp @@ -9,13 +9,13 @@ #if SUPPORT_ASYNC_MOVES -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Heating/Heat.h" -#include "Heating/Sensors/TemperatureSensor.h" -#include "Movement/Move.h" -#include <TaskPriorities.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Heating/Heat.h> +#include <Heating/Sensors/TemperatureSensor.h> +#include <Movement/Move.h> +#include <Platform/TaskPriorities.h> HeightController::HeightController() noexcept : heightControllerTask(nullptr), sensorNumber(-1), diff --git a/src/Movement/InputShaper.cpp b/src/Movement/InputShaper.cpp index 131f7c58..4caf84da 100644 --- a/src/Movement/InputShaper.cpp +++ b/src/Movement/InputShaper.cpp @@ -8,7 +8,7 @@ #include "InputShaper.h" #include <GCodes/GCodeBuffer/GCodeBuffer.h> -#include <RepRap.h> +#include <Platform/RepRap.h> #include "StepTimer.h" // Object model table and functions diff --git a/src/Movement/Kinematics/CoreKinematics.cpp b/src/Movement/Kinematics/CoreKinematics.cpp index 601a2c70..9758ea95 100644 --- a/src/Movement/Kinematics/CoreKinematics.cpp +++ b/src/Movement/Kinematics/CoreKinematics.cpp @@ -6,11 +6,11 @@ */ #include "CoreKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodes.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/DDA.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodes.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/DDA.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Movement/Kinematics/FiveBarScaraKinematics.cpp b/src/Movement/Kinematics/FiveBarScaraKinematics.cpp index ce686ed5..6d1b84da 100644 --- a/src/Movement/Kinematics/FiveBarScaraKinematics.cpp +++ b/src/Movement/Kinematics/FiveBarScaraKinematics.cpp @@ -8,11 +8,11 @@ */ #include "FiveBarScaraKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "Storage/MassStorage.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/DDA.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Storage/MassStorage.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/DDA.h> #include <limits> diff --git a/src/Movement/Kinematics/HangprinterKinematics.cpp b/src/Movement/Kinematics/HangprinterKinematics.cpp index ebef38be..29bd1988 100644 --- a/src/Movement/Kinematics/HangprinterKinematics.cpp +++ b/src/Movement/Kinematics/HangprinterKinematics.cpp @@ -6,10 +6,10 @@ */ #include "HangprinterKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/Move.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/Move.h> //#include "Movement/BedProbing/RandomProbePointSet.h" // Default anchor coordinates diff --git a/src/Movement/Kinematics/Kinematics.cpp b/src/Movement/Kinematics/Kinematics.cpp index 6e6b0947..a944767c 100644 --- a/src/Movement/Kinematics/Kinematics.cpp +++ b/src/Movement/Kinematics/Kinematics.cpp @@ -15,10 +15,10 @@ #include "PolarKinematics.h" #include "FiveBarScaraKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "GCodes/GCodes.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <GCodes/GCodes.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> const char * const Kinematics::HomeAllFileName = "homeall.g"; diff --git a/src/Movement/Kinematics/LinearDeltaKinematics.cpp b/src/Movement/Kinematics/LinearDeltaKinematics.cpp index b0127e16..1a7a9662 100644 --- a/src/Movement/Kinematics/LinearDeltaKinematics.cpp +++ b/src/Movement/Kinematics/LinearDeltaKinematics.cpp @@ -7,10 +7,10 @@ #include "LinearDeltaKinematics.h" -#include "Movement/Move.h" -#include "RepRap.h" -#include "Storage/FileStore.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Movement/Move.h> +#include <Platform/RepRap.h> +#include <Storage/FileStore.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #include <Math/Deviation.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Movement/Kinematics/PolarKinematics.cpp b/src/Movement/Kinematics/PolarKinematics.cpp index 289870e1..832cbe19 100644 --- a/src/Movement/Kinematics/PolarKinematics.cpp +++ b/src/Movement/Kinematics/PolarKinematics.cpp @@ -7,11 +7,11 @@ #include "PolarKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "Storage/MassStorage.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/DDA.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Storage/MassStorage.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/DDA.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Movement/Kinematics/RotaryDeltaKinematics.cpp b/src/Movement/Kinematics/RotaryDeltaKinematics.cpp index 24b81644..362cffbb 100644 --- a/src/Movement/Kinematics/RotaryDeltaKinematics.cpp +++ b/src/Movement/Kinematics/RotaryDeltaKinematics.cpp @@ -7,10 +7,10 @@ #include "RotaryDeltaKinematics.h" -#include "Movement/Move.h" -#include "RepRap.h" -#include "Storage/FileStore.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Movement/Move.h> +#include <Platform/RepRap.h> +#include <Storage/FileStore.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> #include <Math/Deviation.h> const float RotaryDeltaKinematics::NormalTowerAngles[DELTA_AXES] = { -150.0, -30.0, 90.0 }; diff --git a/src/Movement/Kinematics/RoundBedKinematics.cpp b/src/Movement/Kinematics/RoundBedKinematics.cpp index bbfeb7b6..82aad6b9 100644 --- a/src/Movement/Kinematics/RoundBedKinematics.cpp +++ b/src/Movement/Kinematics/RoundBedKinematics.cpp @@ -5,9 +5,9 @@ * Author: manuel */ -#include <Movement/Kinematics/RoundBedKinematics.h> -#include "RepRap.h" -#include "Platform.h" +#include "RoundBedKinematics.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> RoundBedKinematics::RoundBedKinematics(KinematicsType t, bool doUseSegmentation, bool doUseRawG0) noexcept : Kinematics(t, doUseSegmentation, doUseRawG0), printRadiusSquared(0.0) diff --git a/src/Movement/Kinematics/ScaraKinematics.cpp b/src/Movement/Kinematics/ScaraKinematics.cpp index 3f133006..da766618 100644 --- a/src/Movement/Kinematics/ScaraKinematics.cpp +++ b/src/Movement/Kinematics/ScaraKinematics.cpp @@ -6,11 +6,11 @@ */ #include "ScaraKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "Storage/MassStorage.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Movement/DDA.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Storage/MassStorage.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Movement/DDA.h> #include <limits> diff --git a/src/Movement/Kinematics/ZLeadscrewKinematics.cpp b/src/Movement/Kinematics/ZLeadscrewKinematics.cpp index 3eb39794..2880c999 100644 --- a/src/Movement/Kinematics/ZLeadscrewKinematics.cpp +++ b/src/Movement/Kinematics/ZLeadscrewKinematics.cpp @@ -7,10 +7,10 @@ #include "ZLeadscrewKinematics.h" -#include "RepRap.h" -#include "Platform.h" -#include "Movement/Move.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Movement/Move.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> const float M3ScrewPitch = 0.5; diff --git a/src/Movement/Move.cpp b/src/Movement/Move.cpp index aee6946d..31d6f4f8 100644 --- a/src/Movement/Move.cpp +++ b/src/Movement/Move.cpp @@ -35,14 +35,14 @@ #include "Move.h" #include "StepTimer.h" -#include "Platform.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Tools/Tool.h" -#include "Endstops/ZProbe.h" -#include <TaskPriorities.h> +#include <Platform/Platform.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Tools/Tool.h> +#include <Endstops/ZProbe.h> +#include <Platform/TaskPriorities.h> #if SUPPORT_IOBITS -# include <PortControl.h> +# include <Platform/PortControl.h> #endif #if SUPPORT_CAN_EXPANSION diff --git a/src/Movement/Move.h b/src/Movement/Move.h index 44eac195..895dc54c 100644 --- a/src/Movement/Move.h +++ b/src/Movement/Move.h @@ -9,7 +9,7 @@ #define MOVE_H_ #include <RepRapFirmware.h> -#include <MessageType.h> +#include <Platform/MessageType.h> #include "InputShaper.h" #include "StraightProbeSettings.h" #include "DDARing.h" diff --git a/src/Movement/StepTimer.cpp b/src/Movement/StepTimer.cpp index c50da6b7..d72dbf3b 100644 --- a/src/Movement/StepTimer.cpp +++ b/src/Movement/StepTimer.cpp @@ -7,8 +7,8 @@ #include "StepTimer.h" #include <RTOSIface/RTOSIface.h> -#include <RepRap.h> -#include <Platform.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include <GCodes/GCodes.h> #if SUPPORT_REMOTE_COMMANDS diff --git a/src/Movement/StepperDrivers/TMC22xx.cpp b/src/Movement/StepperDrivers/TMC22xx.cpp index a1e8e780..46a7c4a2 100644 --- a/src/Movement/StepperDrivers/TMC22xx.cpp +++ b/src/Movement/StepperDrivers/TMC22xx.cpp @@ -36,8 +36,8 @@ #define RESET_MICROSTEP_COUNTERS_AT_INIT 0 // Duets use pulldown resistors on the step pins, so we don't get phantom microsteps at power up #define USE_FAST_CRC 1 -#include <RepRap.h> -#include <TaskPriorities.h> +#include <Platform/RepRap.h> +#include <Platform/TaskPriorities.h> #include <Movement/Move.h> #include <Movement/StepTimer.h> #include <Cache.h> diff --git a/src/Movement/StepperDrivers/TMC22xx.h b/src/Movement/StepperDrivers/TMC22xx.h index 7696c44e..9da18daf 100644 --- a/src/Movement/StepperDrivers/TMC22xx.h +++ b/src/Movement/StepperDrivers/TMC22xx.h @@ -13,7 +13,7 @@ #if SUPPORT_TMC22xx #include "DriverMode.h" -#include "MessageType.h" +#include <Platform/MessageType.h> // TMC22xx DRV_STATUS register bit assignments const uint32_t TMC_RR_OT = 1u << 1; // over temperature shutdown diff --git a/src/Movement/StepperDrivers/TMC2660.cpp b/src/Movement/StepperDrivers/TMC2660.cpp index 66ebf0a7..4c9332c3 100644 --- a/src/Movement/StepperDrivers/TMC2660.cpp +++ b/src/Movement/StepperDrivers/TMC2660.cpp @@ -5,15 +5,15 @@ * Author: David */ -#include "RepRapFirmware.h" +#include <RepRapFirmware.h> #if SUPPORT_TMC2660 #include "TMC2660.h" -#include "RepRap.h" -#include "Movement/Move.h" -#include "Movement/StepTimer.h" -#include "Endstops/Endstop.h" +#include <Platform/RepRap.h> +#include <Movement/Move.h> +#include <Movement/StepTimer.h> +#include <Endstops/Endstop.h> #include <Cache.h> # if SAME70 diff --git a/src/Movement/StepperDrivers/TMC2660.h b/src/Movement/StepperDrivers/TMC2660.h index 7a51bd07..34b5388f 100644 --- a/src/Movement/StepperDrivers/TMC2660.h +++ b/src/Movement/StepperDrivers/TMC2660.h @@ -10,10 +10,10 @@ #if SUPPORT_TMC2660 -#include "RepRapFirmware.h" +#include <RepRapFirmware.h> #include "DriverMode.h" -#include "Pins.h" -#include "MessageType.h" +#include <Pins.h> +#include <Platform/MessageType.h> // TMC2660 read response bits that are returned by the status calls const uint32_t TMC_RR_SG = 1 << 0; // stall detected diff --git a/src/Movement/StepperDrivers/TMC51xx.cpp b/src/Movement/StepperDrivers/TMC51xx.cpp index 5b5c4bc5..80f764bd 100644 --- a/src/Movement/StepperDrivers/TMC51xx.cpp +++ b/src/Movement/StepperDrivers/TMC51xx.cpp @@ -12,7 +12,7 @@ #if SUPPORT_TMC51xx #include <RTOSIface/RTOSIface.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> #include <Movement/Move.h> #include <DmacManager.h> #include <Endstops/Endstop.h> diff --git a/src/Movement/StraightProbeSettings.cpp b/src/Movement/StraightProbeSettings.cpp index b696ca5c..c690f9cd 100644 --- a/src/Movement/StraightProbeSettings.cpp +++ b/src/Movement/StraightProbeSettings.cpp @@ -6,7 +6,7 @@ */ #include "StraightProbeSettings.h" -#include "RepRap.h" +#include <Platform/RepRap.h> StraightProbeSettings::StraightProbeSettings() noexcept { diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.cpp b/src/Networking/ESP8266WiFi/WiFiInterface.cpp index b81f94a0..4b199e37 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.cpp +++ b/src/Networking/ESP8266WiFi/WiFiInterface.cpp @@ -7,14 +7,14 @@ #include "WiFiInterface.h" -#include "Platform.h" -#include "RepRap.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "HttpResponder.h" -#include "FtpResponder.h" -#include "TelnetResponder.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Networking/HttpResponder.h> +#include <Networking/FtpResponder.h> +#include <Networking/TelnetResponder.h> #include "WifiFirmwareUploader.h" -#include "General/IP4String.h" +#include <General/IP4String.h> #include "WiFiSocket.h" #include <Cache.h> diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.h b/src/Networking/ESP8266WiFi/WiFiInterface.h index 4b5ac09b..d812ca30 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.h +++ b/src/Networking/ESP8266WiFi/WiFiInterface.h @@ -9,11 +9,11 @@ #define SRC_NETWORKING_WIFIINTERFACE_H_ #include <RepRapFirmware.h> -#include "Networking/NetworkDefs.h" -#include "MessageType.h" -#include "Networking/NetworkInterface.h" -#include "GCodes/GCodeResult.h" -#include "MessageFormats.h" +#include <Networking/NetworkDefs.h> +#include <Platform/MessageType.h> +#include <Networking/NetworkInterface.h> +#include <GCodes/GCodeResult.h> +#include <MessageFormats.h> // Forward declarations class WiFiSocket; diff --git a/src/Networking/ESP8266WiFi/WiFiSocket.cpp b/src/Networking/ESP8266WiFi/WiFiSocket.cpp index e9643f95..27007b47 100644 --- a/src/Networking/ESP8266WiFi/WiFiSocket.cpp +++ b/src/Networking/ESP8266WiFi/WiFiSocket.cpp @@ -5,8 +5,8 @@ * Author: David */ -#include "NetworkBuffer.h" -#include "RepRap.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/RepRap.h> #include "WiFiInterface.h" #include "WiFiSocket.h" diff --git a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp index 50f64030..eb9e0e0c 100644 --- a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp +++ b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp @@ -8,9 +8,9 @@ #include "WifiFirmwareUploader.h" #include "WiFiInterface.h" -#include "Platform.h" -#include "RepRap.h" -#include "Storage/FileStore.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Storage/FileStore.h> // ESP8266 command codes const uint8_t ESP_FLASH_BEGIN = 0x02; diff --git a/src/Networking/FtpResponder.cpp b/src/Networking/FtpResponder.cpp index ae0a9603..6ac6d4a6 100644 --- a/src/Networking/FtpResponder.cpp +++ b/src/Networking/FtpResponder.cpp @@ -12,7 +12,7 @@ #include "Socket.h" #include "Network.h" #include "NetworkInterface.h" -#include "Platform.h" +#include <Platform/Platform.h> FtpResponder::FtpResponder(NetworkResponder *n) noexcept : UploadingNetworkResponder(n), dataSocket(nullptr), passivePort(0), passivePortOpenTime(0), dataBuf(nullptr), haveFileToMove(false) diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp index d00fbb5b..9fa2c1b3 100644 --- a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp +++ b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp @@ -9,16 +9,16 @@ #define NO_STATUS_CODES #include "LwipEthernetInterface.h" -#include "Networking/NetworkBuffer.h" +#include <Networking/NetworkBuffer.h> #include "LwipSocket.h" -#include "Platform.h" -#include "RepRap.h" -#include "Networking/HttpResponder.h" -#include "Networking/FtpResponder.h" -#include "Networking/TelnetResponder.h" -#include "General/IP4String.h" -#include "Version.h" // version is reported by MDNS +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Networking/HttpResponder.h> +#include <Networking/FtpResponder.h> +#include <Networking/TelnetResponder.h> +#include <General/IP4String.h> +#include <Version.h> // version is reported by MDNS #include "GMAC/ethernet_sam.h" #if SAME70 diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.h b/src/Networking/LwipEthernet/LwipEthernetInterface.h index 5a4ce2a8..d4dc0788 100644 --- a/src/Networking/LwipEthernet/LwipEthernetInterface.h +++ b/src/Networking/LwipEthernet/LwipEthernetInterface.h @@ -9,9 +9,9 @@ #define SRC_NETWORKING_LWIPETHERNET_LWIPETHERNETINTERFACE_H_ #include <RepRapFirmware.h> -#include "Networking/NetworkInterface.h" -#include "Networking/NetworkDefs.h" -#include "MessageType.h" +#include <Networking/NetworkInterface.h> +#include <Networking/NetworkDefs.h> +#include <Platform/MessageType.h> // We have 8 sockets available for Ethernet const size_t NumHttpSockets = 5; // sockets 0-4 are for HTTP diff --git a/src/Networking/LwipEthernet/LwipSocket.cpp b/src/Networking/LwipEthernet/LwipSocket.cpp index 0f2154ac..67623fe8 100644 --- a/src/Networking/LwipEthernet/LwipSocket.cpp +++ b/src/Networking/LwipEthernet/LwipSocket.cpp @@ -9,8 +9,8 @@ #define NO_STATUS_CODES #include "LwipSocket.h" -#include "Networking/NetworkBuffer.h" -#include "RepRap.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/RepRap.h> extern Mutex lwipMutex; diff --git a/src/Networking/Network.cpp b/src/Networking/Network.cpp index 08816fe1..3da1528c 100644 --- a/src/Networking/Network.cpp +++ b/src/Networking/Network.cpp @@ -9,8 +9,12 @@ #define NO_STATUS_CODES #include "Network.h" -#include <Platform.h> -#include <RepRap.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <General/IP4String.h> +#include <Version.h> +#include <Movement/StepTimer.h> +#include <Platform/TaskPriorities.h> #if HAS_NETWORKING #include "NetworkBuffer.h" @@ -41,10 +45,6 @@ #if SUPPORT_TELNET #include "TelnetResponder.h" #endif -#include <General/IP4String.h> -#include <Version.h> -#include <Movement/StepTimer.h> -#include <TaskPriorities.h> #ifdef __LPC17xx__ constexpr size_t NetworkStackWords = 375; diff --git a/src/Networking/Network.h b/src/Networking/Network.h index 5f131764..697360f4 100644 --- a/src/Networking/Network.h +++ b/src/Networking/Network.h @@ -10,7 +10,7 @@ #include <RepRapFirmware.h> #include "NetworkDefs.h" -#include <MessageType.h> +#include <Platform/MessageType.h> #include <GCodes/GCodeResult.h> #include <RTOSIface/RTOSIface.h> #include <ObjectModel/ObjectModel.h> diff --git a/src/Networking/NetworkInterface.cpp b/src/Networking/NetworkInterface.cpp index f6c1655c..7603224d 100644 --- a/src/Networking/NetworkInterface.cpp +++ b/src/Networking/NetworkInterface.cpp @@ -6,7 +6,7 @@ */ #include "NetworkInterface.h" -#include <RepRap.h> +#include <Platform/RepRap.h> void NetworkInterface::SetState(NetworkState::RawType newState) noexcept { diff --git a/src/Networking/NetworkResponder.cpp b/src/Networking/NetworkResponder.cpp index d37a887d..3f7d162c 100644 --- a/src/Networking/NetworkResponder.cpp +++ b/src/Networking/NetworkResponder.cpp @@ -7,7 +7,7 @@ #include "NetworkResponder.h" #include "Socket.h" -#include "Platform.h" +#include <Platform/Platform.h> // NetworkResponder members diff --git a/src/Networking/NetworkResponder.h b/src/Networking/NetworkResponder.h index ee5aa26d..2bf3976d 100644 --- a/src/Networking/NetworkResponder.h +++ b/src/Networking/NetworkResponder.h @@ -8,12 +8,12 @@ #ifndef SRC_NETWORKING_NETWORKRESPONDER_H_ #define SRC_NETWORKING_NETWORKRESPONDER_H_ -#include "RepRapFirmware.h" -#include "RepRap.h" +#include <RepRapFirmware.h> +#include <Platform/RepRap.h> #include "NetworkDefs.h" -#include "Storage/FileData.h" +#include <Storage/FileData.h> #include "NetworkBuffer.h" -#include "OutputMemory.h" +#include <Platform/OutputMemory.h> // Forward declarations class NetworkResponder; diff --git a/src/Networking/TelnetResponder.cpp b/src/Networking/TelnetResponder.cpp index b702c3e4..4fcb7835 100644 --- a/src/Networking/TelnetResponder.cpp +++ b/src/Networking/TelnetResponder.cpp @@ -10,9 +10,9 @@ #if SUPPORT_TELNET #include "Socket.h" -#include "OutputMemory.h" -#include "GCodes/GCodes.h" -#include "Platform.h" +#include <Platform/OutputMemory.h> +#include <GCodes/GCodes.h> +#include <Platform/Platform.h> TelnetResponder::TelnetResponder(NetworkResponder *n) noexcept : NetworkResponder(n) { diff --git a/src/Networking/UploadingNetworkResponder.cpp b/src/Networking/UploadingNetworkResponder.cpp index d1a5ee01..4925a1c4 100644 --- a/src/Networking/UploadingNetworkResponder.cpp +++ b/src/Networking/UploadingNetworkResponder.cpp @@ -7,7 +7,7 @@ #include "UploadingNetworkResponder.h" #include "Socket.h" -#include "Platform.h" +#include <Platform/Platform.h> UploadingNetworkResponder::UploadingNetworkResponder(NetworkResponder *n) noexcept : NetworkResponder(n) #if HAS_MASS_STORAGE diff --git a/src/Networking/W5500Ethernet/MdnsResponder.cpp b/src/Networking/W5500Ethernet/MdnsResponder.cpp index 772e1b8e..12290175 100644 --- a/src/Networking/W5500Ethernet/MdnsResponder.cpp +++ b/src/Networking/W5500Ethernet/MdnsResponder.cpp @@ -9,9 +9,9 @@ * */ -#include "RepRap.h" -#include "RepRapFirmware.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <RepRapFirmware.h> +#include <Platform/Platform.h> #include "MdnsResponder.h" #include "W5500Interface.h" diff --git a/src/Networking/W5500Ethernet/W5500Interface.cpp b/src/Networking/W5500Ethernet/W5500Interface.cpp index 740b82ec..dafcff0d 100644 --- a/src/Networking/W5500Ethernet/W5500Interface.cpp +++ b/src/Networking/W5500Ethernet/W5500Interface.cpp @@ -9,14 +9,14 @@ #include "W5500Socket.h" #include "Wiznet/Ethernet/wizchip_conf.h" #include "Wiznet/Internet/DHCP/dhcp.h" -#include "NetworkBuffer.h" -#include "Platform.h" -#include "RepRap.h" -#include "HttpResponder.h" -#include "FtpResponder.h" -#include "TelnetResponder.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Networking/HttpResponder.h> +#include <Networking/FtpResponder.h> +#include <Networking/TelnetResponder.h> #include "MdnsResponder.h" -#include "General/IP4String.h" +#include <General/IP4String.h> W5500Interface::W5500Interface(Platform& p) noexcept : platform(p), lastTickMillis(0), ftpDataSocket(0), activated(false) diff --git a/src/Networking/W5500Ethernet/W5500Interface.h b/src/Networking/W5500Ethernet/W5500Interface.h index 01b4b781..dc996a81 100644 --- a/src/Networking/W5500Ethernet/W5500Interface.h +++ b/src/Networking/W5500Ethernet/W5500Interface.h @@ -9,9 +9,9 @@ Separated out from Platform.h by dc42 and extended by chrishamm #ifndef NETWORK_H #define NETWORK_H -#include "NetworkInterface.h" -#include "NetworkDefs.h" -#include "MessageType.h" +#include <Networking/NetworkInterface.h> +#include <Networking/NetworkDefs.h> +#include <Platform/MessageType.h> class NetworkResponder; class HttpResponder; diff --git a/src/Networking/W5500Ethernet/W5500Socket.cpp b/src/Networking/W5500Ethernet/W5500Socket.cpp index e961d08a..46901f2e 100644 --- a/src/Networking/W5500Ethernet/W5500Socket.cpp +++ b/src/Networking/W5500Ethernet/W5500Socket.cpp @@ -6,12 +6,12 @@ */ #include "W5500Socket.h" -#include "Network.h" -#include "NetworkDefs.h" -#include "NetworkInterface.h" +#include <Networking/Network.h> +#include <Networking/NetworkDefs.h> +#include <Networking/NetworkInterface.h> #include "Wiznet/Ethernet/socketlib.h" -#include "NetworkBuffer.h" -#include "RepRap.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/RepRap.h> //*************************************************************************************************** // Socket class diff --git a/src/ObjectModel/ObjectModel.cpp b/src/ObjectModel/ObjectModel.cpp index 917cc6e2..0a1db254 100644 --- a/src/ObjectModel/ObjectModel.cpp +++ b/src/ObjectModel/ObjectModel.cpp @@ -9,9 +9,9 @@ #if SUPPORT_OBJECT_MODEL -#include <RepRap.h> -#include <Platform.h> -#include <OutputMemory.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Platform/OutputMemory.h> #include <cstring> #include <General/SafeStrtod.h> #include <General/IP4String.h> diff --git a/src/Logger.cpp b/src/Platform/Logger.cpp index 937132e2..937132e2 100644 --- a/src/Logger.cpp +++ b/src/Platform/Logger.cpp diff --git a/src/Logger.h b/src/Platform/Logger.h index 26ed6287..26ed6287 100644 --- a/src/Logger.h +++ b/src/Platform/Logger.h diff --git a/src/MessageType.h b/src/Platform/MessageType.h index d1062542..d1062542 100644 --- a/src/MessageType.h +++ b/src/Platform/MessageType.h diff --git a/src/OutputMemory.cpp b/src/Platform/OutputMemory.cpp index 2ef4329d..2ef4329d 100644 --- a/src/OutputMemory.cpp +++ b/src/Platform/OutputMemory.cpp diff --git a/src/OutputMemory.h b/src/Platform/OutputMemory.h index b0f0368f..b0f0368f 100644 --- a/src/OutputMemory.h +++ b/src/Platform/OutputMemory.h diff --git a/src/Platform.cpp b/src/Platform/Platform.cpp index d46086ee..ded40ede 100644 --- a/src/Platform.cpp +++ b/src/Platform/Platform.cpp @@ -21,18 +21,18 @@ #include "Platform.h" -#include "Heating/Heat.h" -#include "Movement/DDA.h" -#include "Movement/Move.h" -#include "Movement/StepTimer.h" -#include "Tools/Tool.h" -#include "Endstops/ZProbe.h" -#include "Networking/Network.h" -#include "PrintMonitor.h" -#include "FilamentMonitors/FilamentMonitor.h" +#include <Heating/Heat.h> +#include <Movement/DDA.h> +#include <Movement/Move.h> +#include <Movement/StepTimer.h> +#include <Tools/Tool.h> +#include <Endstops/ZProbe.h> +#include <Networking/Network.h> +#include <PrintMonitor/PrintMonitor.h> +#include <FilamentMonitors/FilamentMonitor.h> #include "RepRap.h" #include "Scanner.h" -#include "Version.h" +#include <Version.h> #include "Logger.h" #include "Tasks.h" #include <Cache.h> diff --git a/src/Platform.h b/src/Platform/Platform.h index 89c41f45..89c41f45 100644 --- a/src/Platform.h +++ b/src/Platform/Platform.h diff --git a/src/PortControl.cpp b/src/Platform/PortControl.cpp index 0632f0a5..0632f0a5 100644 --- a/src/PortControl.cpp +++ b/src/Platform/PortControl.cpp diff --git a/src/PortControl.h b/src/Platform/PortControl.h index 8ea23c3b..8ea23c3b 100644 --- a/src/PortControl.h +++ b/src/Platform/PortControl.h diff --git a/src/RepRap.cpp b/src/Platform/RepRap.cpp index 93c2b04d..007b2c3c 100644 --- a/src/RepRap.cpp +++ b/src/Platform/RepRap.cpp @@ -12,7 +12,7 @@ #endif #include "Platform.h" #include "Scanner.h" -#include "PrintMonitor.h" +#include <PrintMonitor/PrintMonitor.h> #include "Tools/Tool.h" #include "Tools/Filament.h" #include "Endstops/ZProbe.h" diff --git a/src/RepRap.h b/src/Platform/RepRap.h index b3227255..b3227255 100644 --- a/src/RepRap.h +++ b/src/Platform/RepRap.h diff --git a/src/Roland.cpp b/src/Platform/Roland.cpp index 8b87e779..8b87e779 100644 --- a/src/Roland.cpp +++ b/src/Platform/Roland.cpp diff --git a/src/Roland.h b/src/Platform/Roland.h index 3412e770..3412e770 100644 --- a/src/Roland.h +++ b/src/Platform/Roland.h diff --git a/src/Scanner.cpp b/src/Platform/Scanner.cpp index 90c5e87f..90c5e87f 100644 --- a/src/Scanner.cpp +++ b/src/Platform/Scanner.cpp diff --git a/src/Scanner.h b/src/Platform/Scanner.h index 464a9f61..464a9f61 100644 --- a/src/Scanner.h +++ b/src/Platform/Scanner.h diff --git a/src/TaskPriorities.h b/src/Platform/TaskPriorities.h index 57c194f4..57c194f4 100644 --- a/src/TaskPriorities.h +++ b/src/Platform/TaskPriorities.h diff --git a/src/Tasks.cpp b/src/Platform/Tasks.cpp index 6491daa7..a1e25114 100644 --- a/src/Tasks.cpp +++ b/src/Platform/Tasks.cpp @@ -9,7 +9,7 @@ #include "RepRap.h" #include "Platform.h" #include <Cache.h> -#include <TaskPriorities.h> +#include <Platform/TaskPriorities.h> #include <Hardware/SoftwareReset.h> #include <Storage/CRC32.h> diff --git a/src/Tasks.h b/src/Platform/Tasks.h index f811a927..f811a927 100644 --- a/src/Tasks.h +++ b/src/Platform/Tasks.h diff --git a/src/PrintMonitor.cpp b/src/PrintMonitor/PrintMonitor.cpp index 59aaa1c6..72e50a78 100644 --- a/src/PrintMonitor.cpp +++ b/src/PrintMonitor/PrintMonitor.cpp @@ -21,10 +21,10 @@ Licence: GPL #include <GCodes/GCodes.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> -#include "Heating/Heat.h" -#include "Movement/Move.h" -#include "Platform.h" -#include "RepRap.h" +#include <Heating/Heat.h> +#include <Movement/Move.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> ReadWriteLock PrintMonitor::printMonitorLock; diff --git a/src/PrintMonitor.h b/src/PrintMonitor/PrintMonitor.h index e4fa7ff6..e4fa7ff6 100644 --- a/src/PrintMonitor.h +++ b/src/PrintMonitor/PrintMonitor.h diff --git a/src/RepRapFirmware.cpp b/src/RepRapFirmware.cpp index c97e6079..2940a09f 100644 --- a/src/RepRapFirmware.cpp +++ b/src/RepRapFirmware.cpp @@ -161,12 +161,12 @@ Licence: GPL ****************************************************************************************************/ #include "RepRapFirmware.h" -#include "MessageType.h" -#include "Platform.h" -#include "RepRap.h" +#include <Platform/MessageType.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> -#include "FreeRTOS.h" -#include "task.h" +#include <FreeRTOS.h> +#include <task.h> // We just need one instance of RepRap; everything else is contained within it and hidden diff --git a/src/Storage/FileInfoParser.cpp b/src/Storage/FileInfoParser.cpp index 8ada4aff..5a3a42ba 100644 --- a/src/Storage/FileInfoParser.cpp +++ b/src/Storage/FileInfoParser.cpp @@ -6,11 +6,11 @@ */ #include "FileInfoParser.h" -#include "OutputMemory.h" -#include "RepRap.h" -#include "Platform.h" -#include "PrintMonitor.h" -#include "GCodes/GCodes.h" +#include <Platform/OutputMemory.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <PrintMonitor/PrintMonitor.h> +#include <GCodes/GCodes.h> #if HAS_MASS_STORAGE diff --git a/src/Storage/FileStore.cpp b/src/Storage/FileStore.cpp index 57d335e7..d6eaff2e 100644 --- a/src/Storage/FileStore.cpp +++ b/src/Storage/FileStore.cpp @@ -4,19 +4,19 @@ #if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE -#include "RepRap.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> #include "FileStore.h" #if HAS_MASS_STORAGE # include "MassStorage.h" -# include "Libraries/Fatfs/diskio.h" -# include "Movement/StepTimer.h" +# include <Libraries/Fatfs/diskio.h> +# include <Movement/StepTimer.h> #endif #if HAS_LINUX_INTERFACE -# include "Linux/LinuxInterface.h" +# include <Linux/LinuxInterface.h> #endif FileStore::FileStore() noexcept diff --git a/src/Storage/MassStorage.cpp b/src/Storage/MassStorage.cpp index e56f5c74..66041b51 100644 --- a/src/Storage/MassStorage.cpp +++ b/src/Storage/MassStorage.cpp @@ -1,6 +1,6 @@ #include "MassStorage.h" -#include <Platform.h> -#include <RepRap.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #include <ObjectModel/ObjectModel.h> #include <Libraries/Fatfs/diskio.h> diff --git a/src/Stream.cpp b/src/Stream.cpp deleted file mode 100644 index 327ac319..00000000 --- a/src/Stream.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Stream.cpp - * - * Created on: 20 Jun 2020 - * Author: David - */ - -#include "Stream.h" - -// read characters from stream into buffer -// returns the number of characters placed in the buffer -size_t Stream::readBytes(char *buffer, size_t length) noexcept -{ - size_t count = 0; - while (count < length) - { - const int c = read(); - if (c < 0) - { - break; - } - *buffer++ = (char) c; - count++; - } - return count; -} - -// End diff --git a/src/Tools/Filament.cpp b/src/Tools/Filament.cpp index 81ada94e..d50a592b 100644 --- a/src/Tools/Filament.cpp +++ b/src/Tools/Filament.cpp @@ -8,9 +8,9 @@ #include "Tool.h" #include "Filament.h" -#include "RepRap.h" -#include "Platform.h" -#include <Tasks.h> +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <Platform/Tasks.h> #include <ctime> diff --git a/src/Tools/Spindle.cpp b/src/Tools/Spindle.cpp index 798ae57a..0c54c5d3 100644 --- a/src/Tools/Spindle.cpp +++ b/src/Tools/Spindle.cpp @@ -6,7 +6,7 @@ */ #include "Spindle.h" -#include <RepRap.h> +#include <Platform/RepRap.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Tools/Tool.cpp b/src/Tools/Tool.cpp index dd827c35..9d86096a 100644 --- a/src/Tools/Tool.cpp +++ b/src/Tools/Tool.cpp @@ -26,11 +26,11 @@ #include "Tool.h" #include "Filament.h" -#include "GCodes/GCodes.h" +#include <GCodes/GCodes.h> #include <GCodes/GCodeBuffer/GCodeBuffer.h> -#include "Heating/Heat.h" -#include "Platform.h" -#include "RepRap.h" +#include <Heating/Heat.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> #if SUPPORT_OBJECT_MODEL diff --git a/src/Tools/Tool.h b/src/Tools/Tool.h index f724a05a..377ce0bf 100644 --- a/src/Tools/Tool.h +++ b/src/Tools/Tool.h @@ -27,7 +27,7 @@ Licence: GPL #define TOOL_H_ #include <RepRapFirmware.h> -#include <RepRap.h> +#include <Platform/RepRap.h> #include <ObjectModel/ObjectModel.h> #include <General/FreelistManager.h> #include <General/NamedEnum.h> diff --git a/src/bossa/Flasher.cpp b/src/bossa/Flasher.cpp index 774c00d6..85f65f86 100644 --- a/src/bossa/Flasher.cpp +++ b/src/bossa/Flasher.cpp @@ -28,11 +28,11 @@ /////////////////////////////////////////////////////////////////////////////// #include "Flasher.h" -#include "RepRap.h" -#include "Platform.h" -#include "General/Vector.hpp" +#include <Platform/RepRap.h> +#include <Platform/Platform.h> +#include <General/Vector.hpp> #if HAS_LINUX_INTERFACE -# include "Linux/LinuxInterface.h" +# include <Linux/LinuxInterface.h> #endif void Flasher::erase(uint32_t foffset) THROWS(GCodeException) |