From 1daa885dbccb8df967fc9cad8084dae0fbcab28f Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Thu, 28 Sep 2023 09:16:58 -0400 Subject: [PATCH] More g30 --- Marlin/Configuration_adv.h | 2 +- Marlin/src/gcode/probe/G30.cpp | 2 +- Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index ccbeb64db5..405daab1fc 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -709,7 +709,7 @@ */ #if ENABLED(MachineEnder3S1) #define E0_AUTO_FAN_PIN PC0 -#elif HOTENDS == 1 +#elif HOTENDS == 1 && MOTHERBOARD == BOARD_RAMPS_CREALITY #define E0_AUTO_FAN_PIN 7 #endif #define E1_AUTO_FAN_PIN -1 diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp index f8fe88d339..eab9bd64d2 100644 --- a/Marlin/src/gcode/probe/G30.cpp +++ b/Marlin/src/gcode/probe/G30.cpp @@ -87,7 +87,7 @@ void GcodeSuite::G30() { F( " Z:"), p_float_t(measured_z, 2) ); msg.echoln(); - #if ANY(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) + #if ANY(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, EXTENSIBLE_UI) ui.set_status(msg); #endif } diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp index 6b277d3552..cf29d771a1 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp @@ -1051,7 +1051,8 @@ void RTSSHOW::RTS_HandleData() #if ENABLED(LCD_BED_TRAMMING) && DISABLED(BED_TRAMMING_USE_PROBE) constexpr float lfrb[4] = BED_TRAMMING_INSET_LFRB; #elif ENABLED(BED_TRAMMING_USE_PROBE) - float lfrb[4] = { getBedProbeLimits().pos[0] + 0.01f, getBedProbeLimits().pos[1] + 0.01f, getBedProbeLimits().pos[2] - 0.01f, getBedProbeLimits().pos[3] - 0.01f}; + float lfrb[4] = { getBedProbeLimits().pos[0] + 1, getBedProbeLimits().pos[1] + 1, getBedProbeLimits().pos[2] - 1, getBedProbeLimits().pos[3] - 1}; + SERIAL_ECHOLN("ProbePnts : ", lfrb[0], " - ", lfrb[1], " - ", lfrb[2], " - ", lfrb[3]); #endif //SERIAL_ECHOLNPGM_P(PSTR("BeginSwitch")); @@ -1756,7 +1757,8 @@ void RTSSHOW::RTS_HandleData() case 6: // Assitant Level , Centre 1 { #if ENABLED(BED_TRAMMING_USE_PROBE) - sprintf_P(g30CommandStr, PSTR("G30X%sY%s"), X_CENTER, Y_CENTER); + sprintf(g30CommandStr, "G30X%iY%i", X_CENTER, Y_CENTER); + SERIAL_ECHOLN(g30CommandStr); injectCommands(g30CommandStr); #else setAxisPosition_mm(BED_TRAMMING_Z_HOP, (axis_t)Z); @@ -1769,7 +1771,8 @@ void RTSSHOW::RTS_HandleData() case 7: // Assitant Level , Front Left 2 { #if ENABLED(BED_TRAMMING_USE_PROBE) - sprintf_P(g30CommandStr, PSTR("G30X%sY%s"), lfrb[0], lfrb[1]); + sprintf(g30CommandStr, "G30X%iY%i", (int)lfrb[0], (int)lfrb[1]); + SERIAL_ECHOLN(g30CommandStr); injectCommands(g30CommandStr); #else setAxisPosition_mm(BED_TRAMMING_Z_HOP, (axis_t)Z); @@ -1782,7 +1785,8 @@ void RTSSHOW::RTS_HandleData() case 8: // Assitant Level , Front Right 3 { #if ENABLED(BED_TRAMMING_USE_PROBE) - sprintf_P(g30CommandStr, PSTR("G30X%sY%s"), lfrb[2], lfrb[1]); + sprintf(g30CommandStr, "G30X%iY%i", (int)lfrb[2], (int)lfrb[1]); + SERIAL_ECHOLN(g30CommandStr); injectCommands(g30CommandStr); #else setAxisPosition_mm(BED_TRAMMING_Z_HOP, (axis_t)Z); @@ -1795,7 +1799,8 @@ void RTSSHOW::RTS_HandleData() case 9: // Assitant Level , Back Right 4 { #if ENABLED(BED_TRAMMING_USE_PROBE) - sprintf_P(g30CommandStr, PSTR("G30X%sY%s"), lfrb[2], lfrb[3]); + sprintf(g30CommandStr, "G30X%iY%i", (int)lfrb[2], (int)lfrb[3]); + SERIAL_ECHOLN(g30CommandStr); injectCommands(g30CommandStr); #else setAxisPosition_mm(BED_TRAMMING_Z_HOP, (axis_t)Z); @@ -1808,7 +1813,8 @@ void RTSSHOW::RTS_HandleData() case 10: // Assitant Level , Back Left 5 { #if ENABLED(BED_TRAMMING_USE_PROBE) - sprintf_P(g30CommandStr, PSTR("G30X%sY%s"), lfrb[0], lfrb[3]); + sprintf(g30CommandStr, "G30X%iY%i", (int)lfrb[0], (int)lfrb[3]); + SERIAL_ECHOLN(g30CommandStr); injectCommands(g30CommandStr); #else setAxisPosition_mm(BED_TRAMMING_Z_HOP, (axis_t)Z);