Improved handling of critical events for adding |$C=1 to full realtime report.

This commit is contained in:
Terje Io
2023-07-11 08:10:13 +02:00
parent 403a172574
commit 8f5fa900be
3 changed files with 21 additions and 1 deletions
+16
View File
@@ -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:
+1 -1
View File
@@ -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"
+4
View File
@@ -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);