From 1ccc8752bfc7cf12d0f241cd38392bd987ceba5c Mon Sep 17 00:00:00 2001 From: bdring Date: Wed, 30 Sep 2020 11:11:02 -0500 Subject: [PATCH] Devt (#621) * Fixed various small bugs (#605) * Fixed various small bugs * Fixed potential cast bug * Fixed double reporting of errors Co-authored-by: Stefan de Bruijn * Stallguard tuning (#607) * Devt (#571) * Handles Tranimic drivers errors better - If an unsupported driver is specified, it will give a message and not crash. * Cleaned up unused files Got rid of old unipolar files Got rid of servo axis feature - it is a motor class now Got rid of solenoid pen feature - never really used and it should be a motor class if it is. * Fix ENABLE_AUTHENTICATION (#569) * Fixed authentication code. * Removed another const cast Co-authored-by: Stefan de Bruijn * Fix step leakage with inverted steps (#570) * Fix step leakage with inverted steps * Update build date for merge Co-authored-by: Bart Dring Co-authored-by: Stefan de Bruijn Co-authored-by: Stefan de Bruijn Co-authored-by: Mitch Bradley Co-authored-by: Bart Dring * Update platformio.ini Per PR 583 * Created an enum for mode * Removing some unused machine defs * Added test machine definition * Clean up for PR * Remove test machine def. Co-authored-by: Stefan de Bruijn Co-authored-by: Stefan de Bruijn Co-authored-by: Mitch Bradley Co-authored-by: Bart Dring * Basic testing Complete * Made state variable volatile. * Homing cycle settings (#613) * Initial Tests Complete * Update Grbl.h * Update variables Co-authored-by: Mitch Bradley * fixed dual switches when inverted (#614) * fixed dual switches when inverted * Removed debug message * Cleaning up the machine defs Removed unused #defines. * Store coordinate offsets in NVS (#611) * Store coordinate offsets in NVS * Handle both old Eeprom formats * Implementing fixes (#616) - Stop creating additional tasks when limit_init() gets called again from homing and resets - Explicitly delete an object that was causing a memory loss. * Update Grbl.h * Tweak memory fix and add $H check for $Homing/Cycles * Fix G28.1 and G30.1 * Update Grbl.h Co-authored-by: Stefan de Bruijn Co-authored-by: Stefan de Bruijn Co-authored-by: Mitch Bradley Co-authored-by: Bart Dring --- Grbl_Esp32/src/GCode.cpp | 6 +++--- Grbl_Esp32/src/Grbl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Grbl_Esp32/src/GCode.cpp b/Grbl_Esp32/src/GCode.cpp index 8d5391e2..8031c95e 100644 --- a/Grbl_Esp32/src/GCode.cpp +++ b/Grbl_Esp32/src/GCode.cpp @@ -142,7 +142,7 @@ Error gc_execute_line(char* line, uint8_t client) { uint8_t gc_parser_flags = GCParserNone; auto n_axis = number_axis->get(); 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. 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)); break; case NonModal::SetHome0: - coords[CoordIndex::G28]->set(coord_data); + coords[CoordIndex::G28]->set(gc_state.position); break; case NonModal::SetHome1: - coords[CoordIndex::G30]->set(coord_data); + coords[CoordIndex::G30]->set(gc_state.position); break; case NonModal::SetCoordinateOffset: memcpy(gc_state.coord_offset, gc_block.values.xyz, sizeof(gc_block.values.xyz)); diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h index fcaf9890..60159039 100644 --- a/Grbl_Esp32/src/Grbl.h +++ b/Grbl_Esp32/src/Grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system const char* const GRBL_VERSION = "1.3a"; -const char* const GRBL_VERSION_BUILD = "20200928"; +const char* const GRBL_VERSION_BUILD = "20200929"; //#include #include