From 26a7dd9b487e541f0b1b9e014c11df1b85dc1e09 Mon Sep 17 00:00:00 2001 From: Mitch Bradley Date: Mon, 5 Jul 2021 12:28:13 -1000 Subject: [PATCH] homing_single_axis_commands is always true no longer configurable --- Grbl_Esp32/src/Machine/MachineConfig.cpp | 1 - Grbl_Esp32/src/Machine/MachineConfig.h | 1 - Grbl_Esp32/src/ProcessSettings.cpp | 14 ++++++-------- Grbl_Esp32/src/Report.cpp | 4 +--- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Grbl_Esp32/src/Machine/MachineConfig.cpp b/Grbl_Esp32/src/Machine/MachineConfig.cpp index a9e44e99..098c707c 100644 --- a/Grbl_Esp32/src/Machine/MachineConfig.cpp +++ b/Grbl_Esp32/src/Machine/MachineConfig.cpp @@ -75,7 +75,6 @@ namespace Machine { handler.item("enable_parking_override_control", _enableParkingOverrideControl); handler.item("deactivate_parking_upon_init", _deactivateParkingUponInit); handler.item("check_limits_at_init", _checkLimitsAtInit); - handler.item("homing_single_axis_commands", _homingSingleAxisCommands); handler.item("limits_two_switches_on_axis", _limitsTwoSwitchesOnAxis); handler.item("disable_laser_during_hold", _disableLaserDuringHold); handler.item("use_line_numbers", _useLineNumbers); diff --git a/Grbl_Esp32/src/Machine/MachineConfig.h b/Grbl_Esp32/src/Machine/MachineConfig.h index 98066d0b..8081ed4d 100644 --- a/Grbl_Esp32/src/Machine/MachineConfig.h +++ b/Grbl_Esp32/src/Machine/MachineConfig.h @@ -77,7 +77,6 @@ namespace Machine { // executed in sync with GCode commands. It is not a real-time command. bool _enableParkingOverrideControl = false; bool _deactivateParkingUponInit = false; - bool _homingSingleAxisCommands = false; // At power-up or a reset, Grbl will check the limit switch states to ensure they are not active // before initialization. If it detects a problem and the hard limits setting is enabled, Grbl will diff --git a/Grbl_Esp32/src/ProcessSettings.cpp b/Grbl_Esp32/src/ProcessSettings.cpp index 102fad4a..dfecf580 100644 --- a/Grbl_Esp32/src/ProcessSettings.cpp +++ b/Grbl_Esp32/src/ProcessSettings.cpp @@ -506,14 +506,12 @@ void make_grbl_commands() { new GrblCommand("H", "Home", home_all, idleOrAlarm); new GrblCommand("MD", "Motor/Disable", motor_disable, idleOrAlarm); - if (config->_homingSingleAxisCommands) { - new GrblCommand("HX", "Home/X", home_x, idleOrAlarm); - new GrblCommand("HY", "Home/Y", home_y, idleOrAlarm); - new GrblCommand("HZ", "Home/Z", home_z, idleOrAlarm); - new GrblCommand("HA", "Home/A", home_a, idleOrAlarm); - new GrblCommand("HB", "Home/B", home_b, idleOrAlarm); - new GrblCommand("HC", "Home/C", home_c, idleOrAlarm); - } + new GrblCommand("HX", "Home/X", home_x, idleOrAlarm); + new GrblCommand("HY", "Home/Y", home_y, idleOrAlarm); + new GrblCommand("HZ", "Home/Z", home_z, idleOrAlarm); + new GrblCommand("HA", "Home/A", home_a, idleOrAlarm); + new GrblCommand("HB", "Home/B", home_b, idleOrAlarm); + new GrblCommand("HC", "Home/C", home_c, idleOrAlarm); new GrblCommand("SLP", "System/Sleep", sleep_grbl, idleOrAlarm); new GrblCommand("I", "Build/Info", get_report_build_info, idleOrAlarm); diff --git a/Grbl_Esp32/src/Report.cpp b/Grbl_Esp32/src/Report.cpp index 5e5e92a2..cfda82d0 100644 --- a/Grbl_Esp32/src/Report.cpp +++ b/Grbl_Esp32/src/Report.cpp @@ -563,9 +563,7 @@ void report_build_info(const char* line, uint8_t client) { grbl_send(client, "M"); // TODO Need to deal with M8...it could be disabled } grbl_send(client, "P"); - if (config->_homingSingleAxisCommands) { - grbl_send(client, "H"); - } + grbl_send(client, "H"); if (config->_limitsTwoSwitchesOnAxis) { grbl_send(client, "L"); }