bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

✨ MAG_MOUNTED_PROBE (#24420)

Browse Source 
Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Farva42
2022-07-06 19:40:09 -06:00
committed by Scott Lahteine
parent 6c2ffe9d34
commit 527fe2496a
7 changed files with 105 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Marlin/src/module/probe.cpp
View File

@ -264,7 +264,57 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
#endif
}
#endif // Z_PROBE_ALLEN_KEY
#elif ENABLED(MAG_MOUNTED_PROBE)
typedef struct { float fr_mm_min; xyz_pos_t where; } mag_probe_move_t;
inline void run_deploy_moves_script() {
#ifdef MAG_MOUNTED_DEPLOY_1
constexpr mag_probe_move_t deploy_1 = MAG_MOUNTED_DEPLOY_1;
do_blocking_move_to(deploy_1.where, MMM_TO_MMS(deploy_1.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_DEPLOY_2
constexpr mag_probe_move_t deploy_2 = MAG_MOUNTED_DEPLOY_2;
do_blocking_move_to(deploy_2.where, MMM_TO_MMS(deploy_2.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_DEPLOY_3
constexpr mag_probe_move_t deploy_3 = MAG_MOUNTED_DEPLOY_3;
do_blocking_move_to(deploy_3.where, MMM_TO_MMS(deploy_3.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_DEPLOY_4
constexpr mag_probe_move_t deploy_4 = MAG_MOUNTED_DEPLOY_4;
do_blocking_move_to(deploy_4.where, MMM_TO_MMS(deploy_4.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_DEPLOY_5
constexpr mag_probe_move_t deploy_5 = MAG_MOUNTED_DEPLOY_5;
do_blocking_move_to(deploy_5.where, MMM_TO_MMS(deploy_5.fr_mm_min));
#endif
}
inline void run_stow_moves_script() {
#ifdef MAG_MOUNTED_STOW_1
constexpr mag_probe_move_t stow_1 = MAG_MOUNTED_STOW_1;
do_blocking_move_to(stow_1.where, MMM_TO_MMS(stow_1.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_STOW_2
constexpr mag_probe_move_t stow_2 = MAG_MOUNTED_STOW_2;
do_blocking_move_to(stow_2.where, MMM_TO_MMS(stow_2.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_STOW_3
constexpr mag_probe_move_t stow_3 = MAG_MOUNTED_STOW_3;
do_blocking_move_to(stow_3.where, MMM_TO_MMS(stow_3.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_STOW_4
constexpr mag_probe_move_t stow_4 = MAG_MOUNTED_STOW_4;
do_blocking_move_to(stow_4.where, MMM_TO_MMS(stow_4.fr_mm_min));
#endif
#ifdef MAG_MOUNTED_STOW_5
constexpr mag_probe_move_t stow_5 = MAG_MOUNTED_STOW_5;
do_blocking_move_to(stow_5.where, MMM_TO_MMS(stow_5.fr_mm_min));
#endif
}
#endif // MAG_MOUNTED_PROBE
#if HAS_QUIET_PROBING
@ -350,7 +400,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
servo[Z_PROBE_SERVO_NR].move(servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
#elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
#elif ANY(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, MAG_MOUNTED_PROBE)
deploy ? run_deploy_moves_script() : run_stow_moves_script();