SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Touch Mi: Add magnet Y position (#15166)

Browse source
This commit is contained in:
kakou-fr 2019-09-05 01:09:12 +02:00 committed by Scott Lahteine
parent 85f0556118
commit 6b1c4dec46
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/module/motion.cpp
View file

@ -424,7 +424,7 @@ void do_blocking_move_to_x(const float &rx, const float &fr_mm_s/*=0.0*/) {
do_blocking_move_to(rx, current_position[Y_AXIS], current_position[Z_AXIS], fr_mm_s); do_blocking_move_to(rx, current_position[Y_AXIS], current_position[Z_AXIS], fr_mm_s);
} }
void do_blocking_move_to_y(const float &ry, const float &fr_mm_s/*=0.0*/) { void do_blocking_move_to_y(const float &ry, const float &fr_mm_s/*=0.0*/) {
do_blocking_move_to(current_position[Y_AXIS], ry, current_position[Z_AXIS], fr_mm_s); do_blocking_move_to(current_position[X_AXIS], ry, current_position[Z_AXIS], fr_mm_s);
} }
void do_blocking_move_to_z(const float &rz, const float &fr_mm_s/*=0.0*/) { void do_blocking_move_to_z(const float &rz, const float &fr_mm_s/*=0.0*/) {
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], rz, fr_mm_s); do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], rz, fr_mm_s);

9
Marlin/src/module/probe.cpp
View file

@ -116,6 +116,9 @@ float zprobe_zoffset; // Initialized by settings.load()
#if TOUCH_MI_DEPLOY_XPOS > X_MAX_BED #if TOUCH_MI_DEPLOY_XPOS > X_MAX_BED
TemporaryGlobalEndstopsState unlock_x(false); TemporaryGlobalEndstopsState unlock_x(false);
#endif #endif
#if TOUCH_MI_DEPLOY_YPOS > Y_MAX_BED
TemporaryGlobalEndstopsState unlock_y(false);
#endif
#if ENABLED(TOUCH_MI_MANUAL_DEPLOY) #if ENABLED(TOUCH_MI_MANUAL_DEPLOY)
@ -132,10 +135,12 @@ float zprobe_zoffset; // Initialized by settings.load()
ui.reset_status(); ui.reset_status();
ui.goto_screen(prev_screen); ui.goto_screen(prev_screen);
#elif defined(TOUCH_MI_DEPLOY_XPOS) && defined(TOUCH_MI_DEPLOY_YPOS)
do_blocking_move_to_xy(TOUCH_MI_DEPLOY_XPOS, TOUCH_MI_DEPLOY_YPOS);
#elif defined(TOUCH_MI_DEPLOY_XPOS) #elif defined(TOUCH_MI_DEPLOY_XPOS)
do_blocking_move_to_x(TOUCH_MI_DEPLOY_XPOS); do_blocking_move_to_x(TOUCH_MI_DEPLOY_XPOS);
#elif defined(TOUCH_MI_DEPLOY_YPOS)
do_blocking_move_to_y(TOUCH_MI_DEPLOY_YPOS);
#endif #endif
} }