From ffe47a0197c6ec8db932d25bf19e724f43235137 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 23 Apr 2023 03:17:55 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20PAUSE=5FPROBE=5FDEPLOY?=
=?UTF-8?q?=5FWHEN=5FTRIGGERED=20(#25681)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/feature/leds/pca9632.cpp | 2 +-
Marlin/src/feature/leds/pca9632.h | 2 +-
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp | 2 +-
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp | 2 +-
Marlin/src/lcd/marlinui.cpp | 2 +-
Marlin/src/lcd/marlinui.h | 2 +-
Marlin/src/libs/buzzer.h | 13 +++--
Marlin/src/module/probe.cpp | 54 ++++++++++++---------
Marlin/src/module/probe.h | 2 +-
9 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/Marlin/src/feature/leds/pca9632.cpp b/Marlin/src/feature/leds/pca9632.cpp
index abea9880045..07c379a8154 100644
--- a/Marlin/src/feature/leds/pca9632.cpp
+++ b/Marlin/src/feature/leds/pca9632.cpp
@@ -148,7 +148,7 @@ void PCA9632_set_led_color(const LEDColor &color) {
#if ENABLED(PCA9632_BUZZER)
- void PCA9632_buzz(const long, const uint16_t) {
+ void PCA9632_buzz(const long, const uint16_t=0) {
uint8_t data[] = PCA9632_BUZZER_DATA;
Wire.beginTransmission(I2C_ADDRESS(PCA9632_ADDRESS));
Wire.write(data, sizeof(data));
diff --git a/Marlin/src/feature/leds/pca9632.h b/Marlin/src/feature/leds/pca9632.h
index fb59a8c1847..adef0200afb 100644
--- a/Marlin/src/feature/leds/pca9632.h
+++ b/Marlin/src/feature/leds/pca9632.h
@@ -33,5 +33,5 @@ void PCA9632_set_led_color(const LEDColor &color);
#if ENABLED(PCA9632_BUZZER)
#include <stdint.h>
- void PCA9632_buzz(const long, const uint16_t);
+ void PCA9632_buzz(const long, const uint16_t=0);
#endif
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 9445198a22c..8817ad74ad5 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -125,7 +125,7 @@ static void createChar_P(const char c, const byte * const ptr) {
#if ENABLED(LCD_USE_I2C_BUZZER)
- void MarlinUI::buzz(const long duration, const uint16_t freq) {
+ void MarlinUI::buzz(const long duration, const uint16_t freq/*=0*/) {
if (sound_on) lcd.buzz(duration, freq);
}
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index e4f9e4eafc0..f87d76cef78 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -299,7 +299,7 @@ uint8_t MarlinUI::read_slow_buttons() {
}
// Duration in ms, freq in Hz
-void MarlinUI::buzz(const long duration, const uint16_t freq) {
+void MarlinUI::buzz(const long duration, const uint16_t freq/*=0*/) {
if (!PanelDetected) return;
if (!sound_on) return;
#if ENABLED(TFTGLCD_PANEL_SPI)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 045c4919d95..c9279cf9969 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -127,7 +127,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
#endif
#if ENABLED(PCA9632_BUZZER)
- void MarlinUI::buzz(const long duration, const uint16_t freq) {
+ void MarlinUI::buzz(const long duration, const uint16_t freq/*=0*/) {
if (sound_on) PCA9632_buzz(duration, freq);
}
#endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index eba7a6b2576..16fcf194eb9 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -228,7 +228,7 @@ public:
#endif
#if USE_MARLINUI_BUZZER
- static void buzz(const long duration, const uint16_t freq);
+ static void buzz(const long duration, const uint16_t freq=0);
#endif
static void chirp() {
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index cd8e17d0046..cd86e7e7ecf 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -115,21 +115,20 @@
extern Buzzer buzzer;
// Buzz directly via the BEEPER pin tone queue
- #define BUZZ(d,f) buzzer.tone(d, f)
+ #define BUZZ(V...) buzzer.tone(V)
#elif USE_MARLINUI_BUZZER
// Use MarlinUI for a buzzer on the LCD
- #include "../lcd/marlinui.h"
- #define BUZZ(d,f) ui.buzz(d,f)
+ #define BUZZ(V...) ui.buzz(V)
#else
// No buzz capability
- #define BUZZ(d,f) NOOP
+ #define BUZZ(...) NOOP
#endif
-#define ERR_BUZZ() BUZZ(400, 40);
-#define OKAY_BUZZ() do{ BUZZ(100, 659); BUZZ(10, 0); BUZZ(100, 698); }while(0)
-#define DONE_BUZZ(OK) do{ if (OK) OKAY_BUZZ(); else ERR_BUZZ(); }while(0)
+#define ERR_BUZZ() BUZZ(400, 40)
+#define OKAY_BUZZ() do{ BUZZ(100, 659); BUZZ(10); BUZZ(100, 698); }while(0)
+#define DONE_BUZZ(ok) do{ if (ok) OKAY_BUZZ(); else ERR_BUZZ(); }while(0)
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 075ffe38253..d4f25126b8c 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -361,25 +361,35 @@ void Probe::do_z_raise(const float z_raise) {
FORCE_INLINE void probe_specific_action(const bool deploy) {
#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
- do {
- #if ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED)
- if (deploy != PROBE_TRIGGERED()) break;
- #endif
- OKAY_BUZZ();
+ // Start preheating before waiting for user confirmation that the probe is ready.
+ TERN_(PREHEAT_BEFORE_PROBING, if (deploy) probe.preheat_for_probing(0, PROBING_BED_TEMP, true));
- FSTR_P const ds_str = deploy ? GET_TEXT_F(MSG_MANUAL_DEPLOY) : GET_TEXT_F(MSG_MANUAL_STOW);
- ui.return_to_status(); // To display the new status message
- ui.set_status(ds_str, 99);
- SERIAL_ECHOLNF(deploy ? GET_EN_TEXT_F(MSG_MANUAL_DEPLOY) : GET_EN_TEXT_F(MSG_MANUAL_STOW));
+ FSTR_P const ds_str = deploy ? GET_TEXT_F(MSG_MANUAL_DEPLOY) : GET_TEXT_F(MSG_MANUAL_STOW);
+ ui.return_to_status(); // To display the new status message
+ ui.set_status(ds_str, 99);
+ SERIAL_ECHOLNF(deploy ? GET_EN_TEXT_F(MSG_MANUAL_DEPLOY) : GET_EN_TEXT_F(MSG_MANUAL_STOW));
- TERN_(HOST_PROMPT_SUPPORT, hostui.continue_prompt(ds_str));
- TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(ds_str));
- TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, ds_str, FPSTR(CONTINUE_STR)));
- TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
- ui.reset_status();
+ OKAY_BUZZ();
- } while (ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED));
+ #if ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED)
+ // Wait for the probe to be attached or detached before asking for explicit user confirmation
+ // Allow the user to interrupt
+ {
+ KEEPALIVE_STATE(PAUSED_FOR_USER);
+ TERN_(HAS_RESUME_CONTINUE, wait_for_user = true);
+ while (deploy == PROBE_TRIGGERED() && TERN1(HAS_RESUME_CONTINUE, wait_for_user)) idle_no_sleep();
+ TERN_(HAS_RESUME_CONTINUE, wait_for_user = false);
+ OKAY_BUZZ();
+ }
+ #endif
+
+ TERN_(HOST_PROMPT_SUPPORT, hostui.continue_prompt(ds_str));
+ TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(ds_str));
+ TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, ds_str, FPSTR(CONTINUE_STR)));
+ TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
+
+ ui.reset_status();
#endif // PAUSE_BEFORE_DEPLOY_STOW
@@ -436,7 +446,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
* - If a preheat input is higher than the current target, raise the target temperature.
* - If a preheat input is higher than the current temperature, wait for stabilization.
*/
- void Probe::preheat_for_probing(const celsius_t hotend_temp, const celsius_t bed_temp) {
+ void Probe::preheat_for_probing(const celsius_t hotend_temp, const celsius_t bed_temp, const bool early/*=false*/) {
#if HAS_HOTEND && (PROBING_NOZZLE_TEMP || LEVELING_NOZZLE_TEMP)
#define WAIT_FOR_NOZZLE_HEAT
#endif
@@ -444,7 +454,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
#define WAIT_FOR_BED_HEAT
#endif
- LCD_MESSAGE(MSG_PREHEATING);
+ if (!early) LCD_MESSAGE(MSG_PREHEATING);
DEBUG_ECHOPGM("Preheating ");
@@ -454,14 +464,12 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
DEBUG_ECHOPGM("hotend (", hotendPreheat, ")");
thermalManager.setTargetHotend(hotendPreheat, 0);
}
- #elif ENABLED(WAIT_FOR_BED_HEAT)
- constexpr celsius_t hotendPreheat = 0;
#endif
#if ENABLED(WAIT_FOR_BED_HEAT)
const celsius_t bedPreheat = bed_temp > thermalManager.degTargetBed() ? bed_temp : 0;
if (bedPreheat) {
- if (hotendPreheat) DEBUG_ECHOPGM(" and ");
+ if (TERN0(WAIT_FOR_NOZZLE_HEAT, hotendPreheat)) DEBUG_ECHOPGM(" and ");
DEBUG_ECHOPGM("bed (", bedPreheat, ")");
thermalManager.setTargetBed(bedPreheat);
}
@@ -469,8 +477,10 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
DEBUG_EOL();
- TERN_(WAIT_FOR_NOZZLE_HEAT, if (hotend_temp > thermalManager.wholeDegHotend(0) + (TEMP_WINDOW)) thermalManager.wait_for_hotend(0));
- TERN_(WAIT_FOR_BED_HEAT, if (bed_temp > thermalManager.wholeDegBed() + (TEMP_BED_WINDOW)) thermalManager.wait_for_bed_heating());
+ if (!early) {
+ TERN_(WAIT_FOR_NOZZLE_HEAT, if (hotend_temp > thermalManager.wholeDegHotend(0) + (TEMP_WINDOW)) thermalManager.wait_for_hotend(0));
+ TERN_(WAIT_FOR_BED_HEAT, if (bed_temp > thermalManager.wholeDegBed() + (TEMP_BED_WINDOW)) thermalManager.wait_for_bed_heating());
+ }
}
#endif
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 7a95a17bda4..5b1f7149f24 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -87,7 +87,7 @@ public:
static xyz_pos_t offset;
#if EITHER(PREHEAT_BEFORE_PROBING, PREHEAT_BEFORE_LEVELING)
- static void preheat_for_probing(const celsius_t hotend_temp, const celsius_t bed_temp);
+ static void preheat_for_probing(const celsius_t hotend_temp, const celsius_t bed_temp, const bool early=false);
#endif
static void probe_error_stop();