SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update Marlin.cpp includes, defines

Browse source
This commit is contained in:
Scott Lahteine 2019-06-11 07:27:39 -05:00
parent c88d9ae282
commit 1ef95013f0
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/src/Marlin.cpp
View file

@ -73,10 +73,6 @@
#include "feature/mixing.h" #include "feature/mixing.h"
#endif #endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
#include "module/planner_bezier.h"
#endif
#if ENABLED(MAX7219_DEBUG) #if ENABLED(MAX7219_DEBUG)
#include "feature/Max7219_Debug_LEDs.h" #include "feature/Max7219_Debug_LEDs.h"
#endif #endif
@ -93,10 +89,6 @@
#include "module/servo.h" #include "module/servo.h"
#endif #endif
#if HAS_DIGIPOTSS
#include <SPI.h>
#endif
#if ENABLED(DAC_STEPPER_CURRENT) #if ENABLED(DAC_STEPPER_CURRENT)
#include "feature/dac/stepper_dac.h" #include "feature/dac/stepper_dac.h"
#endif #endif
@ -110,7 +102,7 @@
#include "feature/I2CPositionEncoder.h" #include "feature/I2CPositionEncoder.h"
#endif #endif
#if HAS_TRINAMIC #if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF)
#include "feature/tmc_util.h" #include "feature/tmc_util.h"
#endif #endif
@ -179,10 +171,6 @@
bool Running = true; 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 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
bool wait_for_heatup = true; bool wait_for_heatup = true;

2
Marlin/src/gcode/parser.cpp
View file

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