Browse Source

Crash detection - message on lcd (PFW-115)

Robert Pelnar 7 years ago
parent
commit
ebf6d08fae

+ 3 - 3
Firmware/Marlin_main.cpp

@@ -593,7 +593,7 @@ extern int8_t CrashDetectMenu;
 
 void crashdet_enable()
 {
-	MYSERIAL.println("crashdet_enable"); 
+//	MYSERIAL.println("crashdet_enable"); 
 	tmc2130_sg_stop_on_crash = true;
 	eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0xFF); 
 	CrashDetectMenu = 1;
@@ -602,7 +602,7 @@ void crashdet_enable()
 
 void crashdet_disable()
 {
-	MYSERIAL.println("crashdet_disable"); 
+//	MYSERIAL.println("crashdet_disable"); 
 	tmc2130_sg_stop_on_crash = false;
 	tmc2130_sg_crash = false;
 	eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0x00); 
@@ -657,7 +657,7 @@ void crashdet_detected()
 #endif
 	lcd_update_enable(true);
 	lcd_update(2);
-	lcd_setstatuspgm(PSTR("Crash detected!"));
+	lcd_setstatuspgm(MSG_CRASH_DETECTED);
 	if (yesno)
 	{
 		enquecommand_P(PSTR("G28 X"));

+ 9 - 2
Firmware/language_all.cpp

@@ -429,13 +429,20 @@ const char * const MSG_CRASHDETECT_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_CRASHDETECT_ON_CZ
 };
 
-const char MSG_CRASH_DETECTED_EN[] PROGMEM = "Crash detected. Continue printing?";
-const char MSG_CRASH_DETECTED_CZ[] PROGMEM = "Naraz detekovan, pokracovat v tisku?";
+const char MSG_CRASH_DETECTED_EN[] PROGMEM = "Crash detected.";
+const char MSG_CRASH_DETECTED_CZ[] PROGMEM = "Detekovan naraz.";
 const char * const MSG_CRASH_DETECTED_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_CRASH_DETECTED_EN,
 	MSG_CRASH_DETECTED_CZ
 };
 
+const char MSG_CRASH_DETECTED2_EN[] PROGMEM = "Crash detected. Continue printing?";
+const char MSG_CRASH_DETECTED2_CZ[] PROGMEM = "Naraz detekovan, pokracovat v tisku?";
+const char * const MSG_CRASH_DETECTED2_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_CRASH_DETECTED2_EN,
+	MSG_CRASH_DETECTED2_CZ
+};
+
 const char MSG_CRASH_DET_ONLY_IN_NORMAL_EN[] PROGMEM = "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode";
 const char MSG_CRASH_DET_ONLY_IN_NORMAL_CZ[] PROGMEM = "\x1b[2JCrash detekce muze\x1b[1;0Hbyt zapnuta pouze v\x1b[2;0HNormal modu";
 const char * const MSG_CRASH_DET_ONLY_IN_NORMAL_LANG_TABLE[LANG_NUM] PROGMEM = {

+ 2 - 0
Firmware/language_all.h

@@ -156,6 +156,8 @@ extern const char* const MSG_CRASHDETECT_ON_LANG_TABLE[LANG_NUM];
 #define MSG_CRASHDETECT_ON LANG_TABLE_SELECT(MSG_CRASHDETECT_ON_LANG_TABLE)
 extern const char* const MSG_CRASH_DETECTED_LANG_TABLE[LANG_NUM];
 #define MSG_CRASH_DETECTED LANG_TABLE_SELECT(MSG_CRASH_DETECTED_LANG_TABLE)
+extern const char* const MSG_CRASH_DETECTED2_LANG_TABLE[LANG_NUM];
+#define MSG_CRASH_DETECTED2 LANG_TABLE_SELECT(MSG_CRASH_DETECTED2_LANG_TABLE)
 extern const char* const MSG_CRASH_DET_ONLY_IN_NORMAL_LANG_TABLE[LANG_NUM];
 #define MSG_CRASH_DET_ONLY_IN_NORMAL LANG_TABLE_SELECT(MSG_CRASH_DET_ONLY_IN_NORMAL_LANG_TABLE)
 extern const char* const MSG_CRASH_DET_STEALTH_FORCE_OFF_LANG_TABLE[LANG_NUM];

+ 2 - 1
Firmware/language_cz.h

@@ -359,7 +359,8 @@ ve
 #define(length=17, lines=1) MSG_FSENS_AUTOLOAD_OFF  "F. autozav. [vyp]"
 #define(length=17, lines=1) MSG_FSENS_AUTOLOAD_NA  "F. autozav. [N/A]"
 #define MSG_RECOVERING_PRINT				"Obnovovani tisku    "
-#define(length=20, lines=2) MSG_CRASH_DETECTED   "Naraz detekovan, pokracovat v tisku?"
+#define(length=20, lines=1) MSG_CRASH_DETECTED   "Detekovan naraz."
+#define(length=20, lines=2) MSG_CRASH_DETECTED2   "Naraz detekovan, pokracovat v tisku?"
 
 #define MSG_SELFTEST_AXIS					"Osa"
 #define MSG_SELFTEST_AXIS_LENGTH			"Delka osy"

+ 2 - 1
Firmware/language_en.h

@@ -366,7 +366,8 @@
 
 #define(length=20, lines=2) MSG_RECOVER_PRINT					"Blackout occurred. Recover print?"
 #define(length=20, lines=1) MSG_RECOVERING_PRINT				"Recovering print    "
-#define(length=20, lines=2) MSG_CRASH_DETECTED					"Crash detected. Continue printing?"
+#define(length=20, lines=1) MSG_CRASH_DETECTED				"Crash detected."
+#define(length=20, lines=2) MSG_CRASH_DETECTED2				"Crash detected. Continue printing?"
 
 #define(length=15, lines=1) MSG_INFO_EXTRUDER				"Extruder info"
 #define(length=15, lines=1) MSG_MENU_VOLTAGES               "Voltages"