|
|
|
@ -379,8 +379,8 @@ bool set_probe_deployed(const bool deploy) {
|
|
|
|
|
|
|
|
|
|
// Make room for probe to deploy (or stow)
|
|
|
|
|
// Fix-mounted probe should only raise for deploy
|
|
|
|
|
// unless MANUAL_DEPLOY_STOW is enabled
|
|
|
|
|
#if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(MANUAL_DEPLOY_STOW)
|
|
|
|
|
// unless PAUSE_BEFORE_DEPLOY_STOW is enabled
|
|
|
|
|
#if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(PAUSE_BEFORE_DEPLOY_STOW)
|
|
|
|
|
const bool deploy_stow_condition = deploy;
|
|
|
|
|
#else
|
|
|
|
|
constexpr bool deploy_stow_condition = true;
|
|
|
|
@ -425,6 +425,24 @@ bool set_probe_deployed(const bool deploy) {
|
|
|
|
|
// otherwise an Allen-Key probe can't be stowed.
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
|
|
|
|
|
|
|
|
|
|
BUZZ(100, 659);
|
|
|
|
|
BUZZ(100, 698);
|
|
|
|
|
|
|
|
|
|
const char * const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW);
|
|
|
|
|
lcd_setalertstatusPGM(ds_str);
|
|
|
|
|
serialprintPGM(ds_str);
|
|
|
|
|
SERIAL_EOL();
|
|
|
|
|
|
|
|
|
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
|
|
|
|
wait_for_user = true;
|
|
|
|
|
while (wait_for_user) idle();
|
|
|
|
|
lcd_reset_status();
|
|
|
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
|
|
|
|
|
|
|
|
#endif // PAUSE_BEFORE_DEPLOY_STOW
|
|
|
|
|
|
|
|
|
|
#if ENABLED(SOLENOID_PROBE)
|
|
|
|
|
|
|
|
|
|
#if HAS_SOLENOID_1
|
|
|
|
@ -443,24 +461,6 @@ bool set_probe_deployed(const bool deploy) {
|
|
|
|
|
|
|
|
|
|
deploy ? run_deploy_moves_script() : run_stow_moves_script();
|
|
|
|
|
|
|
|
|
|
#elif ENABLED(MANUAL_DEPLOY_STOW)
|
|
|
|
|
|
|
|
|
|
do_probe_raise(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
|
|
|
|
|
|
BUZZ(100, 659);
|
|
|
|
|
BUZZ(100, 698);
|
|
|
|
|
|
|
|
|
|
const char * const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW);
|
|
|
|
|
lcd_setalertstatusPGM(ds_str);
|
|
|
|
|
serialprintPGM(ds_str);
|
|
|
|
|
SERIAL_EOL();
|
|
|
|
|
|
|
|
|
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
|
|
|
|
wait_for_user = true;
|
|
|
|
|
while (wait_for_user) idle();
|
|
|
|
|
lcd_reset_status();
|
|
|
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef _TRIGGERED_WHEN_STOWED_TEST
|
|
|
|
|