From f4eafed188189d2a77c53a2a68bd931ee838b584 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 7 Jan 2024 21:59:25 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Z=5FPROBE=5FEND=5FSCRIPT=20=3D>?= =?UTF-8?q?=20EVENT=5FGCODE=5FAFTER=5FG29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration.h | 2 +- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 6 +++--- Marlin/src/gcode/bedlevel/abl/G29.cpp | 6 +++--- Marlin/src/inc/Changes.h | 2 ++ buildroot/tests/mega2560 | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9acdc107ca..ad659f70e2 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2032,7 +2032,7 @@ * Commands to execute at the end of G29 probing. * Useful to retract or move the Z probe out of the way. */ -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" +//#define EVENT_GCODE_AFTER_G29 "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" /** * Normally G28 leaves leveling disabled on completion. Enable one of diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 720c86769d..560ff71e84 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -681,11 +681,11 @@ void unified_bed_leveling::G29() { ui.release(); #endif - #ifdef Z_PROBE_END_SCRIPT - if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT); + #ifdef EVENT_GCODE_AFTER_G29 + if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", EVENT_GCODE_AFTER_G29); if (probe_deployed) { planner.synchronize(); - gcode.process_subcommands_now(F(Z_PROBE_END_SCRIPT)); + gcode.process_subcommands_now(F(EVENT_GCODE_AFTER_G29)); } #else UNUSED(probe_deployed); diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 700562df81..1ca3826c81 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -987,10 +987,10 @@ G29_TYPE GcodeSuite::G29() { TERN_(HAS_BED_PROBE, probe.move_z_after_probing()); - #ifdef Z_PROBE_END_SCRIPT - if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT); + #ifdef EVENT_GCODE_AFTER_G29 + if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", EVENT_GCODE_AFTER_G29); planner.synchronize(); - process_subcommands_now(F(Z_PROBE_END_SCRIPT)); + process_subcommands_now(F(EVENT_GCODE_AFTER_G29)); #endif probe.use_probing_tool(false); diff --git a/Marlin/src/inc/Changes.h b/Marlin/src/inc/Changes.h index 5a03e87b1d..0fd91ee9ca 100644 --- a/Marlin/src/inc/Changes.h +++ b/Marlin/src/inc/Changes.h @@ -685,6 +685,8 @@ #error "SDIO_SUPPORT is now ONBOARD_SDIO." #elif defined(ANET_FULL_GRAPHICS_LCD_ALT_WIRING) #error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING is now CTC_A10S_A13." +#elif defined(Z_PROBE_END_SCRIPT) + #error "Z_PROBE_END_SCRIPT is now EVENT_GCODE_AFTER_G29." #endif // Changes to Probe Temp Compensation (#17392) diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560 index 1fbdd6b58b..c41e73640d 100755 --- a/buildroot/tests/mega2560 +++ b/buildroot/tests/mega2560 @@ -87,7 +87,7 @@ opt_disable X_DRIVER_TYPE Y_DRIVER_TYPE Z_DRIVER_TYPE exec_test $1 $2 "E Axis Only | DOGM MarlinUI" "$3" # -# Mixing Extruder with 5 steppers, Greek +# Mixing Extruder with 5 steppers, Russian # restore_configs opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \ @@ -98,7 +98,7 @@ opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \ XY_AFTER_HOMING EVENT_GCODE_AFTER_HOMING \ FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE INPUT_SHAPING_X INPUT_SHAPING_Y opt_disable DISABLE_OTHER_EXTRUDERS -exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Input Shaping | Greek" "$3" +exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Input Shaping | Russian" "$3" # # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER