Browse Source

Update Marlin.cpp includes, defines

pull/1/head
Scott Lahteine 6 years ago
parent
commit
1ef95013f0
  1. 14
      Marlin/src/Marlin.cpp
  2. 2
      Marlin/src/gcode/parser.cpp

14
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 <SPI.h>
#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;

2
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,

Loading…
Cancel
Save