zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

No more direct G28 calls

Browse source
This commit is contained in:
Scott Lahteine 2020-03-02 20:50:06 -06:00
parent af62d7f937
commit 5171e9da93
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -210,7 +210,7 @@
* Z Home to the Z endstop * Z Home to the Z endstop
* *
*/ */
void GcodeSuite::G28(const bool always_home_all) { void GcodeSuite::G28() {
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPGM(">>> G28"); DEBUG_ECHOLNPGM(">>> G28");
log_machine_info(); log_machine_info();
@ -311,7 +311,6 @@ void GcodeSuite::G28(const bool always_home_all) {
#if ENABLED(DELTA) #if ENABLED(DELTA)
home_delta(); home_delta();
UNUSED(always_home_all);
#if ENABLED(IMPROVE_HOMING_RELIABILITY) #if ENABLED(IMPROVE_HOMING_RELIABILITY)
end_slow_homing(slow_homing); end_slow_homing(slow_homing);
@ -320,7 +319,7 @@ void GcodeSuite::G28(const bool always_home_all) {
#else // NOT DELTA #else // NOT DELTA
const bool homeX = parser.seen('X'), homeY = parser.seen('Y'), homeZ = parser.seen('Z'), 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; doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ;
destination = current_position; destination = current_position;

2
Marlin/src/gcode/gcode.cpp
View file

@ -277,7 +277,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 27: G27(); break; // G27: Nozzle Park case 27: G27(); break; // G27: Nozzle Park
#endif #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 #if HAS_LEVELING
case 29: // G29: Bed leveling calibration case 29: // G29: Bed leveling calibration

2
Marlin/src/gcode/gcode.h
View file

@ -434,7 +434,7 @@ private:
static void G27(); static void G27();
#endif #endif
static void G28(const bool always_home_all); static void G28();
#if HAS_LEVELING #if HAS_LEVELING
#if ENABLED(G29_RETRY_AND_RECOVER) #if ENABLED(G29_RETRY_AND_RECOVER)