Improved handling of critical events for adding |$C=1 to full realtim…

…e report.
grblHAL · Jul 11, 2023 · 8f5fa90 · 8f5fa90
1 parent 403a172
commit 8f5fa90
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,21 @@
 ## grblHAL changelog
 
+<a name="20230711"/>20230711
+
+Core:
+
+* Improved handling of critical events for adding `|$C=1` to full realtime report.
+
+Drivers:
+
+* STM32F1xx: fix for [ioSender issue #312](https://github.com/terjeio/ioSender/issues/312), EStop event not triggered.
+
+Plugins:
+
+* Networking: fix for YModem upload to SD card failure via Telnet or WebSocket connection.
+
+---
+
 <a name="20230708"/>20230708
 
 Drivers:

diff --git a/grbl.h b/grbl.h
@@ -42,7 +42,7 @@
 #else
 #define GRBL_VERSION "1.1f"
 #endif
-#define GRBL_BUILD 20230704
+#define GRBL_BUILD 20230711
 
 #define GRBL_URL "https://github.com/grblHAL"
 

diff --git a/system.c b/system.c
@@ -1039,6 +1039,10 @@ void system_raise_alarm (alarm_code_t alarm)
         system_set_exec_alarm(alarm);
     else if(sys.alarm != alarm) {
         sys.alarm = alarm;
+        sys.blocking_event = sys.alarm == Alarm_HardLimit ||
+                              sys.alarm == Alarm_SoftLimit ||
+                               sys.alarm == Alarm_EStop ||
+                                sys.alarm == Alarm_MotorFault;
         state_set(alarm == Alarm_EStop ? STATE_ESTOP : STATE_ALARM);
         if(sys.driver_started || sys.alarm == Alarm_SelftestFailed)
             grbl.report.alarm_message(alarm);