Browse Source

Sort out some header dependencies

pull/1/head
Scott Lahteine 8 years ago
parent
commit
d963020532
  1. 5
      Marlin/Marlin.h
  2. 35
      Marlin/Marlin_main.cpp
  3. 1
      Marlin/cardreader.cpp
  4. 13
      Marlin/planner.h
  5. 8
      Marlin/temperature.h
  6. 8
      Marlin/ultralcd.cpp

5
Marlin/Marlin.h

@ -394,11 +394,6 @@ extern uint8_t active_extruder;
void calculate_volumetric_multipliers();
// Buzzer
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
#include "buzzer.h"
#endif
/**
* Blocking movement and shorthand functions
*/

35
Marlin/Marlin_main.cpp

@ -33,20 +33,6 @@
#include "Marlin.h"
#if HAS_ABL
#include "vector_3.h"
#endif
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
#include "qr_solve.h"
#elif ENABLED(MESH_BED_LEVELING)
#include "mesh_bed_leveling.h"
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
#include "planner_bezier.h"
#endif
#include "ultralcd.h"
#include "planner.h"
#include "stepper.h"
@ -61,6 +47,23 @@
#include "duration_t.h"
#include "types.h"
#if HAS_ABL
#include "vector_3.h"
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
#include "qr_solve.h"
#endif
#elif ENABLED(MESH_BED_LEVELING)
#include "mesh_bed_leveling.h"
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
#include "planner_bezier.h"
#endif
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
#include "buzzer.h"
#endif
#if ENABLED(USE_WATCHDOG)
#include "watchdog.h"
#endif
@ -4560,7 +4563,9 @@ inline void gcode_M31() {
SERIAL_ECHO_START;
SERIAL_ECHOLNPAIR("Print time: ", buffer);
thermalManager.autotempShutdown();
#if ENABLED(AUTOTEMP)
thermalManager.autotempShutdown();
#endif
}
#if ENABLED(SDSUPPORT)

1
Marlin/cardreader.cpp

@ -24,7 +24,6 @@
#include "ultralcd.h"
#include "stepper.h"
#include "temperature.h"
#include "language.h"
#include "Marlin.h"

13
Marlin/planner.h

@ -34,21 +34,12 @@
#include "types.h"
#include "enum.h"
#include "MarlinConfig.h"
#include "Marlin.h"
#if HAS_ABL
#include "vector_3.h"
#endif
class Planner;
extern Planner planner;
#if IS_KINEMATIC
// for inline buffer_line_kinematic
extern float delta[ABC];
void inverse_kinematics(const float logical[XYZ]);
#endif
/**
* struct block_t
*
@ -402,4 +393,6 @@ class Planner {
};
extern Planner planner;
#endif // PLANNER_H

8
Marlin/temperature.h

@ -372,15 +372,15 @@ class Temperature {
*/
static void updatePID();
static void autotempShutdown() {
#if ENABLED(AUTOTEMP)
#if ENABLED(AUTOTEMP)
static void autotempShutdown() {
if (planner.autotemp_enabled) {
planner.autotemp_enabled = false;
if (degTargetHotend(EXTRUDER_IDX) > planner.autotemp_min)
setTargetHotend(0, EXTRUDER_IDX);
}
#endif
}
}
#endif
#if ENABLED(BABYSTEPPING)

8
Marlin/ultralcd.cpp

@ -30,6 +30,10 @@
#include "configuration_store.h"
#include "utility.h"
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
#include "buzzer.h"
#endif
#if ENABLED(BLTOUCH)
#include "endstops.h"
#endif
@ -581,7 +585,9 @@ void kill_screen(const char* lcd_msg) {
clear_command_queue();
quickstop_stepper();
print_job_timer.stop();
thermalManager.autotempShutdown();
#if ENABLED(AUTOTEMP)
thermalManager.autotempShutdown();
#endif
wait_for_heatup = false;
lcd_setstatus(MSG_PRINT_ABORTED, true);
}

Loading…
Cancel
Save