3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #685 from mkbel/add_safety_timer_notice

Browse source 
Show full screen blocking notification message after heater turned off
This commit is contained in:
PavelSindler 2018-04-27 17:24:33 +02:00 committed by GitHub
commit 2a57325bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Firmware/Marlin_main.cpp
View file

@ -7120,7 +7120,9 @@ void handle_status_leds(void) {
#ifdef SAFETYTIMER #ifdef SAFETYTIMER
/** /**
* @brief Turn off heating after 15 minutes of inactivity * @brief Turn off heating after 30 minutes of inactivity
*
* Full screen blocking notification message is shown after heater turning off.
*/ */
static void handleSafetyTimer() static void handleSafetyTimer()
{ {
@ -7137,10 +7139,11 @@ static void handleSafetyTimer()
{ {
safetyTimer.start(); safetyTimer.start();
} }
else if (safetyTimer.expired(1800000ul)) //30 minutes else if (safetyTimer.expired(1800000ul))
{ {
setTargetBed(0); setTargetBed(0);
setTargetHotend(0, 0); setTargetHotend(0, 0);
lcd_show_fullscreen_message_and_wait_P(MSG_BED_HEATING_SAFETY_DISABLED);
} }
} }
#endif //SAFETYTIMER #endif //SAFETYTIMER

7
Firmware/language_all.cpp
View file

@ -170,6 +170,13 @@ const char * const MSG_BED_HEATING_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_BED_HEATING_CZ MSG_BED_HEATING_CZ
}; };
const char MSG_BED_HEATING_SAFETY_DISABLED_EN[] PROGMEM = "Heating disabled by safety timer.";
const char MSG_BED_HEATING_SAFETY_DISABLED_CZ[] PROGMEM = "Zahrivani preruseno bezpecnostnim casovacem.";
const char * const MSG_BED_HEATING_SAFETY_DISABLED_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_BED_HEATING_SAFETY_DISABLED_EN,
MSG_BED_HEATING_SAFETY_DISABLED_CZ
};
const char MSG_BED_LEVELING_FAILED_POINT_HIGH_EN[] PROGMEM = "Bed leveling failed. Sensor triggered too high. Waiting for reset."; const char MSG_BED_LEVELING_FAILED_POINT_HIGH_EN[] PROGMEM = "Bed leveling failed. Sensor triggered too high. Waiting for reset.";
const char MSG_BED_LEVELING_FAILED_POINT_HIGH_CZ[] PROGMEM = "Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset."; const char MSG_BED_LEVELING_FAILED_POINT_HIGH_CZ[] PROGMEM = "Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset.";
const char * const MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE[LANG_NUM] PROGMEM = {

2
Firmware/language_all.h
View file

@ -76,6 +76,8 @@ extern const char* const MSG_BED_DONE_LANG_TABLE[LANG_NUM];
#define MSG_BED_DONE LANG_TABLE_SELECT(MSG_BED_DONE_LANG_TABLE) #define MSG_BED_DONE LANG_TABLE_SELECT(MSG_BED_DONE_LANG_TABLE)
extern const char* const MSG_BED_HEATING_LANG_TABLE[LANG_NUM]; extern const char* const MSG_BED_HEATING_LANG_TABLE[LANG_NUM];
#define MSG_BED_HEATING LANG_TABLE_SELECT(MSG_BED_HEATING_LANG_TABLE) #define MSG_BED_HEATING LANG_TABLE_SELECT(MSG_BED_HEATING_LANG_TABLE)
extern const char* const MSG_BED_HEATING_SAFETY_DISABLED_LANG_TABLE[LANG_NUM];
#define MSG_BED_HEATING_SAFETY_DISABLED LANG_TABLE_SELECT(MSG_BED_HEATING_SAFETY_DISABLED_LANG_TABLE)
extern const char* const MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE[LANG_NUM]; extern const char* const MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE[LANG_NUM];
#define MSG_BED_LEVELING_FAILED_POINT_HIGH LANG_TABLE_SELECT(MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE) #define MSG_BED_LEVELING_FAILED_POINT_HIGH LANG_TABLE_SELECT(MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE)
extern const char* const MSG_BED_LEVELING_FAILED_POINT_LOW_LANG_TABLE[LANG_NUM]; extern const char* const MSG_BED_LEVELING_FAILED_POINT_LOW_LANG_TABLE[LANG_NUM];

3
Firmware/language_cz.h
View file

@ -132,6 +132,7 @@
#define MSG_HEATING "Zahrivani" #define MSG_HEATING "Zahrivani"
#define MSG_HEATING_COMPLETE "Zahrivani OK." #define MSG_HEATING_COMPLETE "Zahrivani OK."
#define MSG_BED_HEATING "Zahrivani bed" #define MSG_BED_HEATING "Zahrivani bed"
#define MSG_BED_HEATING_SAFETY_DISABLED "Zahrivani preruseno bezpecnostnim casovacem."
#define MSG_BED_DONE "Bed OK." #define MSG_BED_DONE "Bed OK."
#define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_KILLED "Printer halted. kill() called!"
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
@ -414,4 +415,4 @@
#define MSG_CHANGED_PRINTER "Varovani: doslo ke zmene typu tiskarny." #define MSG_CHANGED_PRINTER "Varovani: doslo ke zmene typu tiskarny."
#define MSG_CHANGED_BOTH "Varovani: doslo ke zmene typu tiskarny a motherboardu." #define MSG_CHANGED_BOTH "Varovani: doslo ke zmene typu tiskarny a motherboardu."
#define MSG_WAITING_TEMP_PINDA "Cekani na zchladnuti PINDA" #define MSG_WAITING_TEMP_PINDA "Cekani na zchladnuti PINDA"
#define MSG_TEMP_CAL_FAILED "Teplotni kalibrace selhala" #define MSG_TEMP_CAL_FAILED "Teplotni kalibrace selhala"

3
Firmware/language_en.h
View file

@ -131,6 +131,7 @@
#define MSG_HEATING "Heating" #define MSG_HEATING "Heating"
#define(length=20) MSG_HEATING_COMPLETE "Heating done." #define(length=20) MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating" #define MSG_BED_HEATING "Bed Heating"
#define MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer."
#define MSG_BED_DONE "Bed done" #define MSG_BED_DONE "Bed done"
#define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_KILLED "Printer halted. kill() called!"
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
@ -422,4 +423,4 @@
#define(length=20, lines=4) MSG_CHANGED_PRINTER "Warning: printer type changed." #define(length=20, lines=4) MSG_CHANGED_PRINTER "Warning: printer type changed."
#define(length=20, lines=4) MSG_CHANGED_BOTH "Warning: both printer type and motherboard type changed." #define(length=20, lines=4) MSG_CHANGED_BOTH "Warning: both printer type and motherboard type changed."
#define(length=20, lines=3) MSG_WAITING_TEMP_PINDA "Waiting for PINDA probe cooling" #define(length=20, lines=3) MSG_WAITING_TEMP_PINDA "Waiting for PINDA probe cooling"
#define(length=20, lines=8) MSG_TEMP_CAL_FAILED "Temperature calibration failed" #define(length=20, lines=8) MSG_TEMP_CAL_FAILED "Temperature calibration failed"