bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Shut down autotemp in disable_all_heaters

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-03 20:43:00 -05:00
parent acec237092
commit 6854f08d22
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -141,7 +141,7 @@ script:
- restore_configs - restore_configs
- opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
- opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES - opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP
- build_marlin - build_marlin
# #
# Test MESH_BED_LEVELING feature, with LCD # Test MESH_BED_LEVELING feature, with LCD

4
Marlin/Marlin_main.cpp
View File

@ -5762,10 +5762,6 @@ 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();
#endif
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

8
Marlin/temperature.cpp
View File

@ -25,9 +25,10 @@
*/ */
#include "Marlin.h" #include "Marlin.h"
#include "ultralcd.h"
#include "temperature.h" #include "temperature.h"
#include "thermistortables.h" #include "thermistortables.h"
#include "ultralcd.h"
#include "planner.h"
#include "language.h" #include "language.h"
#if ENABLED(HEATER_0_USES_MAX6675) #if ENABLED(HEATER_0_USES_MAX6675)
@ -1288,6 +1289,11 @@ void Temperature::init() {
#endif // THERMAL_PROTECTION_HOTENDS || THERMAL_PROTECTION_BED #endif // THERMAL_PROTECTION_HOTENDS || THERMAL_PROTECTION_BED
void Temperature::disable_all_heaters() { void Temperature::disable_all_heaters() {
#if ENABLED(AUTOTEMP)
planner.autotemp_enabled = false;
#endif
HOTEND_LOOP() setTargetHotend(0, e); HOTEND_LOOP() setTargetHotend(0, e);
setTargetBed(0); setTargetBed(0);

11
Marlin/temperature.h
View File

@ -27,7 +27,6 @@
#ifndef TEMPERATURE_H #ifndef TEMPERATURE_H
#define TEMPERATURE_H #define TEMPERATURE_H
#include "planner.h"
#include "thermistortables.h" #include "thermistortables.h"
#include "MarlinConfig.h" #include "MarlinConfig.h"
@ -418,16 +417,6 @@ class Temperature {
*/ */
static void updatePID(); static void updatePID();
#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
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
static void babystep_axis(const AxisEnum axis, const int distance) { static void babystep_axis(const AxisEnum axis, const int distance) {