From d4d1b28a06caa57d26e300c1b814b2b8b62120cd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 4 Feb 2019 03:41:55 -0600 Subject: [PATCH] Fix some include paths --- Marlin/src/feature/fwretract.cpp | 2 +- Marlin/src/feature/pause.cpp | 4 ++-- Marlin/src/module/configuration_store.cpp | 2 +- Marlin/src/module/delta.cpp | 2 +- Marlin/src/module/endstops.cpp | 4 ++-- Marlin/src/module/motion.h | 2 +- Marlin/src/module/planner.cpp | 2 +- Marlin/src/module/probe.cpp | 4 ++-- Marlin/src/module/stepper.cpp | 2 +- Marlin/src/module/stepper.h | 2 +- Marlin/src/module/stepper_indirection.cpp | 2 +- Marlin/src/module/tool_change.cpp | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp index a00df77953..f911726066 100644 --- a/Marlin/src/feature/fwretract.cpp +++ b/Marlin/src/feature/fwretract.cpp @@ -37,7 +37,7 @@ FWRetract fwretract; // Single instance - this calls the constructor #include "../module/stepper.h" #if ENABLED(RETRACT_SYNC_MIXING) - #include "../feature/mixing.h" + #include "mixing.h" #endif // private: diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 5474aff2bb..2bba4da4ff 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -38,11 +38,11 @@ #include "../module/temperature.h" #if ENABLED(FWRETRACT) - #include "../feature/fwretract.h" + #include "fwretract.h" #endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #include "../feature/runout.h" + #include "runout.h" #endif #include "../lcd/ultralcd.h" diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index f42cfa215d..f2730924b2 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -89,7 +89,7 @@ #endif #if HAS_BED_PROBE - #include "../module/probe.h" + #include "probe.h" #endif #include "../feature/fwretract.h" diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp index 7667c71344..a7537843d9 100644 --- a/Marlin/src/module/delta.cpp +++ b/Marlin/src/module/delta.cpp @@ -39,7 +39,7 @@ #if ENABLED(SENSORLESS_HOMING) #include "../feature/tmc_util.h" - #include "../module/stepper_indirection.h" + #include "stepper_indirection.h" #endif // Initialized by settings.load() diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp index 1875782465..cd543bcb7a 100644 --- a/Marlin/src/module/endstops.cpp +++ b/Marlin/src/module/endstops.cpp @@ -29,7 +29,7 @@ #include "../Marlin.h" #include "../sd/cardreader.h" -#include "../module/temperature.h" +#include "temperature.h" #include "../lcd/ultralcd.h" #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE) @@ -37,7 +37,7 @@ #endif #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) && ENABLED(SDSUPPORT) - #include "../module/printcounter.h" // for print_job_timer + #include "printcounter.h" // for print_job_timer #endif Endstops endstops; diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index f43c8f7b44..7a93850e26 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -31,7 +31,7 @@ #include "../inc/MarlinConfig.h" #if IS_SCARA - #include "../module/scara.h" + #include "scara.h" #endif // Axis homed and known-position states diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp index c563547ec1..ec7af5c1e1 100644 --- a/Marlin/src/module/planner.cpp +++ b/Marlin/src/module/planner.cpp @@ -65,7 +65,7 @@ #include "planner.h" #include "stepper.h" #include "motion.h" -#include "../module/temperature.h" +#include "temperature.h" #include "../lcd/ultralcd.h" #include "../core/language.h" #include "../gcode/parser.h" diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index c3888f27f0..0f1d2fdf9f 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -47,7 +47,7 @@ #endif #if ENABLED(DELTA) - #include "../module/delta.h" + #include "delta.h" #endif #if ENABLED(BABYSTEP_ZPROBE_OFFSET) @@ -57,7 +57,7 @@ float zprobe_zoffset; // Initialized by settings.load() #if HAS_Z_SERVO_PROBE - #include "../module/servo.h" + #include "servo.h" #endif #if ENABLED(SENSORLESS_PROBING) diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp index 72032dcb60..970433a732 100644 --- a/Marlin/src/module/stepper.cpp +++ b/Marlin/src/module/stepper.cpp @@ -89,7 +89,7 @@ Stepper stepper; // Singleton #include "planner.h" #include "motion.h" -#include "../module/temperature.h" +#include "temperature.h" #include "../lcd/ultralcd.h" #include "../core/language.h" #include "../gcode/queue.h" diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h index ec8df8e949..ce7c9d868a 100644 --- a/Marlin/src/module/stepper.h +++ b/Marlin/src/module/stepper.h @@ -223,7 +223,7 @@ #include "speed_lookuptable.h" #endif -#include "../module/planner.h" +#include "planner.h" #include "../core/language.h" class Stepper { diff --git a/Marlin/src/module/stepper_indirection.cpp b/Marlin/src/module/stepper_indirection.cpp index a85d275658..e8d9888a72 100644 --- a/Marlin/src/module/stepper_indirection.cpp +++ b/Marlin/src/module/stepper_indirection.cpp @@ -35,7 +35,7 @@ #include "../inc/MarlinConfig.h" -#include "../module/stepper.h" +#include "stepper.h" #if HAS_DRIVER(L6470) #include "L6470/L6470_Marlin.h" diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index b711fc0fbc..74b51d736c 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -47,7 +47,7 @@ #endif #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE) || ENABLED(SWITCHING_TOOLHEAD) - #include "../module/servo.h" + #include "servo.h" #endif #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)