Skip to content

Commit

Permalink
Issue grbl#112, bug error:28 correction new version 1.2g build 20220917
Browse files Browse the repository at this point in the history
  • Loading branch information
fra589 committed Sep 17, 2022
1 parent 4416bd4 commit bf7ec52
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Makefile
Expand Up @@ -36,9 +36,8 @@ DEVICE_PORT ?= /dev/ttyUSB0
PROGRAMMER ?= -D -v -c avrisp2 -P $(DEVICE_PORT)

SOURCE = main.c motion_control.c gcode.c spindle_control.c coolant_control.c digital_control.c\
serial.c protocol.c stepper.c eeprom.c settings.c planner.c nuts_bolts.c limits.c \
print.c probe.c report.c system.c sleep.c jog.c
# analog_control.c is in the analog_control branch...
analog_control.c serial.c protocol.c stepper.c eeprom.c settings.c planner.c nuts_bolts.c\
limits.c print.c probe.c report.c system.c sleep.c jog.c

BUILDDIR = build
SOURCEDIR = grbl
Expand Down
8 changes: 5 additions & 3 deletions grbl/gcode.c
Expand Up @@ -548,9 +548,11 @@ uint8_t gc_execute_line(char *line)
// bit_false(value_dwords,dwbit(DWORD_S)); // NOTE: Single-meaning value word. Set at end of error-checking.

#ifdef USE_OUTPUT_PWM
// [4.bis Set output PWM value]: Q value missing, Q is negative (done.)
if (bit_isfalse(value_dwords,dwbit(DWORD_Q))) { FAIL(STATUS_GCODE_VALUE_WORD_MISSING); } // [Q word missing]
// bit_false(value_dwords,dwbit(DWORD_Q)); // NOTE: Single-meaning value word. Set at end of error-checking.
if (dword_bit == MODAL_GROUP_M11) {
// [4.bis Set output PWM value]: Q value missing, Q is negative (done.)
if (bit_isfalse(value_dwords,dwbit(DWORD_Q))) { FAIL(STATUS_GCODE_VALUE_WORD_MISSING); } // [Q word missing]
// bit_false(value_dwords,dwbit(DWORD_Q)); // NOTE: Single-meaning value word. Set at end of error-checking.
}
#endif

// [5. Select tool ]: NOT SUPPORTED. Only tracks value. T is negative (done.) Not an integer. Greater than max tool value.
Expand Down
2 changes: 1 addition & 1 deletion grbl/gcode.h
Expand Up @@ -48,7 +48,7 @@
#define MODAL_GROUP_M9 14 // [M56] Override control
#define MODAL_GROUP_M10 15 // [M62-M65] Digital output -Non-modal
#ifdef USE_OUTPUT_PWM
#define MODAL_GROUP_M11 16 // [M162-M165] Analog output -Non-modal
#define MODAL_GROUP_M11 16 // [M67-M68] Analog output -Non-modal
#endif

// Define command actions for within execution-type modal groups (motion, stopping, non-modal). Used
Expand Down
2 changes: 1 addition & 1 deletion grbl/grbl.h
Expand Up @@ -24,7 +24,7 @@

// Grbl versioning system
#define GRBL_VERSION "1.2g"
#define GRBL_VERSION_BUILD "20220826"
#define GRBL_VERSION_BUILD "20220917"

// Define standard libraries used by Grbl.
#include <avr/io.h>
Expand Down

0 comments on commit bf7ec52

Please sign in to comment.