From a6ff63d5060c0ef68c2ae9f6ccf3bcada2ec6b6e Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 12 May 2022 22:41:38 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20warnings=20/=20extr?=
=?UTF-8?q?a=20check=20(#24163)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/gcode/calibrate/G76_M871.cpp | 10 +++++-----
Marlin/src/inc/SanityCheck.h | 10 ----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index ad13b20306a..c484d4f1b77 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -82,13 +82,13 @@
* - `P` - Run probe temperature calibration.
*/
-static void say_waiting_for() { SERIAL_ECHOPGM("Waiting for "); }
-static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
-static void say_successfully_calibrated() { SERIAL_ECHOPGM("Successfully calibrated"); }
-static void say_failed_to_calibrate() { SERIAL_ECHOPGM("!Failed to calibrate"); }
-
#if BOTH(PTC_PROBE, PTC_BED)
+ static void say_waiting_for() { SERIAL_ECHOPGM("Waiting for "); }
+ static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
+ static void say_successfully_calibrated() { SERIAL_ECHOPGM("Successfully calibrated"); }
+ static void say_failed_to_calibrate() { SERIAL_ECHOPGM("!Failed to calibrate"); }
+
void GcodeSuite::G76() {
auto report_temps = [](millis_t &ntr, millis_t timeout=0) {
idle_no_sleep();
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9e307e9444e..1179da2355a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2288,16 +2288,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif
#endif
-#if TEMP_SENSOR_PROBE
- #if !PIN_EXISTS(TEMP_PROBE)
- #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
- #elif !HAS_TEMP_ADC_PROBE
- #error "TEMP_PROBE_PIN must be an ADC pin."
- #elif DISABLED(FIX_MOUNTED_PROBE)
- #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
- #endif
-#endif
-
#if TEMP_SENSOR_BOARD
#if !PIN_EXISTS(TEMP_BOARD)
#error "TEMP_SENSOR_BOARD requires TEMP_BOARD_PIN."