Merge remote-tracking branch 'upstream/edge' into upstreamedge

diff --git a/src/modules/communication/SerialConsole.cpp b/src/modules/communication/SerialConsole.cpp
index a9e1c7d..d8737c6 100644 (file)
--- a/src/modules/communication/SerialConsole.cpp
+++ b/src/modules/communication/SerialConsole.cpp
@@ -67,6 +67,11 @@ void SerialConsole::on_idle(void * argument)
     if(halt_flag) {
         halt_flag= false;
         THEKERNEL->call_event(ON_HALT, nullptr);
+        if(THEKERNEL->is_grbl_mode()) {
+            puts("ALARM: Abort during cycle\r\n");
+        } else {
+            puts("HALTED, M999 or $X to exit HALT state\r\n");
+        }
     }
 }