From eced66f0f6e706463b322c7e6caab4402ff9748f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 27 Apr 2018 16:23:20 +0200 Subject: [PATCH 1/4] Show full screen blocking notification message after heater turning off by safety timer. --- Firmware/Marlin_main.cpp | 7 +++++-- Firmware/language_all.cpp | 7 +++++++ Firmware/language_all.h | 2 ++ Firmware/language_cz.h | 3 ++- Firmware/language_en.h | 3 ++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 917882603..7e860ab46 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7119,7 +7119,9 @@ void handle_status_leds(void) { #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() { @@ -7136,10 +7138,11 @@ static void handleSafetyTimer() { safetyTimer.start(); } - else if (safetyTimer.expired(1800000ul)) //30 minutes + else if (safetyTimer.expired(1800000ul)) { setTargetBed(0); setTargetHotend(0, 0); + lcd_show_fullscreen_message_and_wait_P(MSG_BED_HEATING_SAFETY_DISABLED); } } #endif //SAFETYTIMER diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 2be14ede8..967230f35 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -170,6 +170,13 @@ const char * const MSG_BED_HEATING_LANG_TABLE[LANG_NUM] PROGMEM = { 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_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 = { diff --git a/Firmware/language_all.h b/Firmware/language_all.h index 992d602c9..5030ad34e 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -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) extern const char* const MSG_BED_HEATING_LANG_TABLE[LANG_NUM]; #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]; #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]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index 01ca0dbf6..24722e1f8 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -132,6 +132,7 @@ #define MSG_HEATING "Zahrivani" #define MSG_HEATING_COMPLETE "Zahrivani OK." #define MSG_BED_HEATING "Zahrivani bed" +#define MSG_BED_HEATING_SAFETY_DISABLED "Zahrivani preruseno bezpecnostnim casovacem." #define MSG_BED_DONE "Bed OK." #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)" @@ -414,4 +415,4 @@ #define MSG_CHANGED_PRINTER "Varovani: doslo ke zmene typu tiskarny." #define MSG_CHANGED_BOTH "Varovani: doslo ke zmene typu tiskarny a motherboardu." #define MSG_WAITING_TEMP_PINDA "Cekani na zchladnuti PINDA" -#define MSG_TEMP_CAL_FAILED "Teplotni kalibrace selhala" \ No newline at end of file +#define MSG_TEMP_CAL_FAILED "Teplotni kalibrace selhala" diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 695546a85..5228750b2 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -131,6 +131,7 @@ #define MSG_HEATING "Heating" #define(length=20) MSG_HEATING_COMPLETE "Heating done." #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_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)" @@ -422,4 +423,4 @@ #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=3) MSG_WAITING_TEMP_PINDA "Waiting for PINDA probe cooling" -#define(length=20, lines=8) MSG_TEMP_CAL_FAILED "Temperature calibration failed" \ No newline at end of file +#define(length=20, lines=8) MSG_TEMP_CAL_FAILED "Temperature calibration failed" From 265d4761a31fde352057c2c70cacee37295f21c3 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 27 Apr 2018 17:07:10 +0200 Subject: [PATCH 2/4] M861: steps value for 35C --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 917882603..1eb0d0816 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6377,6 +6377,7 @@ Sigma_Exit: SERIAL_PROTOCOLLN("index, temp, ustep, um"); for (uint8_t i = 0; i < 6; i++) { + usteps = 0; if (i>0) EEPROM_read_B(EEPROM_PROBE_TEMP_SHIFT + (i - 1) * 2, &usteps); float mm = ((float)usteps) / axis_steps_per_unit[Z_AXIS]; i == 0 ? SERIAL_PROTOCOLPGM("n/a") : SERIAL_PROTOCOL(i - 1); From 068ee084546f0a280fc183f621faaf28e2cac45a Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 27 Apr 2018 18:41:00 +0200 Subject: [PATCH 3/4] MK3 variants file change --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index a16f0d339..dfd86571a 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -615,6 +615,4 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o //#define SUPPORT_VERBOSITY -#define DEBUG_DISABLE_FORCE_SELFTEST //disable force selftest - #endif //__CONFIGURATION_PRUSA_H From e1b95ed2a78deac5b7903763068708f23c760989 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 27 Apr 2018 19:59:22 +0200 Subject: [PATCH 4/4] version change --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 34d526f93..16f4197ec 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -8,7 +8,7 @@ // Firmware version #define FW_VERSION "3.2.0-RC2" -#define FW_COMMIT_NR 461 +#define FW_COMMIT_NR 534 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN