Message for every KILL and STOP
No more mystery halts & resets Moved messages to language.h Added current command to inactive timeout message
This commit is contained in:
		| @@ -2030,14 +2030,26 @@ static void clean_up_after_endstop_or_probe_move() { | |||||||
|         set_bltouch_deployed(true);        // Also needs to deploy and stow to |         set_bltouch_deployed(true);        // Also needs to deploy and stow to | ||||||
|         set_bltouch_deployed(false);       // clear the triggered condition. |         set_bltouch_deployed(false);       // clear the triggered condition. | ||||||
|         if (TEST_BLTOUCH()) {              // If it still claims to be triggered... |         if (TEST_BLTOUCH()) {              // If it still claims to be triggered... | ||||||
|  |           SERIAL_ERROR_START; | ||||||
|  |           SERIAL_ERRORLNPGM(MSG_STOP_BLTOUCH); | ||||||
|           stop();                          // punt! |           stop();                          // punt! | ||||||
|           return true; |           return true; | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     #elif ENABLED(Z_PROBE_SLED) |     #elif ENABLED(Z_PROBE_SLED) | ||||||
|       if (axis_unhomed_error(true, false, false)) { stop(); return true; } |       if (axis_unhomed_error(true, false, false)) { | ||||||
|  |         SERIAL_ERROR_START; | ||||||
|  |         SERIAL_ERRORLNPGM(MSG_STOP_UNHOMED); | ||||||
|  |         stop(); | ||||||
|  |         return true; | ||||||
|  |       } | ||||||
|     #elif ENABLED(Z_PROBE_ALLEN_KEY) |     #elif ENABLED(Z_PROBE_ALLEN_KEY) | ||||||
|       if (axis_unhomed_error(true, true,  true )) { stop(); return true; } |       if (axis_unhomed_error(true, true,  true )) { | ||||||
|  |         SERIAL_ERROR_START; | ||||||
|  |         SERIAL_ERRORLNPGM(MSG_STOP_UNHOMED); | ||||||
|  |         stop(); | ||||||
|  |         return true; | ||||||
|  |       } | ||||||
|     #endif |     #endif | ||||||
|  |  | ||||||
|     const float oldXpos = current_position[X_AXIS], |     const float oldXpos = current_position[X_AXIS], | ||||||
| @@ -7385,7 +7397,7 @@ inline void gcode_M503() { | |||||||
|       if (nozzle_timed_out) |       if (nozzle_timed_out) | ||||||
|         lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_CLICK_TO_HEAT_NOZZLE); |         lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_CLICK_TO_HEAT_NOZZLE); | ||||||
|  |  | ||||||
|       #if HAS_BUZZER  |       #if HAS_BUZZER | ||||||
|         filament_change_beep(); |         filament_change_beep(); | ||||||
|       #endif |       #endif | ||||||
|  |  | ||||||
| @@ -7445,7 +7457,7 @@ inline void gcode_M503() { | |||||||
|     stepper.synchronize(); |     stepper.synchronize(); | ||||||
|  |  | ||||||
|     #if defined(FILAMENT_CHANGE_EXTRUDE_LENGTH) && FILAMENT_CHANGE_EXTRUDE_LENGTH > 0 |     #if defined(FILAMENT_CHANGE_EXTRUDE_LENGTH) && FILAMENT_CHANGE_EXTRUDE_LENGTH > 0 | ||||||
|    |  | ||||||
|       do { |       do { | ||||||
|         // "Wait for filament extrude" |         // "Wait for filament extrude" | ||||||
|         lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_EXTRUDE); |         lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_EXTRUDE); | ||||||
| @@ -10298,7 +10310,11 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) { | |||||||
|  |  | ||||||
|   millis_t ms = millis(); |   millis_t ms = millis(); | ||||||
|  |  | ||||||
|   if (max_inactive_time && ELAPSED(ms, previous_cmd_ms + max_inactive_time)) kill(PSTR(MSG_KILLED)); |   if (max_inactive_time && ELAPSED(ms, previous_cmd_ms + max_inactive_time)) { | ||||||
|  |     SERIAL_ERROR_START; | ||||||
|  |     SERIAL_ECHOLNPAIR(MSG_KILL_INACTIVE_TIME, current_command); | ||||||
|  |     kill(PSTR(MSG_KILLED)); | ||||||
|  |   } | ||||||
|  |  | ||||||
|   // Prevent steppers timing-out in the middle of M600 |   // Prevent steppers timing-out in the middle of M600 | ||||||
|   #if ENABLED(FILAMENT_CHANGE_FEATURE) && ENABLED(FILAMENT_CHANGE_NO_STEPPER_TIMEOUT) |   #if ENABLED(FILAMENT_CHANGE_FEATURE) && ENABLED(FILAMENT_CHANGE_NO_STEPPER_TIMEOUT) | ||||||
| @@ -10306,7 +10322,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) { | |||||||
|   #else |   #else | ||||||
|     #define M600_TEST true |     #define M600_TEST true | ||||||
|   #endif |   #endif | ||||||
|               |  | ||||||
|   if (M600_TEST && stepper_inactive_time && ELAPSED(ms, previous_cmd_ms + stepper_inactive_time) |   if (M600_TEST && stepper_inactive_time && ELAPSED(ms, previous_cmd_ms + stepper_inactive_time) | ||||||
|       && !ignore_stepper_queue && !planner.blocks_queued()) { |       && !ignore_stepper_queue && !planner.blocks_queued()) { | ||||||
|     #if ENABLED(DISABLE_INACTIVE_X) |     #if ENABLED(DISABLE_INACTIVE_X) | ||||||
| @@ -10348,7 +10364,11 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) { | |||||||
|     // Exceeded threshold and we can confirm that it was not accidental |     // Exceeded threshold and we can confirm that it was not accidental | ||||||
|     // KILL the machine |     // KILL the machine | ||||||
|     // ---------------------------------------------------------------- |     // ---------------------------------------------------------------- | ||||||
|     if (killCount >= KILL_DELAY) kill(PSTR(MSG_KILLED)); |     if (killCount >= KILL_DELAY) { | ||||||
|  |       SERIAL_ERROR_START; | ||||||
|  |       SERIAL_ERRORLNPGM(MSG_KILL_BUTTON); | ||||||
|  |       kill(PSTR(MSG_KILLED)); | ||||||
|  |     } | ||||||
|   #endif |   #endif | ||||||
|  |  | ||||||
|   #if HAS_HOME |   #if HAS_HOME | ||||||
|   | |||||||
| @@ -200,6 +200,11 @@ | |||||||
|  |  | ||||||
| #define MSG_ERR_EEPROM_WRITE                "Error writing to EEPROM!" | #define MSG_ERR_EEPROM_WRITE                "Error writing to EEPROM!" | ||||||
|  |  | ||||||
|  | #define MSG_STOP_BLTOUCH                    "STOP called because of BLTouch error - restart with M999" | ||||||
|  | #define MSG_STOP_UNHOMED                    "STOP called because of unhomed error - restart with M999" | ||||||
|  | #define MSG_KILL_INACTIVE_TIME              "KILL caused by too much inactive time - current command: " | ||||||
|  | #define MSG_KILL_BUTTON                     "KILL caused by KILL button/pin" | ||||||
|  |  | ||||||
| // temperature.cpp strings | // temperature.cpp strings | ||||||
| #define MSG_PID_AUTOTUNE                    "PID Autotune" | #define MSG_PID_AUTOTUNE                    "PID Autotune" | ||||||
| #define MSG_PID_AUTOTUNE_START              MSG_PID_AUTOTUNE " start" | #define MSG_PID_AUTOTUNE_START              MSG_PID_AUTOTUNE " start" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user