diff options
Diffstat (limited to 'src/Movement')
28 files changed, 89 insertions, 89 deletions
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 { |