浏览代码

Fix some include paths

Scott Lahteine 6 年前
父节点
当前提交
d4d1b28a06

+ 1
- 1
Marlin/src/feature/fwretract.cpp 查看文件

37
 #include "../module/stepper.h"
37
 #include "../module/stepper.h"
38
 
38
 
39
 #if ENABLED(RETRACT_SYNC_MIXING)
39
 #if ENABLED(RETRACT_SYNC_MIXING)
40
-  #include "../feature/mixing.h"
40
+  #include "mixing.h"
41
 #endif
41
 #endif
42
 
42
 
43
 // private:
43
 // private:

+ 2
- 2
Marlin/src/feature/pause.cpp 查看文件

38
 #include "../module/temperature.h"
38
 #include "../module/temperature.h"
39
 
39
 
40
 #if ENABLED(FWRETRACT)
40
 #if ENABLED(FWRETRACT)
41
-  #include "../feature/fwretract.h"
41
+  #include "fwretract.h"
42
 #endif
42
 #endif
43
 
43
 
44
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
44
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
45
-  #include "../feature/runout.h"
45
+  #include "runout.h"
46
 #endif
46
 #endif
47
 
47
 
48
 #include "../lcd/ultralcd.h"
48
 #include "../lcd/ultralcd.h"

+ 1
- 1
Marlin/src/module/configuration_store.cpp 查看文件

89
 #endif
89
 #endif
90
 
90
 
91
 #if HAS_BED_PROBE
91
 #if HAS_BED_PROBE
92
-  #include "../module/probe.h"
92
+  #include "probe.h"
93
 #endif
93
 #endif
94
 
94
 
95
 #include "../feature/fwretract.h"
95
 #include "../feature/fwretract.h"

+ 1
- 1
Marlin/src/module/delta.cpp 查看文件

39
 
39
 
40
 #if ENABLED(SENSORLESS_HOMING)
40
 #if ENABLED(SENSORLESS_HOMING)
41
   #include "../feature/tmc_util.h"
41
   #include "../feature/tmc_util.h"
42
-  #include "../module/stepper_indirection.h"
42
+  #include "stepper_indirection.h"
43
 #endif
43
 #endif
44
 
44
 
45
 // Initialized by settings.load()
45
 // Initialized by settings.load()

+ 2
- 2
Marlin/src/module/endstops.cpp 查看文件

29
 
29
 
30
 #include "../Marlin.h"
30
 #include "../Marlin.h"
31
 #include "../sd/cardreader.h"
31
 #include "../sd/cardreader.h"
32
-#include "../module/temperature.h"
32
+#include "temperature.h"
33
 #include "../lcd/ultralcd.h"
33
 #include "../lcd/ultralcd.h"
34
 
34
 
35
 #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
35
 #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
37
 #endif
37
 #endif
38
 
38
 
39
 #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) && ENABLED(SDSUPPORT)
39
 #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) && ENABLED(SDSUPPORT)
40
-  #include "../module/printcounter.h" // for print_job_timer
40
+  #include "printcounter.h" // for print_job_timer
41
 #endif
41
 #endif
42
 
42
 
43
 Endstops endstops;
43
 Endstops endstops;

+ 1
- 1
Marlin/src/module/motion.h 查看文件

31
 #include "../inc/MarlinConfig.h"
31
 #include "../inc/MarlinConfig.h"
32
 
32
 
33
 #if IS_SCARA
33
 #if IS_SCARA
34
-  #include "../module/scara.h"
34
+  #include "scara.h"
35
 #endif
35
 #endif
36
 
36
 
37
 // Axis homed and known-position states
37
 // Axis homed and known-position states

+ 1
- 1
Marlin/src/module/planner.cpp 查看文件

65
 #include "planner.h"
65
 #include "planner.h"
66
 #include "stepper.h"
66
 #include "stepper.h"
67
 #include "motion.h"
67
 #include "motion.h"
68
-#include "../module/temperature.h"
68
+#include "temperature.h"
69
 #include "../lcd/ultralcd.h"
69
 #include "../lcd/ultralcd.h"
70
 #include "../core/language.h"
70
 #include "../core/language.h"
71
 #include "../gcode/parser.h"
71
 #include "../gcode/parser.h"

+ 2
- 2
Marlin/src/module/probe.cpp 查看文件

47
 #endif
47
 #endif
48
 
48
 
49
 #if ENABLED(DELTA)
49
 #if ENABLED(DELTA)
50
-  #include "../module/delta.h"
50
+  #include "delta.h"
51
 #endif
51
 #endif
52
 
52
 
53
 #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
53
 #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
57
 float zprobe_zoffset; // Initialized by settings.load()
57
 float zprobe_zoffset; // Initialized by settings.load()
58
 
58
 
59
 #if HAS_Z_SERVO_PROBE
59
 #if HAS_Z_SERVO_PROBE
60
-  #include "../module/servo.h"
60
+  #include "servo.h"
61
 #endif
61
 #endif
62
 
62
 
63
 #if ENABLED(SENSORLESS_PROBING)
63
 #if ENABLED(SENSORLESS_PROBING)

+ 1
- 1
Marlin/src/module/stepper.cpp 查看文件

89
 #include "planner.h"
89
 #include "planner.h"
90
 #include "motion.h"
90
 #include "motion.h"
91
 
91
 
92
-#include "../module/temperature.h"
92
+#include "temperature.h"
93
 #include "../lcd/ultralcd.h"
93
 #include "../lcd/ultralcd.h"
94
 #include "../core/language.h"
94
 #include "../core/language.h"
95
 #include "../gcode/queue.h"
95
 #include "../gcode/queue.h"

+ 1
- 1
Marlin/src/module/stepper.h 查看文件

223
   #include "speed_lookuptable.h"
223
   #include "speed_lookuptable.h"
224
 #endif
224
 #endif
225
 
225
 
226
-#include "../module/planner.h"
226
+#include "planner.h"
227
 #include "../core/language.h"
227
 #include "../core/language.h"
228
 
228
 
229
 class Stepper {
229
 class Stepper {

+ 1
- 1
Marlin/src/module/stepper_indirection.cpp 查看文件

35
 
35
 
36
 #include "../inc/MarlinConfig.h"
36
 #include "../inc/MarlinConfig.h"
37
 
37
 
38
-#include "../module/stepper.h"
38
+#include "stepper.h"
39
 
39
 
40
 #if HAS_DRIVER(L6470)
40
 #if HAS_DRIVER(L6470)
41
   #include "L6470/L6470_Marlin.h"
41
   #include "L6470/L6470_Marlin.h"

+ 1
- 1
Marlin/src/module/tool_change.cpp 查看文件

47
 #endif
47
 #endif
48
 
48
 
49
 #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE) || ENABLED(SWITCHING_TOOLHEAD)
49
 #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE) || ENABLED(SWITCHING_TOOLHEAD)
50
-  #include "../module/servo.h"
50
+  #include "servo.h"
51
 #endif
51
 #endif
52
 
52
 
53
 #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)
53
 #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)

正在加载...
取消
保存