From 1ef95013f037212bfa6468e96b9b8120c04f6df3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 11 Jun 2019 07:27:39 -0500 Subject: [PATCH] Update Marlin.cpp includes, defines --- Marlin/src/Marlin.cpp | 14 +------------- Marlin/src/gcode/parser.cpp | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index 6f0b1fc3b7..5ee886d469 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -73,10 +73,6 @@ #include "feature/mixing.h" #endif -#if ENABLED(BEZIER_CURVE_SUPPORT) - #include "module/planner_bezier.h" -#endif - #if ENABLED(MAX7219_DEBUG) #include "feature/Max7219_Debug_LEDs.h" #endif @@ -93,10 +89,6 @@ #include "module/servo.h" #endif -#if HAS_DIGIPOTSS - #include -#endif - #if ENABLED(DAC_STEPPER_CURRENT) #include "feature/dac/stepper_dac.h" #endif @@ -110,7 +102,7 @@ #include "feature/I2CPositionEncoder.h" #endif -#if HAS_TRINAMIC +#if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF) #include "feature/tmc_util.h" #endif @@ -179,10 +171,6 @@ bool Running = true; -#if ENABLED(TEMPERATURE_UNITS_SUPPORT) - TempUnit input_temp_units = TEMPUNIT_C; -#endif - // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop bool wait_for_heatup = true; diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp index 2acf06a172..4d01560ea7 100644 --- a/Marlin/src/gcode/parser.cpp +++ b/Marlin/src/gcode/parser.cpp @@ -42,7 +42,7 @@ bool GCodeParser::volumetric_enabled; #endif #if ENABLED(TEMPERATURE_UNITS_SUPPORT) - TempUnit GCodeParser::input_temp_units; + TempUnit GCodeParser::input_temp_units = TEMPUNIT_C; #endif char *GCodeParser::command_ptr,