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

Sort out some header dependencies

Browse source
This commit is contained in:
Scott Lahteine 2016-10-10 15:34:35 -05:00
parent 2cb5df8a56
commit d963020532
6 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/Marlin.h
View file

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

33
Marlin/Marlin_main.cpp
View file

@ -33,20 +33,6 @@
#include "Marlin.h" #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 "ultralcd.h"
#include "planner.h" #include "planner.h"
#include "stepper.h" #include "stepper.h"
@ -61,6 +47,23 @@
#include "duration_t.h" #include "duration_t.h"
#include "types.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) #if ENABLED(USE_WATCHDOG)
#include "watchdog.h" #include "watchdog.h"
#endif #endif
@ -4560,7 +4563,9 @@ inline void gcode_M31() {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLNPAIR("Print time: ", buffer); SERIAL_ECHOLNPAIR("Print time: ", buffer);
#if ENABLED(AUTOTEMP)
thermalManager.autotempShutdown(); thermalManager.autotempShutdown();
#endif
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

1
Marlin/cardreader.cpp
View file

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

13
Marlin/planner.h
View file

@ -34,21 +34,12 @@
#include "types.h" #include "types.h"
#include "enum.h" #include "enum.h"
#include "MarlinConfig.h" #include "Marlin.h"
#if HAS_ABL #if HAS_ABL
#include "vector_3.h" #include "vector_3.h"
#endif #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 * struct block_t
* *
@ -402,4 +393,6 @@ class Planner {
}; };
extern Planner planner;
#endif // PLANNER_H #endif // PLANNER_H

4
Marlin/temperature.h
View file

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

6
Marlin/ultralcd.cpp
View file

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