Merge remote-tracking branch 'upstream/MK3' into MK3-V3_2

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

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);
@@ -7119,7 +7120,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 +7139,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

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 = {

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];

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"
+#define MSG_TEMP_CAL_FAILED			 "Teplotni kalibrace selhala"

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"
+#define(length=20, lines=8) MSG_TEMP_CAL_FAILED			 "Temperature calibration failed"

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