ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #592 from poelstra/fix_softlimit

Browse Source 
Fix EXEC_ALARM_* flags: soft limit would lead to hard limit error.
This commit is contained in:
Sonny Jeon
2015-02-13 17:15:37 -07:00
parent 5017d998ce 9f7f270991
commit a10b0ab43b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
grbl/system.h
View File

@@ -41,10 +41,10 @@
// this halts Grbl into an infinite loop until the user aknowledges the problem and issues a soft-
// reset command. For example, a hard limit event needs this type of halt and aknowledgement.
#define EXEC_CRITICAL_EVENT bit(0) // bitmask 00000001 (SPECIAL FLAG. See NOTE:)
#define EXEC_ALARM_HARD_LIMIT bit(0) // bitmask 00000010
#define EXEC_ALARM_SOFT_LIMIT bit(1) // bitmask 00000100
#define EXEC_ALARM_ABORT_CYCLE bit(2) // bitmask 00001000
#define EXEC_ALARM_PROBE_FAIL bit(3) // bitmask 00010000
#define EXEC_ALARM_HARD_LIMIT bit(1) // bitmask 00000010
#define EXEC_ALARM_SOFT_LIMIT bit(2) // bitmask 00000100
#define EXEC_ALARM_ABORT_CYCLE bit(3) // bitmask 00001000
#define EXEC_ALARM_PROBE_FAIL bit(4) // bitmask 00010000
// Define system state bit map. The state variable primarily tracks the individual functions
// of Grbl to manage each without overlapping. It is also used as a messaging flag for