mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 18:32:37 +02:00
Code Issues Releases Wiki Activity

Fix G28.1 and G30.1

Browse Source
This commit is contained in:
bdring
2020-09-29 13:48:13 -05:00
parent a09ec1c9a3
commit e0588ee377
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Grbl_Esp32/src/GCode.cpp
View File

@@ -142,7 +142,7 @@ Error gc_execute_line(char* line, uint8_t client) {
uint8_t gc_parser_flags = GCParserNone; uint8_t gc_parser_flags = GCParserNone;
auto n_axis = number_axis->get(); auto n_axis = number_axis->get();
float coord_data[MAX_N_AXIS]; // Used by WCO-related commands float coord_data[MAX_N_AXIS]; // Used by WCO-related commands
uint8_t pValue; // Integer value of P word uint8_t pValue; // Integer value of P word
// Determine if the line is a jogging motion or a normal g-code block. // Determine if the line is a jogging motion or a normal g-code block.
if (line[0] == '$') { // NOTE: `$J=` already parsed when passed to this function. if (line[0] == '$') { // NOTE: `$J=` already parsed when passed to this function.
@@ -1478,10 +1478,10 @@ Error gc_execute_line(char* line, uint8_t client) {
memcpy(gc_state.position, coord_data, sizeof(gc_state.position)); memcpy(gc_state.position, coord_data, sizeof(gc_state.position));
break; break;
case NonModal::SetHome0: case NonModal::SetHome0:
coords[CoordIndex::G28]->set(coord_data); coords[CoordIndex::G28]->set(gc_state.position);
break; break;
case NonModal::SetHome1: case NonModal::SetHome1:
coords[CoordIndex::G30]->set(coord_data); coords[CoordIndex::G30]->set(gc_state.position);
break; break;
case NonModal::SetCoordinateOffset: case NonModal::SetCoordinateOffset:
memcpy(gc_state.coord_offset, gc_block.values.xyz, sizeof(gc_block.values.xyz)); memcpy(gc_state.coord_offset, gc_block.values.xyz, sizeof(gc_block.values.xyz));