kopia lustrzana https://github.com/Schildkroet/GRBL-Advanced
Small bugfix
rodzic
0687057580
commit
17f12366cb
|
@ -1134,7 +1134,7 @@ uint8_t GC_ExecuteLine(char *line)
|
|||
if(gc_parser_flags & GC_PARSER_JOG_MOTION) {
|
||||
// Only distance and unit modal commands and G53 absolute override command are allowed.
|
||||
// NOTE: Feed rate word and axis word checks have already been performed in STEP 3.
|
||||
if(command_words & ~(BIT(MODAL_GROUP_G3) | BIT(MODAL_GROUP_G6 | BIT(MODAL_GROUP_G0)))) {
|
||||
if(command_words & ~(BIT(MODAL_GROUP_G3) | BIT(MODAL_GROUP_G6) | BIT(MODAL_GROUP_G0))) {
|
||||
return STATUS_INVALID_JOG_COMMAND;
|
||||
}
|
||||
|
||||
|
|
|
@ -103,10 +103,10 @@ void System_PinChangeISR(void)
|
|||
else if(BIT_IS_TRUE(pin, CONTROL_PIN_INDEX_CYCLE_START)) {
|
||||
BIT_TRUE(sys_rt_exec_state, EXEC_CYCLE_START);
|
||||
}
|
||||
else if(BIT_IS_TRUE(pin, CONTROL_PIN_INDEX_FEED_HOLD)) {
|
||||
if(BIT_IS_TRUE(pin, CONTROL_PIN_INDEX_FEED_HOLD)) {
|
||||
BIT_TRUE(sys_rt_exec_state, EXEC_FEED_HOLD);
|
||||
}
|
||||
else if(BIT_IS_TRUE(pin, CONTROL_PIN_INDEX_SAFETY_DOOR)) {
|
||||
if(BIT_IS_TRUE(pin, CONTROL_PIN_INDEX_SAFETY_DOOR)) {
|
||||
BIT_TRUE(sys_rt_exec_state, EXEC_SAFETY_DOOR);
|
||||
}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue