Browse Source

Update Marlin.cpp includes, defines

Scott Lahteine 6 years ago
parent
commit
1ef95013f0
2 changed files with 2 additions and 14 deletions
  1. 1
    13
      Marlin/src/Marlin.cpp
  2. 1
    1
      Marlin/src/gcode/parser.cpp

+ 1
- 13
Marlin/src/Marlin.cpp View File

@@ -73,10 +73,6 @@
73 73
   #include "feature/mixing.h"
74 74
 #endif
75 75
 
76
-#if ENABLED(BEZIER_CURVE_SUPPORT)
77
-  #include "module/planner_bezier.h"
78
-#endif
79
-
80 76
 #if ENABLED(MAX7219_DEBUG)
81 77
   #include "feature/Max7219_Debug_LEDs.h"
82 78
 #endif
@@ -93,10 +89,6 @@
93 89
   #include "module/servo.h"
94 90
 #endif
95 91
 
96
-#if HAS_DIGIPOTSS
97
-  #include <SPI.h>
98
-#endif
99
-
100 92
 #if ENABLED(DAC_STEPPER_CURRENT)
101 93
   #include "feature/dac/stepper_dac.h"
102 94
 #endif
@@ -110,7 +102,7 @@
110 102
   #include "feature/I2CPositionEncoder.h"
111 103
 #endif
112 104
 
113
-#if HAS_TRINAMIC
105
+#if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF)
114 106
   #include "feature/tmc_util.h"
115 107
 #endif
116 108
 
@@ -179,10 +171,6 @@
179 171
 
180 172
 bool Running = true;
181 173
 
182
-#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
183
-  TempUnit input_temp_units = TEMPUNIT_C;
184
-#endif
185
-
186 174
 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
187 175
 bool wait_for_heatup = true;
188 176
 

+ 1
- 1
Marlin/src/gcode/parser.cpp View File

@@ -42,7 +42,7 @@ bool GCodeParser::volumetric_enabled;
42 42
 #endif
43 43
 
44 44
 #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
45
-  TempUnit GCodeParser::input_temp_units;
45
+  TempUnit GCodeParser::input_temp_units = TEMPUNIT_C;
46 46
 #endif
47 47
 
48 48
 char *GCodeParser::command_ptr,

Loading…
Cancel
Save