From b115276feeee2e294423cc70703ae2876abcbdd0 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Fri, 23 Dec 2022 17:49:15 +0100 Subject: [PATCH] move display notification after leveling for Chiron into ExtUI hook --- Marlin/src/gcode/bedlevel/abl/G29.cpp | 5 ----- Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp | 6 ++++++ Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h | 3 +++ Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp | 7 ++++++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 3a3201b9..0fef5ad6 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -806,11 +806,6 @@ G29_TYPE GcodeSuite::G29() { bedlevel.set_grid(abl.gridSpacing, abl.probe_position_lf); COPY(bedlevel.z_values, abl.z_values); TERN_(IS_KINEMATIC, bedlevel.extrapolate_unprobed_bed_level()); - - #if ENABLED(KNUTWURST_TFT_LEVELING) - LCD_SERIAL.print("J25\r\n"); // Autoleveling done! - #endif - bedlevel.refresh_bed_level(); bedlevel.print_leveling_grid(); diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp index 08298ba5..547ef15b 100755 --- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp @@ -2333,5 +2333,11 @@ #endif } + #if ENABLED(KNUTWURST_TFT_LEVELING) + void AnycubicTouchscreenClass::LevelingDone() { + SENDLINE_DBG_PGM("J25", "TFT Serial Debug: Auto leveling done... J25"); + } + #endif + AnycubicTouchscreenClass AnycubicTouchscreen; #endif // ifdef ANYCUBIC_TOUCHSCREEN diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h index c0c9d29e..8c66ce25 100755 --- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h +++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h @@ -259,6 +259,9 @@ void KillTFT(); #if BOTH(ANYCUBIC_TFT_DEBUG, KNUTWURST_DGUS2_TFT) void Command(const char * const command); #endif +#if ENABLED(KNUTWURST_TFT_LEVELING) + void LevelingDone(); +#endif char TFTstate = ANYCUBIC_TFT_STATE_IDLE; /** diff --git a/Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp b/Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp index a4bd2113..68132055 100644 --- a/Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp +++ b/Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp @@ -92,7 +92,12 @@ namespace ExtUI { #if HAS_MESH void onLevelingStart() {} - void onLevelingDone() {} + + void onLevelingDone() { + #if ENABLED(KNUTWURST_TFT_LEVELING) + AnycubicTouchscreen.LevelingDone(); + #endif + } void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) { // Called when any mesh points are updated