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

Add MSG_THERMAL_RUNAWAY_BED (#9691)

Browse source
This commit is contained in:
Scott Lahteine 2018-02-18 02:23:55 -06:00 committed by GitHub
parent 6589f654b0
commit 83d7e95de0
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/lcd/language/language_en.h
View file

@ -789,6 +789,9 @@
#ifndef MSG_THERMAL_RUNAWAY #ifndef MSG_THERMAL_RUNAWAY
#define MSG_THERMAL_RUNAWAY _UxGT("THERMAL RUNAWAY") #define MSG_THERMAL_RUNAWAY _UxGT("THERMAL RUNAWAY")
#endif #endif
#ifndef MSG_THERMAL_RUNAWAY_BED
#define MSG_THERMAL_RUNAWAY_BED _UxGT("BED THERMAL RUNAWAY")
#endif
#ifndef MSG_ERR_MAXTEMP #ifndef MSG_ERR_MAXTEMP
#define MSG_ERR_MAXTEMP _UxGT("Err: MAXTEMP") #define MSG_ERR_MAXTEMP _UxGT("Err: MAXTEMP")
#endif #endif

8
Marlin/src/module/temperature.cpp
View file

@ -435,7 +435,9 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
_temp_error(hotend, PSTR(MSG_T_HEATING_FAILED), PSTR(MSG_HEATING_FAILED_LCD)); _temp_error(hotend, PSTR(MSG_T_HEATING_FAILED), PSTR(MSG_HEATING_FAILED_LCD));
} }
else if (current < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far? else if (current < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?
_temp_error(hotend, PSTR(MSG_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY)); _temp_error(hotend, PSTR(MSG_T_THERMAL_RUNAWAY),
hotend >= 0 ? PSTR(MSG_THERMAL_RUNAWAY) : PSTR(MSG_THERMAL_RUNAWAY_BED)
);
#endif #endif
} // every 2 seconds } // every 2 seconds
@ -1414,7 +1416,9 @@ void Temperature::init() {
else if (PENDING(millis(), *timer)) break; else if (PENDING(millis(), *timer)) break;
*state = TRRunaway; *state = TRRunaway;
case TRRunaway: case TRRunaway:
_temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY)); _temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY),
heater_id >= 0 ? PSTR(MSG_THERMAL_RUNAWAY) : PSTR(MSG_THERMAL_RUNAWAY_BED)
);
} }
} }