From 5171e9da93d5913f7e4c75df9fdbe93c7c8fb32e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 2 Mar 2020 20:50:06 -0600 Subject: [PATCH] No more direct G28 calls --- Marlin/src/gcode/calibrate/G28.cpp | 5 ++--- Marlin/src/gcode/gcode.cpp | 2 +- Marlin/src/gcode/gcode.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp index 6841636cf0..f75462fb97 100644 --- a/Marlin/src/gcode/calibrate/G28.cpp +++ b/Marlin/src/gcode/calibrate/G28.cpp @@ -210,7 +210,7 @@ * Z Home to the Z endstop * */ -void GcodeSuite::G28(const bool always_home_all) { +void GcodeSuite::G28() { if (DEBUGGING(LEVELING)) { DEBUG_ECHOLNPGM(">>> G28"); log_machine_info(); @@ -311,7 +311,6 @@ void GcodeSuite::G28(const bool always_home_all) { #if ENABLED(DELTA) home_delta(); - UNUSED(always_home_all); #if ENABLED(IMPROVE_HOMING_RELIABILITY) end_slow_homing(slow_homing); @@ -320,7 +319,7 @@ void GcodeSuite::G28(const bool always_home_all) { #else // NOT DELTA const bool homeX = parser.seen('X'), homeY = parser.seen('Y'), homeZ = parser.seen('Z'), - home_all = always_home_all || (homeX == homeY && homeX == homeZ), + home_all = homeX == homeY && homeX == homeZ, // All or None doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ; destination = current_position; diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index f5df737630..e53a17eeb0 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -277,7 +277,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { case 27: G27(); break; // G27: Nozzle Park #endif - case 28: G28(false); break; // G28: Home all axes, one at a time + case 28: G28(); break; // G28: Home one or more axes #if HAS_LEVELING case 29: // G29: Bed leveling calibration diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 0fb4a4e8ed..7360fcb9fb 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -434,7 +434,7 @@ private: static void G27(); #endif - static void G28(const bool always_home_all); + static void G28(); #if HAS_LEVELING #if ENABLED(G29_RETRY_AND_RECOVER)