From d5decf8c19db4845679515834af2e92d5152c775 Mon Sep 17 00:00:00 2001 From: chamnit Date: Sun, 10 Apr 2016 15:06:57 -0600 Subject: [PATCH] Alarm and safety door bug fix. - Typo in protocol.c caused a safety door to lock out the system during an alarm. The correct character should keep that from happening and bring back the original door/alarm behavior. --- doc/log/commit_log_v1.0d.txt | 23 ++++++----------------- grbl/grbl.h | 2 +- grbl/protocol.c | 2 +- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/doc/log/commit_log_v1.0d.txt b/doc/log/commit_log_v1.0d.txt index d6b3a0f..bd9f377 100644 --- a/doc/log/commit_log_v1.0d.txt +++ b/doc/log/commit_log_v1.0d.txt @@ -1,3 +1,9 @@ +---------------- +Date: 2016-04-04 +Author: Sonny Jeon +Subject: Update readme and sleep documentation. + + ---------------- Date: 2016-04-03 Author: chamnit @@ -82,20 +88,3 @@ bytes, per the g-code standard (Grbl 328p is limited to 80). - Removed the cpu_map folder, since this version is strictly Mega2560. - ----------------- -Date: 2016-03-19 -Author: chamnit -Subject: Update README - - ----------------- -Date: 2016-03-19 -Author: Sonny Jeon -Subject: No variable spindle and spindle speed fix. - -- Soft limit errors were stuck in a feed hold without notifying the -user why it was in a hold. When resumed, the soft limit error would -kick in. Issue should be fixed to behave as intended to automatically -hold and issue a soft limit alarm once the machine has come to a stop. - diff --git a/grbl/grbl.h b/grbl/grbl.h index 71392ca..72b077c 100644 --- a/grbl/grbl.h +++ b/grbl/grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system #define GRBL_VERSION "1.0d" -#define GRBL_VERSION_BUILD "20160403" +#define GRBL_VERSION_BUILD "20160410" // Define standard libraries used by Grbl. #include diff --git a/grbl/protocol.c b/grbl/protocol.c index a678d90..a729838 100644 --- a/grbl/protocol.c +++ b/grbl/protocol.c @@ -281,7 +281,7 @@ void protocol_exec_rt_system() // TODO: CHECK MODE? How to handle this? Likely nothing, since it only works when IDLE and then resets Grbl. // State check for allowable states for hold methods. - if (!(sys.state & (STATE_ALARM & STATE_CHECK_MODE))) { + if (!(sys.state & (STATE_ALARM | STATE_CHECK_MODE))) { // If in CYCLE state, all hold states immediately initiate a motion HOLD. if (sys.state == STATE_CYCLE) {