From 1eb68e9f9a8d639fded043024d66d78bca16df05 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 5 May 2021 17:22:46 -0500
Subject: [PATCH] Echo LCD message to serial in kill
---
Marlin/src/MarlinCore.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 209c9b59d0..d448b2febe 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -825,18 +825,19 @@ void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr
TERN_(HAS_CUTTER, cutter.kill()); // Full cutter shutdown including ISR control
- SERIAL_ERROR_MSG(STR_ERR_KILLED);
+ // Echo the LCD message to serial for extra context
+ if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNPGM_P(lcd_error); }
#if HAS_DISPLAY
ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
#else
- UNUSED(lcd_error);
- UNUSED(lcd_component);
+ UNUSED(lcd_error); UNUSED(lcd_component);
#endif
- #if HAS_TFT_LVGL_UI
- lv_draw_error_message(lcd_error);
- #endif
+ TERN_(HAS_TFT_LVGL_UI, lv_draw_error_message(lcd_error));
+
+ // "Error:Printer halted. kill() called!"
+ SERIAL_ERROR_MSG(STR_ERR_KILLED);
#ifdef ACTION_ON_KILL
host_action_kill();