From 5bfc3a194507f7c977da0221820fc6e4aaf952b8 Mon Sep 17 00:00:00 2001 From: Sonny Jeon Date: Sat, 19 Mar 2016 12:41:52 -0600 Subject: [PATCH] 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. --- doc/log/commit_log_v1.0c.txt | 11 +++++++++++ grbl/grbl.h | 2 +- grbl/spindle_control.c | 15 +++++++-------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/doc/log/commit_log_v1.0c.txt b/doc/log/commit_log_v1.0c.txt index 6e4651d..02704bf 100644 --- a/doc/log/commit_log_v1.0c.txt +++ b/doc/log/commit_log_v1.0c.txt @@ -1,3 +1,14 @@ +---------------- +Date: 2016-03-11 +Author: Sonny Jeon +Subject: Soft limit error bug 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. + + ---------------- Date: 2016-03-04 Author: Sonny Jeon diff --git a/grbl/grbl.h b/grbl/grbl.h index 8125e4d..fd6d170 100644 --- a/grbl/grbl.h +++ b/grbl/grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system #define GRBL_VERSION "1.0c" -#define GRBL_VERSION_BUILD "20160311" +#define GRBL_VERSION_BUILD "20160319" // Define standard libraries used by Grbl. #include diff --git a/grbl/spindle_control.c b/grbl/spindle_control.c index fbe04ce..f8ff792 100644 --- a/grbl/spindle_control.c +++ b/grbl/spindle_control.c @@ -138,14 +138,13 @@ void spindle_set_state(uint8_t state, float rpm) #else - if (rpm <= 0.0) { spindle_stop(); } // RPM should never be negative, but check anyway. - else { - #ifdef INVERT_SPINDLE_ENABLE_PIN - SPINDLE_ENABLE_PORT &= ~(1<