From e96df6763048bf21dbd71ed1742e34ac0854d53e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 2 Apr 2015 05:10:14 -0700
Subject: [PATCH 1/6] Clarify thermal_runaway_protection
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
---
Marlin/Marlin_main.cpp | 59 ++++++++--------
Marlin/planner.cpp | 4 +-
Marlin/temperature.cpp | 152 +++++++++++++++++++----------------------
Marlin/temperature.h | 46 +++++--------
4 files changed, 118 insertions(+), 143 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 6b41be6179..24d9f0d477 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -1460,7 +1460,7 @@ static void homeaxis(int axis) {
sync_plan_position();
// Engage Servo endstop if enabled
- #ifdef SERVO_ENDSTOPS && !defined(Z_PROBE_SLED)
+ #if defined(SERVO_ENDSTOPS) && !defined(Z_PROBE_SLED)
#if SERVO_LEVELING
if (axis == Z_AXIS) engage_z_probe(); else
@@ -2781,7 +2781,7 @@ inline void gcode_M42() {
}
}
- #if defined(FAN_PIN) && FAN_PIN > -1
+ #if HAS_FAN
if (pin_number == FAN_PIN) fanSpeed = pin_status;
#endif
@@ -3067,17 +3067,17 @@ inline void gcode_M104() {
inline void gcode_M105() {
if (setTargetedHotend(105)) return;
- #if defined(TEMP_0_PIN) && TEMP_0_PIN > -1
+ #if HAS_TEMP_0
SERIAL_PROTOCOLPGM("ok T:");
SERIAL_PROTOCOL_F(degHotend(tmp_extruder),1);
SERIAL_PROTOCOLPGM(" /");
SERIAL_PROTOCOL_F(degTargetHotend(tmp_extruder),1);
- #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
+ #if HAS_TEMP_BED
SERIAL_PROTOCOLPGM(" B:");
SERIAL_PROTOCOL_F(degBed(),1);
SERIAL_PROTOCOLPGM(" /");
SERIAL_PROTOCOL_F(degTargetBed(),1);
- #endif //TEMP_BED_PIN
+ #endif
for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) {
SERIAL_PROTOCOLPGM(" T");
SERIAL_PROTOCOL(cur_extruder);
@@ -3108,7 +3108,7 @@ inline void gcode_M105() {
#endif
#ifdef SHOW_TEMP_ADC_VALUES
- #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
+ #if HAS_TEMP_BED
SERIAL_PROTOCOLPGM(" ADC B:");
SERIAL_PROTOCOL_F(degBed(),1);
SERIAL_PROTOCOLPGM("C->");
@@ -3124,10 +3124,10 @@ inline void gcode_M105() {
}
#endif
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
-#if defined(FAN_PIN) && FAN_PIN > -1
+#if HAS_FAN
/**
* M106: Set Fan Speed
@@ -3139,7 +3139,7 @@ inline void gcode_M105() {
*/
inline void gcode_M107() { fanSpeed = 0; }
-#endif //FAN_PIN
+#endif // HAS_FAN
/**
* M109: Wait for extruder(s) to reach temperature
@@ -3197,10 +3197,10 @@ inline void gcode_M109() {
SERIAL_PROTOCOLLN( timetemp );
}
else {
- SERIAL_PROTOCOLLN( "?" );
+ SERIAL_PROTOCOLLNPGM("?");
}
#else
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
#endif
timetemp = millis();
}
@@ -3223,7 +3223,7 @@ inline void gcode_M109() {
starttime = previous_millis_cmd = millis();
}
-#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
+#if HAS_TEMP_BED
/**
* M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating
@@ -3251,7 +3251,7 @@ inline void gcode_M109() {
SERIAL_PROTOCOL((int)active_extruder);
SERIAL_PROTOCOLPGM(" B:");
SERIAL_PROTOCOL_F(degBed(), 1);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
manage_heater();
manage_inactivity();
@@ -3452,27 +3452,26 @@ inline void gcode_M114() {
SERIAL_PROTOCOLPGM(" Z:");
SERIAL_PROTOCOL(float(st_get_position(Z_AXIS))/axis_steps_per_unit[Z_AXIS]);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
#ifdef SCARA
SERIAL_PROTOCOLPGM("SCARA Theta:");
SERIAL_PROTOCOL(delta[X_AXIS]);
SERIAL_PROTOCOLPGM(" Psi+Theta:");
SERIAL_PROTOCOL(delta[Y_AXIS]);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
SERIAL_PROTOCOLPGM("SCARA Cal - Theta:");
SERIAL_PROTOCOL(delta[X_AXIS]+home_offset[X_AXIS]);
SERIAL_PROTOCOLPGM(" Psi+Theta (90):");
SERIAL_PROTOCOL(delta[Y_AXIS]-delta[X_AXIS]-90+home_offset[Y_AXIS]);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
SERIAL_PROTOCOLPGM("SCARA step Cal - Theta:");
SERIAL_PROTOCOL(delta[X_AXIS]/90*axis_steps_per_unit[X_AXIS]);
SERIAL_PROTOCOLPGM(" Psi+Theta:");
SERIAL_PROTOCOL((delta[Y_AXIS]-delta[X_AXIS])/90*axis_steps_per_unit[Y_AXIS]);
- SERIAL_PROTOCOLLN("");
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL; SERIAL_EOL;
#endif
}
@@ -3915,7 +3914,7 @@ inline void gcode_M226() {
SERIAL_PROTOCOL(servo_index);
SERIAL_PROTOCOL(": ");
SERIAL_PROTOCOL(servos[servo_index].read());
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
}
@@ -3983,7 +3982,7 @@ inline void gcode_M226() {
//Kc does not have scaling applied above, or in resetting defaults
SERIAL_PROTOCOL(PID_PARAM(Kc, e));
#endif
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
else {
SERIAL_ECHO_START;
@@ -4008,7 +4007,7 @@ inline void gcode_M226() {
SERIAL_PROTOCOL(unscalePID_i(bedKi));
SERIAL_PROTOCOL(" d:");
SERIAL_PROTOCOL(unscalePID_d(bedKd));
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
#endif // PIDTEMPBED
@@ -4058,7 +4057,7 @@ inline void gcode_M226() {
if (code_seen('C')) lcd_setcontrast(code_value_long() & 0x3F);
SERIAL_PROTOCOLPGM("lcd contrast value: ");
SERIAL_PROTOCOL(lcd_contrast);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
#endif // DOGLCD
@@ -4331,7 +4330,7 @@ inline void gcode_M503() {
zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
else {
SERIAL_ECHO_START;
@@ -4340,14 +4339,14 @@ inline void gcode_M503() {
SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MIN);
SERIAL_ECHOPGM(MSG_Z_MAX);
SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MAX);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
}
else {
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " : ");
SERIAL_ECHO(-zprobe_zoffset);
- SERIAL_PROTOCOLLN("");
+ SERIAL_EOL;
}
}
@@ -4852,20 +4851,20 @@ void process_commands() {
gcode_M109();
break;
- #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
+ #if HAS_TEMP_BED
case 190: // M190 - Wait for bed heater to reach target.
gcode_M190();
break;
- #endif //TEMP_BED_PIN
+ #endif // HAS_TEMP_BED
- #if defined(FAN_PIN) && FAN_PIN > -1
+ #if HAS_FAN
case 106: //M106 Fan On
gcode_M106();
break;
case 107: //M107 Fan Off
gcode_M107();
break;
- #endif //FAN_PIN
+ #endif // HAS_FAN
#ifdef BARICUDA
// PWM for HEATER_1_PIN
@@ -5704,7 +5703,7 @@ void handle_status_leds(void) {
max_temp = max(max_temp, degHotend(cur_extruder));
max_temp = max(max_temp, degTargetHotend(cur_extruder));
}
- #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
+ #if HAS_TEMP_BED
max_temp = max(max_temp, degTargetBed());
max_temp = max(max_temp, degBed());
#endif
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index d98ef63d4d..1dcbc96af7 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -427,7 +427,7 @@ void check_axes_activity() {
disable_e3();
}
- #if defined(FAN_PIN) && FAN_PIN > -1 // HAS_FAN
+ #if HAS_FAN
#ifdef FAN_KICKSTART_TIME
static unsigned long fan_kick_end;
if (tail_fan_speed) {
@@ -447,7 +447,7 @@ void check_axes_activity() {
#else
analogWrite(FAN_PIN, tail_fan_speed);
#endif //!FAN_SOFT_PWM
- #endif //FAN_PIN > -1
+ #endif // HAS_FAN
#ifdef AUTOTEMP
getHighESpeed();
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index b59ff29df0..2442ad206a 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -1,5 +1,5 @@
/*
- temperature.c - temperature control
+ temperature.cpp - temperature control
Part of Marlin
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
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 "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_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
+ enum TRState { TRInactive, TRFirstHeating, TRStable };
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
- 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};
#endif
#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;
#endif
#endif
@@ -238,7 +228,7 @@ void PID_autotune(float temp, int extruder, int ncycles)
soft_pwm[extruder] = bias = d = PID_MAX / 2;
// PID Tuning loop
- for(;;) {
+ for (;;) {
unsigned long ms = millis();
@@ -609,7 +599,7 @@ void manage_heater() {
// Loop through all extruders
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);
#endif
@@ -637,7 +627,7 @@ void manage_heater() {
disable_heater();
_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
@@ -1014,69 +1004,69 @@ void setWatch() {
}
#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)
-{
-/*
- SERIAL_ECHO_START;
- SERIAL_ECHO("Thermal Thermal Runaway Running. Heater ID:");
- SERIAL_ECHO(heater_id);
- SERIAL_ECHO(" ; State:");
- SERIAL_ECHO(*state);
- SERIAL_ECHO(" ; Timer:");
- SERIAL_ECHO(*timer);
- SERIAL_ECHO(" ; Temperature:");
- SERIAL_ECHO(temperature);
- SERIAL_ECHO(" ; Target Temp:");
- SERIAL_ECHO(target_temperature);
- SERIAL_ECHOLN("");
-*/
- if ((target_temperature == 0) || thermal_runaway)
- {
- *state = 0;
- *timer = 0;
- return;
- }
- switch (*state)
- {
- case 0: // "Heater Inactive" state
- if (target_temperature > 0) *state = 1;
- break;
- case 1: // "First Heating" state
- if (temperature >= target_temperature) *state = 2;
- break;
- case 2: // "Temperature Stable" state
- {
- unsigned long ms = millis();
- if (temperature >= (target_temperature - hysteresis_degc))
- {
- *timer = ms;
- }
- else if ( (ms - *timer) > ((unsigned long) period_seconds) * 1000)
- {
- SERIAL_ERROR_START;
- SERIAL_ERRORLNPGM(MSG_THERMAL_RUNAWAY_STOP);
- SERIAL_ERRORLN((int)heater_id);
- LCD_ALERTMESSAGEPGM(MSG_THERMAL_RUNAWAY); // translatable
- thermal_runaway = true;
- while(1)
- {
- disable_heater();
- disable_x();
- disable_y();
- disable_z();
- disable_e0();
- disable_e1();
- disable_e2();
- disable_e3();
- manage_heater();
- lcd_update();
- }
- }
- } break;
- }
-}
-#endif //THERMAL_RUNAWAY_PROTECTION_PERIOD
+ void thermal_runaway_protection(TRState *state, unsigned long *timer, float temperature, float target_temperature, int heater_id, int period_seconds, int hysteresis_degc) {
+ /*
+ SERIAL_ECHO_START;
+ SERIAL_ECHO("Thermal Thermal Runaway Running. Heater ID:");
+ SERIAL_ECHO(heater_id);
+ SERIAL_ECHO(" ; State:");
+ SERIAL_ECHO(*state);
+ SERIAL_ECHO(" ; Timer:");
+ SERIAL_ECHO(*timer);
+ SERIAL_ECHO(" ; Temperature:");
+ SERIAL_ECHO(temperature);
+ SERIAL_ECHO(" ; Target Temp:");
+ SERIAL_ECHO(target_temperature);
+ SERIAL_ECHOLN("");
+ */
+ if (target_temperature == 0 || thermal_runaway) {
+ *state = TRInactive;
+ *timer = 0;
+ return;
+ }
+
+ switch (*state) {
+ // Inactive state waits for a target temperature, then
+ case TRInactive:
+ if (target_temperature > 0) *state = TRFirstHeating;
+ break;
+ // When first heating, wait for the temperature to be reached then go to Stable state
+ case TRFirstHeating:
+ if (temperature >= target_temperature) *state = TRStable;
+ break;
+ // While the temperature is stable watch for a bad temperature
+ case TRStable:
+ {
+ // Whenever the current temperature is over the target (-hysteresis) restart the timer
+ if (temperature >= target_temperature - 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_ERRORLNPGM(MSG_THERMAL_RUNAWAY_STOP);
+ SERIAL_ERRORLN((int)heater_id);
+ LCD_ALERTMESSAGEPGM(MSG_THERMAL_RUNAWAY);
+ thermal_runaway = true;
+ for (;;) {
+ disable_heater();
+ disable_x();
+ disable_y();
+ disable_z();
+ disable_e0();
+ disable_e1();
+ disable_e2();
+ disable_e3();
+ manage_heater();
+ lcd_update();
+ }
+ }
+ } break;
+ }
+ }
+
+#endif // HAS_HEATER_THERMAL_PROTECTION
void disable_heater() {
for (int i=0; i<EXTRUDERS; i++) setTargetHotend(0, i);
diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 79146a3556..d5cde2448a 100644
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -18,8 +18,8 @@
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef temperature_h
-#define temperature_h
+#ifndef TEMPERATURE_H
+#define TEMPERATURE_H
#include "Marlin.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 isCoolingBed() { return target_temperature_bed < current_temperature_bed; }
-#define degHotend0() degHotend(0)
-#define degTargetHotend0() degTargetHotend(0)
-#define setTargetHotend0(_celsius) setTargetHotend((_celsius), 0)
-#define isHeatingHotend0() isHeatingHotend(0)
-#define isCoolingHotend0() isCoolingHotend(0)
+#define HOTEND_ROUTINES(NR) \
+ FORCE_INLINE float degHotend##NR() { return degHotend(NR); } \
+ FORCE_INLINE float degTargetHotend##NR() { return degTargetHotend(NR); } \
+ FORCE_INLINE void setTargetHotend##NR(const float c) { setTargetHotend(c, NR); } \
+ FORCE_INLINE bool isHeatingHotend##NR() { return isHeatingHotend(NR); } \
+ FORCE_INLINE bool isCoolingHotend##NR() { return isCoolingHotend(NR); }
+HOTEND_ROUTINES(0);
#if EXTRUDERS > 1
- #define degHotend1() degHotend(1)
- #define degTargetHotend1() degTargetHotend(1)
- #define setTargetHotend1(_celsius) setTargetHotend((_celsius), 1)
- #define isHeatingHotend1() isHeatingHotend(1)
- #define isCoolingHotend1() isCoolingHotend(1)
+ HOTEND_ROUTINES(1);
#else
- #define setTargetHotend1(_celsius) do{}while(0)
+ #define setTargetHotend1(c) do{}while(0)
#endif
#if EXTRUDERS > 2
- #define degHotend2() degHotend(2)
- #define degTargetHotend2() degTargetHotend(2)
- #define setTargetHotend2(_celsius) setTargetHotend((_celsius), 2)
- #define isHeatingHotend2() isHeatingHotend(2)
- #define isCoolingHotend2() isCoolingHotend(2)
+ HOTEND_ROUTINES(2);
#else
- #define setTargetHotend2(_celsius) do{}while(0)
+ #define setTargetHotend2(c) do{}while(0)
#endif
#if EXTRUDERS > 3
- #define degHotend3() degHotend(3)
- #define degTargetHotend3() degTargetHotend(3)
- #define setTargetHotend3(_celsius) setTargetHotend((_celsius), 3)
- #define isHeatingHotend3() isHeatingHotend(3)
- #define isCoolingHotend3() isCoolingHotend(3)
+ HOTEND_ROUTINES(3);
#else
- #define setTargetHotend3(_celsius) do{}while(0)
-#endif
-#if EXTRUDERS > 4
- #error Invalid number of extruders
+ #define setTargetHotend3(c) do{}while(0)
#endif
int getHeaterPower(int heater);
@@ -161,5 +148,4 @@ FORCE_INLINE void autotempShutdown() {
#endif
}
-
-#endif
+#endif // TEMPERATURE_H
From c756b4cf0798c35ee5b64c52cc0f3782cedbde44 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 2 Apr 2015 06:11:03 -0700
Subject: [PATCH 2/6] Comment tweak
---
Marlin/temperature.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 2442ad206a..5a8da94064 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -1027,7 +1027,7 @@ void setWatch() {
}
switch (*state) {
- // Inactive state waits for a target temperature, then
+ // Inactive state waits for a target temperature to be set
case TRInactive:
if (target_temperature > 0) *state = TRFirstHeating;
break;
From b98ebd517ea548df393fc0617cdfba9edd16ee19 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 3 Apr 2015 19:25:22 -0700
Subject: [PATCH 3/6] disable / enable_all_steppers functions
---
Marlin/Marlin.h | 3 +++
Marlin/Marlin_main.cpp | 24 ++++++++++++++----------
Marlin/planner.cpp | 6 +++---
Marlin/stepper.cpp | 8 +-------
Marlin/temperature.cpp | 8 +-------
5 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 1f295a65a5..363a5e5003 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -179,6 +179,9 @@ void manage_inactivity(bool ignore_stepper_queue=false);
#define disable_e3() /* nothing */
#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};
//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.
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index a21fcbd741..8f8e69c85f 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2569,13 +2569,7 @@ inline void gcode_G92() {
*/
inline void gcode_M17() {
LCD_MESSAGEPGM(MSG_NO_MOVE);
- enable_x();
- enable_y();
- enable_z();
- enable_e0();
- enable_e1();
- enable_e2();
- enable_e3();
+ enable_all_steppers();
}
#ifdef SDSUPPORT
@@ -5695,7 +5689,17 @@ void handle_status_leds(void) {
}
#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_y();
disable_z();
@@ -5723,7 +5727,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
if (stepper_inactive_time && ms > previous_millis_cmd + stepper_inactive_time
&& !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
if (chdkActive && ms > chdkHigh + CHDK_DELAY) {
@@ -5811,7 +5815,7 @@ void kill()
cli(); // Stop interrupts
disable_heater();
- disable_all_axes();
+ disable_all_steppers();
#if HAS_POWER_SWITCH
pinMode(PS_ON_PIN, INPUT);
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index d7d33c170e..8d8d2e3c4e 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -614,7 +614,7 @@ float junction_deviation = 0.1;
#if EXTRUDERS > 1
case 1:
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 EXTRUDERS > 2
if (g_uc_extruder_last_move[2] == 0) disable_e2();
@@ -626,7 +626,7 @@ float junction_deviation = 0.1;
#if EXTRUDERS > 2
case 2:
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[1] == 0) disable_e1();
#if EXTRUDERS > 3
@@ -636,7 +636,7 @@ float junction_deviation = 0.1;
#if EXTRUDERS > 3
case 3:
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[1] == 0) disable_e1();
if (g_uc_extruder_last_move[2] == 0) disable_e2();
diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
index 6f12bc9b22..ba4a4e9671 100644
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@ -1127,13 +1127,7 @@ long st_get_position(uint8_t axis) {
void finishAndDisableSteppers() {
st_synchronize();
- disable_x();
- disable_y();
- disable_z();
- disable_e0();
- disable_e1();
- disable_e2();
- disable_e3();
+ disable_all_steppers();
}
void quickStop() {
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 5a8da94064..4afb8dc09a 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -1051,13 +1051,7 @@ void setWatch() {
thermal_runaway = true;
for (;;) {
disable_heater();
- disable_x();
- disable_y();
- disable_z();
- disable_e0();
- disable_e1();
- disable_e2();
- disable_e3();
+ disable_all_steppers();
manage_heater();
lcd_update();
}
From 528e32a1d4fe035fc7d4ac239c4f3443173f1c13 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 3 Apr 2015 19:34:55 -0700
Subject: [PATCH 4/6] Fix timeout in thermal_runaway when temperature is set
higher
---
Marlin/temperature.cpp | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 4afb8dc09a..8b70ae393c 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -1006,6 +1006,9 @@ void setWatch() {
#if HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
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 = 0;
+
/*
SERIAL_ECHO_START;
SERIAL_ECHO("Thermal Thermal Runaway Running. Heater ID:");
@@ -1029,19 +1032,27 @@ void setWatch() {
switch (*state) {
// Inactive state waits for a target temperature to be set
case TRInactive:
- if (target_temperature > 0) *state = TRFirstHeating;
+ if (target_temperature > 0) {
+ *state = TRFirstHeating;
+ tr_target_temperature = target_temperature;
+ }
break;
// When first heating, wait for the temperature to be reached then go to Stable state
case TRFirstHeating:
- if (temperature >= target_temperature) *state = TRStable;
+ if (temperature >= tr_target_temperature) *state = TRStable;
break;
// While the temperature is stable watch for a bad temperature
case TRStable:
{
- // Whenever the current temperature is over the target (-hysteresis) restart the timer
- if (temperature >= target_temperature - hysteresis_degc) {
- *timer = millis();
+ // If the target temperature changes, restart
+ if (tr_target_temperature != target_temperature) {
+ *state = TRInactive;
+ break;
}
+
+ // If the temperature is over the target (-hysteresis) restart the timer
+ if (temperature >= tr_target_temperature - 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;
@@ -1060,7 +1071,7 @@ void setWatch() {
}
}
-#endif // HAS_HEATER_THERMAL_PROTECTION
+#endif // HAS_HEATER_THERMAL_PROTECTION || HAS_BED_THERMAL_PROTECTION
void disable_heater() {
for (int i=0; i<EXTRUDERS; i++) setTargetHotend(0, i);
From 9ba55baa5bd4964797d62a3df24ebfdf15013da0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 3 Apr 2015 19:42:40 -0700
Subject: [PATCH 5/6] Track target temperature separately for each heater
---
Marlin/temperature.cpp | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 8b70ae393c..c0e427a655 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -646,7 +646,7 @@ void manage_heater() {
#if TEMP_SENSOR_BED != 0
#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
#ifdef PIDTEMPBED
@@ -1007,21 +1007,21 @@ void setWatch() {
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 = 0;
+ static int tr_target_temperature[EXTRUDERS+1];
/*
SERIAL_ECHO_START;
- SERIAL_ECHO("Thermal Thermal Runaway Running. Heater ID:");
- SERIAL_ECHO(heater_id);
- SERIAL_ECHO(" ; State:");
- SERIAL_ECHO(*state);
- SERIAL_ECHO(" ; Timer:");
- SERIAL_ECHO(*timer);
- SERIAL_ECHO(" ; Temperature:");
- SERIAL_ECHO(temperature);
- SERIAL_ECHO(" ; Target Temp:");
- SERIAL_ECHO(target_temperature);
- SERIAL_ECHOLN("");
+ SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: ");
+ if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHOPGM(heater_id);
+ SERIAL_ECHOPGM(" ; State:");
+ SERIAL_ECHOPGM(*state);
+ SERIAL_ECHOPGM(" ; Timer:");
+ SERIAL_ECHOPGM(*timer);
+ SERIAL_ECHOPGM(" ; Temperature:");
+ SERIAL_ECHOPGM(temperature);
+ SERIAL_ECHOPGM(" ; Target Temp:");
+ SERIAL_ECHOPGM(target_temperature);
+ SERIAL_EOL;
*/
if (target_temperature == 0 || thermal_runaway) {
*state = TRInactive;
@@ -1029,35 +1029,37 @@ void setWatch() {
return;
}
+ int heater_index = heater_id >= 0 ? heater_id : EXTRUDERS;
+
switch (*state) {
// Inactive state waits for a target temperature to be set
case TRInactive:
if (target_temperature > 0) {
*state = TRFirstHeating;
- tr_target_temperature = target_temperature;
+ tr_target_temperature[heater_index] = target_temperature;
}
break;
// When first heating, wait for the temperature to be reached then go to Stable state
case TRFirstHeating:
- if (temperature >= tr_target_temperature) *state = TRStable;
+ 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 != target_temperature) {
+ 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 - hysteresis_degc) *timer = millis();
+ 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_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);
thermal_runaway = true;
for (;;) {
From 84e4edaea76546c250750b275cd586c1d165464f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 3 Apr 2015 19:52:00 -0700
Subject: [PATCH 6/6] Add M48 comment for #1794
---
Marlin/Marlin_main.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 8f8e69c85f..bc6ea3c137 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -110,6 +110,7 @@
// 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
// 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
// M81 - Turn off Power Supply
// M82 - Set E codes absolute (default)