Browse Source

timeout fix and MSG_UNLOAD_SUCCESSFULL message shortened

PavelSindler 6 years ago
parent
commit
d8117eab66
3 changed files with 3 additions and 3 deletions
  1. 1 1
      Firmware/Marlin_main.cpp
  2. 1 1
      Firmware/language_all.cpp
  3. 1 1
      Firmware/language_en.h

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -5577,7 +5577,7 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
 			case 0: 
 				delay_keep_alive(4);
 
-				if (millis() > waiting_start_time + M600_TIMEOUT * 1000) {
+				if (millis() > waiting_start_time + (unsigned long)M600_TIMEOUT * 1000) {
 					lcd_display_message_fullscreen_P(MSG_PRESS_TO_PREHEAT);
 					wait_for_user_state = 1;
 					setTargetHotend(0, 0);

+ 1 - 1
Firmware/language_all.cpp

@@ -2228,7 +2228,7 @@ const char * const MSG_UNLOAD_FILAMENT_4_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_UNLOAD_FILAMENT_4_CZ
 };
 
-const char MSG_UNLOAD_SUCCESSFULL_EN[] PROGMEM = "Was filament successfully unloaded?";
+const char MSG_UNLOAD_SUCCESSFULL_EN[] PROGMEM = "Was filament unload successfull?";
 const char MSG_UNLOAD_SUCCESSFULL_CZ[] PROGMEM = "Bylo vysunuti filamentu uspesne?";
 const char * const MSG_UNLOAD_SUCCESSFULL_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_UNLOAD_SUCCESSFULL_EN,

+ 1 - 1
Firmware/language_en.h

@@ -386,7 +386,7 @@
 #define(length=17, lines=1) MSG_FSENS_AUTOLOAD_NA                "F. autoload [N/A]"
 #define(length=20, lines=4) MSG_PRESS_TO_UNLOAD					"Please press the knob to unload filament"
 #define(length=20, lines=4) MSG_PRESS_TO_PREHEAT				"Press knob to preheat nozzle and continue."
-#define(length=20, lines=2) MSG_UNLOAD_SUCCESSFULL				"Was filament successfully unloaded?"
+#define(length=20, lines=2) MSG_UNLOAD_SUCCESSFULL				"Was filament unload successfull?"
 #define(length=20, lines=4) MSG_CHECK_IDLER						"Please open idler and remove filament manually."
 #define(length=20, lines=4) MSG_PULL_OUT_FILAMENT				"Please pull out filament immediately"
 #define(length=20, lines=2) MSG_FILE_INCOMPLETE					"File incomplete. Continue anyway?"