Corrected G10 L20 P0 command (setZero)

This commit is contained in:
cprezzi 2017-10-08 16:03:01 +02:00
parent 5ad7af8dfb
commit 92b093ee43
3 changed files with 4 additions and 4 deletions

View File

@ -313,9 +313,9 @@ uint8_t gc_execute_line(char *line)
case 'R': word_bit = WORD_R; gc_block.values.r = value; break; case 'R': word_bit = WORD_R; gc_block.values.r = value; break;
case 'S': word_bit = WORD_S; gc_block.values.s = value; break; case 'S': word_bit = WORD_S; gc_block.values.s = value; break;
case 'T': word_bit = WORD_T; case 'T': word_bit = WORD_T;
if (value > MAX_TOOL_NUMBER) { FAIL(STATUS_GCODE_MAX_VALUE_EXCEEDED); } if (value > MAX_TOOL_NUMBER) { FAIL(STATUS_GCODE_MAX_VALUE_EXCEEDED); }
gc_block.values.t = int_value; gc_block.values.t = int_value;
break; break;
case 'X': word_bit = WORD_X; gc_block.values.xyza[X_AXIS] = value; axis_words |= (1<<X_AXIS); break; case 'X': word_bit = WORD_X; gc_block.values.xyza[X_AXIS] = value; axis_words |= (1<<X_AXIS); break;
case 'Y': word_bit = WORD_Y; gc_block.values.xyza[Y_AXIS] = value; axis_words |= (1<<Y_AXIS); break; case 'Y': word_bit = WORD_Y; gc_block.values.xyza[Y_AXIS] = value; axis_words |= (1<<Y_AXIS); break;
case 'Z': word_bit = WORD_Z; gc_block.values.xyza[Z_AXIS] = value; axis_words |= (1<<Z_AXIS); break; case 'Z': word_bit = WORD_Z; gc_block.values.xyza[Z_AXIS] = value; axis_words |= (1<<Z_AXIS); break;

View File

@ -199,7 +199,7 @@ typedef struct {
typedef struct { typedef struct {
float f; // Feed float f; // Feed
float ijk[3]; // I,J,K Axis arc offsets float ijk[N_AXIS]; // I,J,K Axis arc offsets
uint8_t l; // G10 or canned cycles parameters uint8_t l; // G10 or canned cycles parameters
int32_t n; // Line number int32_t n; // Line number
float p; // G10 or dwell parameters float p; // G10 or dwell parameters

View File

@ -23,7 +23,7 @@
// Grbl versioning system // Grbl versioning system
#define GRBL_VERSION "1.1f" #define GRBL_VERSION "1.1f"
#define GRBL_VERSION_BUILD "20170511" #define GRBL_VERSION_BUILD "20171008"
// Define standard libraries used by Grbl. // Define standard libraries used by Grbl.
#include <avr/io.h> #include <avr/io.h>