From d8c3aed0383202341a29e65fa556a55c5af47185 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 19 Jun 2020 14:01:15 -0500 Subject: [PATCH] Sanity-check the chamber thermistor pin --- Marlin/src/inc/Conditionals_post.h | 8 ++++---- Marlin/src/inc/SanityCheck.h | 6 +++++- Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 8 ++++++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 228b21516..b98f16f34 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -1692,16 +1692,16 @@ #if ENABLED(JOYSTICK) #if PIN_EXISTS(JOY_X) #define HAS_JOY_ADC_X 1 -#endif + #endif #if PIN_EXISTS(JOY_Y) #define HAS_JOY_ADC_Y 1 -#endif + #endif #if PIN_EXISTS(JOY_Z) #define HAS_JOY_ADC_Z 1 -#endif + #endif #if PIN_EXISTS(JOY_EN) #define HAS_JOY_ADC_EN 1 -#endif + #endif #endif // Heaters diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 605a4afb6..a9febd968 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1770,9 +1770,13 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal #error "TEMP_SENSOR_7 shouldn't be set with only 1 HOTEND." #endif +#if TEMP_SENSOR_CHAMBER && !PIN_EXISTS(TEMP_CHAMBER) + #error "TEMP_SENSOR_CHAMBER requires TEMP_CHAMBER_PIN. Please add it to your configuration." +#endif + #if TEMP_SENSOR_PROBE #if !PIN_EXISTS(TEMP_PROBE) - #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN." + #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN. Please add it to your configuration." #elif !HAS_TEMP_ADC_PROBE #error "TEMP_PROBE_PIN must be an ADC pin." #elif !ENABLED(FIX_MOUNTED_PROBE) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h index 2ca8f86f1..6502edd49 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h @@ -59,8 +59,12 @@ #define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN #endif -#if HOTENDS == 1 && TEMP_SENSOR_PROBE - #define TEMP_PROBE_PIN TEMP_1_PIN +#if HOTENDS == 1 + #if TEMP_SENSOR_PROBE + #define TEMP_PROBE_PIN TEMP_1_PIN + #elif TEMP_SENSOR_CHAMBER + #define TEMP_CHAMBER_PIN TEMP_1_PIN + #endif #endif //