From 0708275c6a6caeb21dc483ff2e8fca4c3584ce83 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 4 May 2023 18:05:56 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Move=20G28O=20inside=20ProUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/gcode/probe/G30.cpp | 4 +--- Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp index bd97bb6d090..42a081960d0 100644 --- a/Marlin/src/gcode/probe/G30.cpp +++ b/Marlin/src/gcode/probe/G30.cpp @@ -67,9 +67,7 @@ void GcodeSuite::G30() { remember_feedrate_scaling_off(); - #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) - process_subcommands_now(F("G28O")); - #endif + TERN_(DWIN_CREALITY_LCD_JYERSUI, process_subcommands_now(F("G28O"))); const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE; diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp index 760582c76a7..47b104c5ba4 100644 --- a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp +++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp @@ -183,7 +183,7 @@ void BedLevelToolsClass::MoveToZ() { } void BedLevelToolsClass::ProbeXY() { const uint16_t Clear = Z_CLEARANCE_DEPLOY_PROBE; - sprintf_P(cmd, PSTR("G0Z%i\nG30X%sY%s"), + sprintf_P(cmd, PSTR("G28O\nG0Z%i\nG30X%sY%s"), Clear, dtostrf(bedlevel.get_mesh_x(bedLevelTools.mesh_x), 1, 2, str_1), dtostrf(bedlevel.get_mesh_y(bedLevelTools.mesh_y), 1, 2, str_2)