Merge pull request #1787 from thinkyhead/fixup_tr
Fix: thermal_runaway_protection triggered by target temperature increase
This commit is contained in:
commit
4c7af484f8
|
@ -179,6 +179,9 @@ void manage_inactivity(bool ignore_stepper_queue=false);
|
||||||
#define disable_e3() /* nothing */
|
#define disable_e3() /* nothing */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void enable_all_steppers();
|
||||||
|
void disable_all_steppers();
|
||||||
|
|
||||||
enum AxisEnum {X_AXIS=0, Y_AXIS=1, A_AXIS=0, B_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5};
|
enum AxisEnum {X_AXIS=0, Y_AXIS=1, A_AXIS=0, B_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5};
|
||||||
//X_HEAD and Y_HEAD is used for systems that don't have a 1:1 relationship between X_AXIS and X Head movement, like CoreXY bots.
|
//X_HEAD and Y_HEAD is used for systems that don't have a 1:1 relationship between X_AXIS and X Head movement, like CoreXY bots.
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,7 @@
|
||||||
// Call gcode file : "M32 P !filename#" and return to caller file after finishing (similar to #include).
|
// Call gcode file : "M32 P !filename#" and return to caller file after finishing (similar to #include).
|
||||||
// The '#' is necessary when calling from within sd files, as it stops buffer prereading
|
// The '#' is necessary when calling from within sd files, as it stops buffer prereading
|
||||||
// M42 - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
|
// M42 - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
|
||||||
|
// M48 - Measure Z_Probe repeatability. M48 [n # of points] [X position] [Y position] [V_erboseness #] [E_ngage Probe] [L # of legs of travel]
|
||||||
// M80 - Turn on Power Supply
|
// M80 - Turn on Power Supply
|
||||||
// M81 - Turn off Power Supply
|
// M81 - Turn off Power Supply
|
||||||
// M82 - Set E codes absolute (default)
|
// M82 - Set E codes absolute (default)
|
||||||
|
@ -2569,13 +2570,7 @@ inline void gcode_G92() {
|
||||||
*/
|
*/
|
||||||
inline void gcode_M17() {
|
inline void gcode_M17() {
|
||||||
LCD_MESSAGEPGM(MSG_NO_MOVE);
|
LCD_MESSAGEPGM(MSG_NO_MOVE);
|
||||||
enable_x();
|
enable_all_steppers();
|
||||||
enable_y();
|
|
||||||
enable_z();
|
|
||||||
enable_e0();
|
|
||||||
enable_e1();
|
|
||||||
enable_e2();
|
|
||||||
enable_e3();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SDSUPPORT
|
#ifdef SDSUPPORT
|
||||||
|
@ -3055,26 +3050,29 @@ inline void gcode_M104() {
|
||||||
inline void gcode_M105() {
|
inline void gcode_M105() {
|
||||||
if (setTargetedHotend(105)) return;
|
if (setTargetedHotend(105)) return;
|
||||||
|
|
||||||
|
#if HAS_TEMP_0 || HAS_TEMP_BED
|
||||||
|
SERIAL_PROTOCOLPGM("ok");
|
||||||
#if HAS_TEMP_0
|
#if HAS_TEMP_0
|
||||||
SERIAL_PROTOCOLPGM("ok T:");
|
SERIAL_PROTOCOLPGM(" T:");
|
||||||
SERIAL_PROTOCOL_F(degHotend(tmp_extruder),1);
|
SERIAL_PROTOCOL_F(degHotend(tmp_extruder), 1);
|
||||||
SERIAL_PROTOCOLPGM(" /");
|
SERIAL_PROTOCOLPGM(" /");
|
||||||
SERIAL_PROTOCOL_F(degTargetHotend(tmp_extruder),1);
|
SERIAL_PROTOCOL_F(degTargetHotend(tmp_extruder), 1);
|
||||||
|
#endif
|
||||||
#if HAS_TEMP_BED
|
#if HAS_TEMP_BED
|
||||||
SERIAL_PROTOCOLPGM(" B:");
|
SERIAL_PROTOCOLPGM(" B:");
|
||||||
SERIAL_PROTOCOL_F(degBed(),1);
|
SERIAL_PROTOCOL_F(degBed(), 1);
|
||||||
SERIAL_PROTOCOLPGM(" /");
|
SERIAL_PROTOCOLPGM(" /");
|
||||||
SERIAL_PROTOCOL_F(degTargetBed(),1);
|
SERIAL_PROTOCOL_F(degTargetBed(), 1);
|
||||||
#endif // HAS_TEMP_BED
|
#endif
|
||||||
for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) {
|
for (int8_t e = 0; e < EXTRUDERS; ++e) {
|
||||||
SERIAL_PROTOCOLPGM(" T");
|
SERIAL_PROTOCOLPGM(" T");
|
||||||
SERIAL_PROTOCOL(cur_extruder);
|
SERIAL_PROTOCOL(e);
|
||||||
SERIAL_PROTOCOLPGM(":");
|
SERIAL_PROTOCOLPGM(":");
|
||||||
SERIAL_PROTOCOL_F(degHotend(cur_extruder),1);
|
SERIAL_PROTOCOL_F(degHotend(e), 1);
|
||||||
SERIAL_PROTOCOLPGM(" /");
|
SERIAL_PROTOCOLPGM(" /");
|
||||||
SERIAL_PROTOCOL_F(degTargetHotend(cur_extruder),1);
|
SERIAL_PROTOCOL_F(degTargetHotend(e), 1);
|
||||||
}
|
}
|
||||||
#else // !HAS_TEMP_0
|
#else // !HAS_TEMP_0 && !HAS_TEMP_BED
|
||||||
SERIAL_ERROR_START;
|
SERIAL_ERROR_START;
|
||||||
SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);
|
SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);
|
||||||
#endif
|
#endif
|
||||||
|
@ -3112,7 +3110,7 @@ inline void gcode_M105() {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAS_FAN
|
#if HAS_FAN
|
||||||
|
@ -3127,7 +3125,7 @@ inline void gcode_M105() {
|
||||||
*/
|
*/
|
||||||
inline void gcode_M107() { fanSpeed = 0; }
|
inline void gcode_M107() { fanSpeed = 0; }
|
||||||
|
|
||||||
#endif //FAN_PIN
|
#endif // HAS_FAN
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M109: Wait for extruder(s) to reach temperature
|
* M109: Wait for extruder(s) to reach temperature
|
||||||
|
@ -3185,10 +3183,10 @@ inline void gcode_M109() {
|
||||||
SERIAL_PROTOCOLLN( timetemp );
|
SERIAL_PROTOCOLLN( timetemp );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
SERIAL_PROTOCOLLN( "?" );
|
SERIAL_PROTOCOLLNPGM("?");
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
#endif
|
#endif
|
||||||
timetemp = millis();
|
timetemp = millis();
|
||||||
}
|
}
|
||||||
|
@ -3240,7 +3238,7 @@ inline void gcode_M109() {
|
||||||
SERIAL_PROTOCOL((int)active_extruder);
|
SERIAL_PROTOCOL((int)active_extruder);
|
||||||
SERIAL_PROTOCOLPGM(" B:");
|
SERIAL_PROTOCOLPGM(" B:");
|
||||||
SERIAL_PROTOCOL_F(degBed(), 1);
|
SERIAL_PROTOCOL_F(degBed(), 1);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
manage_heater();
|
manage_heater();
|
||||||
manage_inactivity();
|
manage_inactivity();
|
||||||
|
@ -3441,27 +3439,26 @@ inline void gcode_M114() {
|
||||||
SERIAL_PROTOCOLPGM(" Z:");
|
SERIAL_PROTOCOLPGM(" Z:");
|
||||||
SERIAL_PROTOCOL(float(st_get_position(Z_AXIS))/axis_steps_per_unit[Z_AXIS]);
|
SERIAL_PROTOCOL(float(st_get_position(Z_AXIS))/axis_steps_per_unit[Z_AXIS]);
|
||||||
|
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
|
|
||||||
#ifdef SCARA
|
#ifdef SCARA
|
||||||
SERIAL_PROTOCOLPGM("SCARA Theta:");
|
SERIAL_PROTOCOLPGM("SCARA Theta:");
|
||||||
SERIAL_PROTOCOL(delta[X_AXIS]);
|
SERIAL_PROTOCOL(delta[X_AXIS]);
|
||||||
SERIAL_PROTOCOLPGM(" Psi+Theta:");
|
SERIAL_PROTOCOLPGM(" Psi+Theta:");
|
||||||
SERIAL_PROTOCOL(delta[Y_AXIS]);
|
SERIAL_PROTOCOL(delta[Y_AXIS]);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
|
|
||||||
SERIAL_PROTOCOLPGM("SCARA Cal - Theta:");
|
SERIAL_PROTOCOLPGM("SCARA Cal - Theta:");
|
||||||
SERIAL_PROTOCOL(delta[X_AXIS]+home_offset[X_AXIS]);
|
SERIAL_PROTOCOL(delta[X_AXIS]+home_offset[X_AXIS]);
|
||||||
SERIAL_PROTOCOLPGM(" Psi+Theta (90):");
|
SERIAL_PROTOCOLPGM(" Psi+Theta (90):");
|
||||||
SERIAL_PROTOCOL(delta[Y_AXIS]-delta[X_AXIS]-90+home_offset[Y_AXIS]);
|
SERIAL_PROTOCOL(delta[Y_AXIS]-delta[X_AXIS]-90+home_offset[Y_AXIS]);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
|
|
||||||
SERIAL_PROTOCOLPGM("SCARA step Cal - Theta:");
|
SERIAL_PROTOCOLPGM("SCARA step Cal - Theta:");
|
||||||
SERIAL_PROTOCOL(delta[X_AXIS]/90*axis_steps_per_unit[X_AXIS]);
|
SERIAL_PROTOCOL(delta[X_AXIS]/90*axis_steps_per_unit[X_AXIS]);
|
||||||
SERIAL_PROTOCOLPGM(" Psi+Theta:");
|
SERIAL_PROTOCOLPGM(" Psi+Theta:");
|
||||||
SERIAL_PROTOCOL((delta[Y_AXIS]-delta[X_AXIS])/90*axis_steps_per_unit[Y_AXIS]);
|
SERIAL_PROTOCOL((delta[Y_AXIS]-delta[X_AXIS])/90*axis_steps_per_unit[Y_AXIS]);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL; SERIAL_EOL;
|
||||||
SERIAL_PROTOCOLLN("");
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3907,7 +3904,7 @@ inline void gcode_M226() {
|
||||||
SERIAL_PROTOCOL(servo_index);
|
SERIAL_PROTOCOL(servo_index);
|
||||||
SERIAL_PROTOCOL(": ");
|
SERIAL_PROTOCOL(": ");
|
||||||
SERIAL_PROTOCOL(servos[servo_index].read());
|
SERIAL_PROTOCOL(servos[servo_index].read());
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3975,7 +3972,7 @@ inline void gcode_M226() {
|
||||||
//Kc does not have scaling applied above, or in resetting defaults
|
//Kc does not have scaling applied above, or in resetting defaults
|
||||||
SERIAL_PROTOCOL(PID_PARAM(Kc, e));
|
SERIAL_PROTOCOL(PID_PARAM(Kc, e));
|
||||||
#endif
|
#endif
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
SERIAL_ECHO_START;
|
SERIAL_ECHO_START;
|
||||||
|
@ -4000,7 +3997,7 @@ inline void gcode_M226() {
|
||||||
SERIAL_PROTOCOL(unscalePID_i(bedKi));
|
SERIAL_PROTOCOL(unscalePID_i(bedKi));
|
||||||
SERIAL_PROTOCOL(" d:");
|
SERIAL_PROTOCOL(" d:");
|
||||||
SERIAL_PROTOCOL(unscalePID_d(bedKd));
|
SERIAL_PROTOCOL(unscalePID_d(bedKd));
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // PIDTEMPBED
|
#endif // PIDTEMPBED
|
||||||
|
@ -4050,7 +4047,7 @@ inline void gcode_M226() {
|
||||||
if (code_seen('C')) lcd_setcontrast(code_value_long() & 0x3F);
|
if (code_seen('C')) lcd_setcontrast(code_value_long() & 0x3F);
|
||||||
SERIAL_PROTOCOLPGM("lcd contrast value: ");
|
SERIAL_PROTOCOLPGM("lcd contrast value: ");
|
||||||
SERIAL_PROTOCOL(lcd_contrast);
|
SERIAL_PROTOCOL(lcd_contrast);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // DOGLCD
|
#endif // DOGLCD
|
||||||
|
@ -4323,7 +4320,7 @@ inline void gcode_M503() {
|
||||||
zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
|
zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
|
||||||
SERIAL_ECHO_START;
|
SERIAL_ECHO_START;
|
||||||
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
|
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
SERIAL_ECHO_START;
|
SERIAL_ECHO_START;
|
||||||
|
@ -4332,14 +4329,14 @@ inline void gcode_M503() {
|
||||||
SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MIN);
|
SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MIN);
|
||||||
SERIAL_ECHOPGM(MSG_Z_MAX);
|
SERIAL_ECHOPGM(MSG_Z_MAX);
|
||||||
SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MAX);
|
SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MAX);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
SERIAL_ECHO_START;
|
SERIAL_ECHO_START;
|
||||||
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " : ");
|
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " : ");
|
||||||
SERIAL_ECHO(-zprobe_zoffset);
|
SERIAL_ECHO(-zprobe_zoffset);
|
||||||
SERIAL_PROTOCOLLN("");
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5693,7 +5690,17 @@ void handle_status_leds(void) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void disable_all_axes() {
|
void enable_all_steppers() {
|
||||||
|
enable_x();
|
||||||
|
enable_y();
|
||||||
|
enable_z();
|
||||||
|
enable_e0();
|
||||||
|
enable_e1();
|
||||||
|
enable_e2();
|
||||||
|
enable_e3();
|
||||||
|
}
|
||||||
|
|
||||||
|
void disable_all_steppers() {
|
||||||
disable_x();
|
disable_x();
|
||||||
disable_y();
|
disable_y();
|
||||||
disable_z();
|
disable_z();
|
||||||
|
@ -5721,7 +5728,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
|
||||||
|
|
||||||
if (stepper_inactive_time && ms > previous_millis_cmd + stepper_inactive_time
|
if (stepper_inactive_time && ms > previous_millis_cmd + stepper_inactive_time
|
||||||
&& !ignore_stepper_queue && !blocks_queued())
|
&& !ignore_stepper_queue && !blocks_queued())
|
||||||
disable_all_axes();
|
disable_all_steppers();
|
||||||
|
|
||||||
#ifdef CHDK //Check if pin should be set to LOW after M240 set it to HIGH
|
#ifdef CHDK //Check if pin should be set to LOW after M240 set it to HIGH
|
||||||
if (chdkActive && ms > chdkHigh + CHDK_DELAY) {
|
if (chdkActive && ms > chdkHigh + CHDK_DELAY) {
|
||||||
|
@ -5809,7 +5816,7 @@ void kill()
|
||||||
cli(); // Stop interrupts
|
cli(); // Stop interrupts
|
||||||
disable_heater();
|
disable_heater();
|
||||||
|
|
||||||
disable_all_axes();
|
disable_all_steppers();
|
||||||
|
|
||||||
#if HAS_POWER_SWITCH
|
#if HAS_POWER_SWITCH
|
||||||
pinMode(PS_ON_PIN, INPUT);
|
pinMode(PS_ON_PIN, INPUT);
|
||||||
|
|
|
@ -614,7 +614,7 @@ float junction_deviation = 0.1;
|
||||||
#if EXTRUDERS > 1
|
#if EXTRUDERS > 1
|
||||||
case 1:
|
case 1:
|
||||||
enable_e1();
|
enable_e1();
|
||||||
g_uc_extruder_last_move[1] = BLOCK_BUFFER_SIZE*2;
|
g_uc_extruder_last_move[1] = BLOCK_BUFFER_SIZE * 2;
|
||||||
if (g_uc_extruder_last_move[0] == 0) disable_e0();
|
if (g_uc_extruder_last_move[0] == 0) disable_e0();
|
||||||
#if EXTRUDERS > 2
|
#if EXTRUDERS > 2
|
||||||
if (g_uc_extruder_last_move[2] == 0) disable_e2();
|
if (g_uc_extruder_last_move[2] == 0) disable_e2();
|
||||||
|
@ -626,7 +626,7 @@ float junction_deviation = 0.1;
|
||||||
#if EXTRUDERS > 2
|
#if EXTRUDERS > 2
|
||||||
case 2:
|
case 2:
|
||||||
enable_e2();
|
enable_e2();
|
||||||
g_uc_extruder_last_move[2] = BLOCK_BUFFER_SIZE*2;
|
g_uc_extruder_last_move[2] = BLOCK_BUFFER_SIZE * 2;
|
||||||
if (g_uc_extruder_last_move[0] == 0) disable_e0();
|
if (g_uc_extruder_last_move[0] == 0) disable_e0();
|
||||||
if (g_uc_extruder_last_move[1] == 0) disable_e1();
|
if (g_uc_extruder_last_move[1] == 0) disable_e1();
|
||||||
#if EXTRUDERS > 3
|
#if EXTRUDERS > 3
|
||||||
|
@ -636,7 +636,7 @@ float junction_deviation = 0.1;
|
||||||
#if EXTRUDERS > 3
|
#if EXTRUDERS > 3
|
||||||
case 3:
|
case 3:
|
||||||
enable_e3();
|
enable_e3();
|
||||||
g_uc_extruder_last_move[3] = BLOCK_BUFFER_SIZE*2;
|
g_uc_extruder_last_move[3] = BLOCK_BUFFER_SIZE * 2;
|
||||||
if (g_uc_extruder_last_move[0] == 0) disable_e0();
|
if (g_uc_extruder_last_move[0] == 0) disable_e0();
|
||||||
if (g_uc_extruder_last_move[1] == 0) disable_e1();
|
if (g_uc_extruder_last_move[1] == 0) disable_e1();
|
||||||
if (g_uc_extruder_last_move[2] == 0) disable_e2();
|
if (g_uc_extruder_last_move[2] == 0) disable_e2();
|
||||||
|
|
|
@ -1127,13 +1127,7 @@ long st_get_position(uint8_t axis) {
|
||||||
|
|
||||||
void finishAndDisableSteppers() {
|
void finishAndDisableSteppers() {
|
||||||
st_synchronize();
|
st_synchronize();
|
||||||
disable_x();
|
disable_all_steppers();
|
||||||
disable_y();
|
|
||||||
disable_z();
|
|
||||||
disable_e0();
|
|
||||||
disable_e1();
|
|
||||||
disable_e2();
|
|
||||||
disable_e3();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void quickStop() {
|
void quickStop() {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
temperature.c - temperature control
|
temperature.cpp - temperature control
|
||||||
Part of Marlin
|
Part of Marlin
|
||||||
|
|
||||||
Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
@ -16,18 +16,7 @@
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
This firmware is a mashup between Sprinter and grbl.
|
|
||||||
(https://github.com/kliment/Sprinter)
|
|
||||||
(https://github.com/simen/grbl/tree)
|
|
||||||
|
|
||||||
It has preliminary support for Matthew Roberts advance algorithm
|
|
||||||
http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "Marlin.h"
|
||||||
#include "ultralcd.h"
|
#include "ultralcd.h"
|
||||||
|
@ -87,14 +76,15 @@ unsigned char soft_pwm_bed;
|
||||||
#define HAS_HEATER_THERMAL_PROTECTION (defined(THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0)
|
#define HAS_HEATER_THERMAL_PROTECTION (defined(THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0)
|
||||||
#define HAS_BED_THERMAL_PROTECTION (defined(THERMAL_RUNAWAY_PROTECTION_BED_PERIOD) && THERMAL_RUNAWAY_PROTECTION_BED_PERIOD > 0 && TEMP_SENSOR_BED != 0)
|
#define HAS_BED_THERMAL_PROTECTION (defined(THERMAL_RUNAWAY_PROTECTION_BED_PERIOD) && THERMAL_RUNAWAY_PROTECTION_BED_PERIOD > 0 && TEMP_SENSOR_BED != 0)
|
||||||
#if HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
|
#if HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
|
||||||
|
enum TRState { TRInactive, TRFirstHeating, TRStable };
|
||||||
static bool thermal_runaway = false;
|
static bool thermal_runaway = false;
|
||||||
void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc);
|
void thermal_runaway_protection(TRState *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc);
|
||||||
#if HAS_HEATER_THERMAL_PROTECTION
|
#if HAS_HEATER_THERMAL_PROTECTION
|
||||||
static int thermal_runaway_state_machine[4]; // = {0,0,0,0};
|
static TRState thermal_runaway_state_machine[4] = { TRInactive, TRInactive, TRInactive, TRInactive };
|
||||||
static unsigned long thermal_runaway_timer[4]; // = {0,0,0,0};
|
static unsigned long thermal_runaway_timer[4]; // = {0,0,0,0};
|
||||||
#endif
|
#endif
|
||||||
#if HAS_BED_THERMAL_PROTECTION
|
#if HAS_BED_THERMAL_PROTECTION
|
||||||
static int thermal_runaway_bed_state_machine;
|
static TRState thermal_runaway_bed_state_machine = { TRInactive, TRInactive, TRInactive, TRInactive };
|
||||||
static unsigned long thermal_runaway_bed_timer;
|
static unsigned long thermal_runaway_bed_timer;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -238,7 +228,7 @@ void PID_autotune(float temp, int extruder, int ncycles)
|
||||||
soft_pwm[extruder] = bias = d = PID_MAX / 2;
|
soft_pwm[extruder] = bias = d = PID_MAX / 2;
|
||||||
|
|
||||||
// PID Tuning loop
|
// PID Tuning loop
|
||||||
for(;;) {
|
for (;;) {
|
||||||
|
|
||||||
unsigned long ms = millis();
|
unsigned long ms = millis();
|
||||||
|
|
||||||
|
@ -609,7 +599,7 @@ void manage_heater() {
|
||||||
// Loop through all extruders
|
// Loop through all extruders
|
||||||
for (int e = 0; e < EXTRUDERS; e++) {
|
for (int e = 0; e < EXTRUDERS; e++) {
|
||||||
|
|
||||||
#if defined (THERMAL_RUNAWAY_PROTECTION_PERIOD) && THERMAL_RUNAWAY_PROTECTION_PERIOD > 0
|
#if HAS_HEATER_THERMAL_PROTECTION
|
||||||
thermal_runaway_protection(&thermal_runaway_state_machine[e], &thermal_runaway_timer[e], current_temperature[e], target_temperature[e], e, THERMAL_RUNAWAY_PROTECTION_PERIOD, THERMAL_RUNAWAY_PROTECTION_HYSTERESIS);
|
thermal_runaway_protection(&thermal_runaway_state_machine[e], &thermal_runaway_timer[e], current_temperature[e], target_temperature[e], e, THERMAL_RUNAWAY_PROTECTION_PERIOD, THERMAL_RUNAWAY_PROTECTION_HYSTERESIS);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -637,7 +627,7 @@ void manage_heater() {
|
||||||
disable_heater();
|
disable_heater();
|
||||||
_temp_error(0, PSTR(MSG_EXTRUDER_SWITCHED_OFF), PSTR(MSG_ERR_REDUNDANT_TEMP));
|
_temp_error(0, PSTR(MSG_EXTRUDER_SWITCHED_OFF), PSTR(MSG_ERR_REDUNDANT_TEMP));
|
||||||
}
|
}
|
||||||
#endif //TEMP_SENSOR_1_AS_REDUNDANT
|
#endif // TEMP_SENSOR_1_AS_REDUNDANT
|
||||||
|
|
||||||
} // Extruders Loop
|
} // Extruders Loop
|
||||||
|
|
||||||
|
@ -656,7 +646,7 @@ void manage_heater() {
|
||||||
#if TEMP_SENSOR_BED != 0
|
#if TEMP_SENSOR_BED != 0
|
||||||
|
|
||||||
#if HAS_BED_THERMAL_PROTECTION
|
#if HAS_BED_THERMAL_PROTECTION
|
||||||
thermal_runaway_protection(&thermal_runaway_bed_state_machine, &thermal_runaway_bed_timer, current_temperature_bed, target_temperature_bed, 9, THERMAL_RUNAWAY_PROTECTION_BED_PERIOD, THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS);
|
thermal_runaway_protection(&thermal_runaway_bed_state_machine, &thermal_runaway_bed_timer, current_temperature_bed, target_temperature_bed, -1, THERMAL_RUNAWAY_PROTECTION_BED_PERIOD, THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PIDTEMPBED
|
#ifdef PIDTEMPBED
|
||||||
|
@ -1014,69 +1004,76 @@ void setWatch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
|
#if HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
|
||||||
void thermal_runaway_protection(int *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc)
|
|
||||||
{
|
void thermal_runaway_protection(TRState *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc) {
|
||||||
/*
|
|
||||||
|
static int tr_target_temperature[EXTRUDERS+1];
|
||||||
|
|
||||||
|
/*
|
||||||
SERIAL_ECHO_START;
|
SERIAL_ECHO_START;
|
||||||
SERIAL_ECHO("Thermal Thermal Runaway Running. Heater ID:");
|
SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: ");
|
||||||
SERIAL_ECHO(heater_id);
|
if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHOPGM(heater_id);
|
||||||
SERIAL_ECHO(" ; State:");
|
SERIAL_ECHOPGM(" ; State:");
|
||||||
SERIAL_ECHO(*state);
|
SERIAL_ECHOPGM(*state);
|
||||||
SERIAL_ECHO(" ; Timer:");
|
SERIAL_ECHOPGM(" ; Timer:");
|
||||||
SERIAL_ECHO(*timer);
|
SERIAL_ECHOPGM(*timer);
|
||||||
SERIAL_ECHO(" ; Temperature:");
|
SERIAL_ECHOPGM(" ; Temperature:");
|
||||||
SERIAL_ECHO(temperature);
|
SERIAL_ECHOPGM(temperature);
|
||||||
SERIAL_ECHO(" ; Target Temp:");
|
SERIAL_ECHOPGM(" ; Target Temp:");
|
||||||
SERIAL_ECHO(target_temperature);
|
SERIAL_ECHOPGM(target_temperature);
|
||||||
SERIAL_ECHOLN("");
|
SERIAL_EOL;
|
||||||
*/
|
*/
|
||||||
if ((target_temperature == 0) || thermal_runaway)
|
if (target_temperature == 0 || thermal_runaway) {
|
||||||
{
|
*state = TRInactive;
|
||||||
*state = 0;
|
|
||||||
*timer = 0;
|
*timer = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (*state)
|
|
||||||
{
|
int heater_index = heater_id >= 0 ? heater_id : EXTRUDERS;
|
||||||
case 0: // "Heater Inactive" state
|
|
||||||
if (target_temperature > 0) *state = 1;
|
switch (*state) {
|
||||||
break;
|
// Inactive state waits for a target temperature to be set
|
||||||
case 1: // "First Heating" state
|
case TRInactive:
|
||||||
if (temperature >= target_temperature) *state = 2;
|
if (target_temperature > 0) {
|
||||||
break;
|
*state = TRFirstHeating;
|
||||||
case 2: // "Temperature Stable" state
|
tr_target_temperature[heater_index] = target_temperature;
|
||||||
{
|
|
||||||
unsigned long ms = millis();
|
|
||||||
if (temperature >= (target_temperature - hysteresis_degc))
|
|
||||||
{
|
|
||||||
*timer = ms;
|
|
||||||
}
|
}
|
||||||
else if ( (ms - *timer) > ((unsigned long) period_seconds) * 1000)
|
break;
|
||||||
|
// When first heating, wait for the temperature to be reached then go to Stable state
|
||||||
|
case TRFirstHeating:
|
||||||
|
if (temperature >= tr_target_temperature[heater_index]) *state = TRStable;
|
||||||
|
break;
|
||||||
|
// While the temperature is stable watch for a bad temperature
|
||||||
|
case TRStable:
|
||||||
{
|
{
|
||||||
|
// If the target temperature changes, restart
|
||||||
|
if (tr_target_temperature[heater_index] != target_temperature) {
|
||||||
|
*state = TRInactive;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the temperature is over the target (-hysteresis) restart the timer
|
||||||
|
if (temperature >= tr_target_temperature[heater_index] - hysteresis_degc) *timer = millis();
|
||||||
|
|
||||||
|
// If the timer goes too long without a reset, trigger shutdown
|
||||||
|
else if (millis() > *timer + period_seconds * 1000UL) {
|
||||||
SERIAL_ERROR_START;
|
SERIAL_ERROR_START;
|
||||||
SERIAL_ERRORLNPGM(MSG_THERMAL_RUNAWAY_STOP);
|
SERIAL_ERRORLNPGM(MSG_THERMAL_RUNAWAY_STOP);
|
||||||
SERIAL_ERRORLN((int)heater_id);
|
if (heater_id < 0) SERIAL_ERRORLNPGM("bed"); else SERIAL_ERRORLN(heater_id);
|
||||||
LCD_ALERTMESSAGEPGM(MSG_THERMAL_RUNAWAY); // translatable
|
LCD_ALERTMESSAGEPGM(MSG_THERMAL_RUNAWAY);
|
||||||
thermal_runaway = true;
|
thermal_runaway = true;
|
||||||
while(1)
|
for (;;) {
|
||||||
{
|
|
||||||
disable_heater();
|
disable_heater();
|
||||||
disable_x();
|
disable_all_steppers();
|
||||||
disable_y();
|
|
||||||
disable_z();
|
|
||||||
disable_e0();
|
|
||||||
disable_e1();
|
|
||||||
disable_e2();
|
|
||||||
disable_e3();
|
|
||||||
manage_heater();
|
manage_heater();
|
||||||
lcd_update();
|
lcd_update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif //THERMAL_RUNAWAY_PROTECTION_PERIOD
|
|
||||||
|
|
||||||
|
#endif // HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
|
||||||
|
|
||||||
void disable_heater() {
|
void disable_heater() {
|
||||||
for (int i=0; i<EXTRUDERS; i++) setTargetHotend(0, i);
|
for (int i=0; i<EXTRUDERS; i++) setTargetHotend(0, i);
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef temperature_h
|
#ifndef TEMPERATURE_H
|
||||||
#define temperature_h
|
#define TEMPERATURE_H
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "Marlin.h"
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
|
@ -105,40 +105,27 @@ FORCE_INLINE bool isHeatingBed() { return target_temperature_bed > current_tempe
|
||||||
FORCE_INLINE bool isCoolingHotend(uint8_t extruder) { return target_temperature[extruder] < current_temperature[extruder]; }
|
FORCE_INLINE bool isCoolingHotend(uint8_t extruder) { return target_temperature[extruder] < current_temperature[extruder]; }
|
||||||
FORCE_INLINE bool isCoolingBed() { return target_temperature_bed < current_temperature_bed; }
|
FORCE_INLINE bool isCoolingBed() { return target_temperature_bed < current_temperature_bed; }
|
||||||
|
|
||||||
#define degHotend0() degHotend(0)
|
#define HOTEND_ROUTINES(NR) \
|
||||||
#define degTargetHotend0() degTargetHotend(0)
|
FORCE_INLINE float degHotend##NR() { return degHotend(NR); } \
|
||||||
#define setTargetHotend0(_celsius) setTargetHotend((_celsius), 0)
|
FORCE_INLINE float degTargetHotend##NR() { return degTargetHotend(NR); } \
|
||||||
#define isHeatingHotend0() isHeatingHotend(0)
|
FORCE_INLINE void setTargetHotend##NR(const float c) { setTargetHotend(c, NR); } \
|
||||||
#define isCoolingHotend0() isCoolingHotend(0)
|
FORCE_INLINE bool isHeatingHotend##NR() { return isHeatingHotend(NR); } \
|
||||||
|
FORCE_INLINE bool isCoolingHotend##NR() { return isCoolingHotend(NR); }
|
||||||
|
HOTEND_ROUTINES(0);
|
||||||
#if EXTRUDERS > 1
|
#if EXTRUDERS > 1
|
||||||
#define degHotend1() degHotend(1)
|
HOTEND_ROUTINES(1);
|
||||||
#define degTargetHotend1() degTargetHotend(1)
|
|
||||||
#define setTargetHotend1(_celsius) setTargetHotend((_celsius), 1)
|
|
||||||
#define isHeatingHotend1() isHeatingHotend(1)
|
|
||||||
#define isCoolingHotend1() isCoolingHotend(1)
|
|
||||||
#else
|
#else
|
||||||
#define setTargetHotend1(_celsius) do{}while(0)
|
#define setTargetHotend1(c) do{}while(0)
|
||||||
#endif
|
#endif
|
||||||
#if EXTRUDERS > 2
|
#if EXTRUDERS > 2
|
||||||
#define degHotend2() degHotend(2)
|
HOTEND_ROUTINES(2);
|
||||||
#define degTargetHotend2() degTargetHotend(2)
|
|
||||||
#define setTargetHotend2(_celsius) setTargetHotend((_celsius), 2)
|
|
||||||
#define isHeatingHotend2() isHeatingHotend(2)
|
|
||||||
#define isCoolingHotend2() isCoolingHotend(2)
|
|
||||||
#else
|
#else
|
||||||
#define setTargetHotend2(_celsius) do{}while(0)
|
#define setTargetHotend2(c) do{}while(0)
|
||||||
#endif
|
#endif
|
||||||
#if EXTRUDERS > 3
|
#if EXTRUDERS > 3
|
||||||
#define degHotend3() degHotend(3)
|
HOTEND_ROUTINES(3);
|
||||||
#define degTargetHotend3() degTargetHotend(3)
|
|
||||||
#define setTargetHotend3(_celsius) setTargetHotend((_celsius), 3)
|
|
||||||
#define isHeatingHotend3() isHeatingHotend(3)
|
|
||||||
#define isCoolingHotend3() isCoolingHotend(3)
|
|
||||||
#else
|
#else
|
||||||
#define setTargetHotend3(_celsius) do{}while(0)
|
#define setTargetHotend3(c) do{}while(0)
|
||||||
#endif
|
|
||||||
#if EXTRUDERS > 4
|
|
||||||
#error Invalid number of extruders
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int getHeaterPower(int heater);
|
int getHeaterPower(int heater);
|
||||||
|
@ -161,5 +148,4 @@ FORCE_INLINE void autotempShutdown() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // TEMPERATURE_H
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in a new issue