Merge branch 'dev' of https://github.com/grbl/grbl into dev
Conflicts: limits.c
This commit is contained in:
17
nuts_bolts.h
17
nuts_bolts.h
@ -74,15 +74,14 @@
|
||||
// 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
|
||||
// critical events.
|
||||
#define STATE_IDLE 0 // Must be zero.
|
||||
#define STATE_INIT 1 // Initial power up state.
|
||||
#define STATE_QUEUED 2 // Indicates buffered blocks, awaiting cycle start.
|
||||
#define STATE_CYCLE 3 // Cycle is running
|
||||
#define STATE_HOLD 4 // Executing feed hold
|
||||
#define STATE_HOMING 5 // Performing homing cycle
|
||||
#define STATE_ALARM 6 // In alarm state. Locks out all g-code processes. Allows settings access.
|
||||
#define STATE_CHECK_MODE 7 // G-code check mode. Locks out planner and motion only.
|
||||
// #define STATE_JOG 8 // Jogging mode is unique like homing.
|
||||
#define STATE_IDLE 0 // Must be zero. No flags.
|
||||
#define STATE_QUEUED bit(0) // Indicates buffered blocks, awaiting cycle start.
|
||||
#define STATE_CYCLE bit(1) // Cycle is running
|
||||
#define STATE_HOLD bit(2) // Executing feed hold
|
||||
#define STATE_HOMING bit(3) // Performing homing cycle
|
||||
#define STATE_ALARM bit(4) // In alarm state. Locks out all g-code processes. Allows settings access.
|
||||
#define STATE_CHECK_MODE bit(5) // G-code check mode. Locks out planner and motion only.
|
||||
// #define STATE_JOG bit(6) // Jogging mode is unique like homing.
|
||||
|
||||
// Define global system variables
|
||||
typedef struct {
|
||||
|
Reference in New Issue
Block a user