From 9f123f0f3eec8238ef13f787697ab5c6eb4ba940 Mon Sep 17 00:00:00 2001
From: Stefan de Bruijn <stefan@nubilosoft.com>
Date: Thu, 1 Jul 2021 21:03:39 +0200
Subject: [PATCH] Added ConfigAlarm to listAlarms. Fixed a bug of ConfigAlarm
 triggered incorrectly.

---
 Grbl_Esp32/src/MotionControl.cpp   | 2 +-
 Grbl_Esp32/src/ProcessSettings.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Grbl_Esp32/src/MotionControl.cpp b/Grbl_Esp32/src/MotionControl.cpp
index 46d2acab..49395c76 100644
--- a/Grbl_Esp32/src/MotionControl.cpp
+++ b/Grbl_Esp32/src/MotionControl.cpp
@@ -400,7 +400,7 @@ void mc_homing_cycle(AxisMask axis_mask) {
         }
         if (!someAxisHomed) {
             report_status_message(Error::HomingNoCycles, CLIENT_ALL);
-            sys.state = State::ConfigAlarm;
+            sys.state = State::Alarm;
             return;
         }
     }
diff --git a/Grbl_Esp32/src/ProcessSettings.cpp b/Grbl_Esp32/src/ProcessSettings.cpp
index f22a390a..49b935b3 100644
--- a/Grbl_Esp32/src/ProcessSettings.cpp
+++ b/Grbl_Esp32/src/ProcessSettings.cpp
@@ -383,7 +383,10 @@ const char* alarmString(ExecAlarm alarmNumber) {
 }
 
 Error listAlarms(const char* value, WebUI::AuthenticationLevel auth_level, WebUI::ESPResponseStream* out) {
-    if (sys_rt_exec_alarm != ExecAlarm::None) {
+    if (sys.state == State::ConfigAlarm) {
+        grbl_sendf(out->client(), "Configuration alarm is active. Check the boot messages for 'ERR'.\r\n");
+    }
+    else if (sys_rt_exec_alarm != ExecAlarm::None) {
         grbl_sendf(out->client(), "Active alarm: %d (%s)\r\n", int(sys_rt_exec_alarm), alarmString(sys_rt_exec_alarm));
     }
     if (value) {