CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '22-auto_z_align-for-workhorse' into 'master'

Browse Source 
Resolve "Auto_z_align for Workhorse"

Closes #22

See merge request lulzbot3d/marlin!12
This commit is contained in:
Robert Henderson 2021-09-15 16:38:19 +00:00
commit c37534b9d4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Configuration_adv.h
View File

@ -764,8 +764,13 @@
#if ANY(MiniV2, TAZPro, TAZProXT, Sidekick_289, Sidekick_747) #if ANY(MiniV2, TAZPro, TAZProXT, Sidekick_289, Sidekick_747)
#define SENSORLESS_BACKOFF_MM { 4, 4 , 0} // (mm) Backoff from endstops before sensorless homing #define SENSORLESS_BACKOFF_MM { 4, 4 , 0} // (mm) Backoff from endstops before sensorless homing
#else #else
#if defined(Workhorse)
#define HOMING_BACKOFF_POST_MM { 2, 2, 0 } // (mm) Backoff from endstops after homing
#define QUICK_HOME // If G28 contains XY do a diagonal move first
#elif defined(TAZ6)
#define HOMING_BACKOFF_POST_MM { 2, 2, 16 } // (mm) Backoff from endstops after homing #define HOMING_BACKOFF_POST_MM { 2, 2, 16 } // (mm) Backoff from endstops after homing
#define QUICK_HOME // If G28 contains XY do a diagonal move first #define QUICK_HOME // If G28 contains XY do a diagonal move first
#endif
#endif #endif
#define HOMING_BUMP_MM { 5, 5, 2 } // (mm) Backoff from endstops after first bump #define HOMING_BUMP_MM { 5, 5, 2 } // (mm) Backoff from endstops after first bump

2
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -383,6 +383,8 @@ void menu_motion() {
// //
#if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION) #if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
GCODES_ITEM(MSG_AUTO_Z_ALIGN, PSTR("G34")); GCODES_ITEM(MSG_AUTO_Z_ALIGN, PSTR("G34"));
#elif ENABLED(X_LEVEL_SEQUENCE)
GCODES_ITEM(MSG_AUTO_Z_ALIGN, PSTR(LEVELING_COMMANDS));
#endif #endif
// //