From ada935de87da0ddde7cdbb6db1a0d65cec6e19c6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sat, 22 Oct 2016 20:07:48 -0500
Subject: [PATCH] Allow TEMP_STAT_LEDS with only one LED defined
---
Marlin/Marlin_main.cpp | 10 ++++++++--
Marlin/SanityCheck.h | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index b99ae27df4..7f5bc996b3 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -9244,8 +9244,14 @@ void prepare_move_to_destination() {
bool new_led = (max_temp > 55.0) ? true : (max_temp < 54.0) ? false : red_led;
if (new_led != red_led) {
red_led = new_led;
- WRITE(STAT_LED_RED_PIN, new_led ? HIGH : LOW);
- WRITE(STAT_LED_BLUE_PIN, new_led ? LOW : HIGH);
+ #if PIN_EXISTS(STAT_LED_RED)
+ WRITE(STAT_LED_RED_PIN, new_led ? HIGH : LOW);
+ #if PIN_EXISTS(STAT_LED_BLUE)
+ WRITE(STAT_LED_BLUE_PIN, new_led ? LOW : HIGH);
+ #endif
+ #else
+ WRITE(STAT_LED_BLUE_PIN, new_led ? HIGH : LOW);
+ #endif
}
}
}
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index cb3c8599a1..63a3789f25 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -770,8 +770,8 @@
/**
* Temperature status LEDs
*/
-#if ENABLED(TEMP_STAT_LEDS) && !(PIN_EXISTS(STAT_LED_RED) && PIN_EXISTS(STAT_LED_BLUE))
- #error "TEMP_STAT_LEDS requires STAT_LED_RED_PIN and STAT_LED_BLUE_PIN."
+#if ENABLED(TEMP_STAT_LEDS) && !PIN_EXISTS(STAT_LED_RED) && !PIN_EXISTS(STAT_LED_BLUE)
+ #error "TEMP_STAT_LEDS requires STAT_LED_RED_PIN or STAT_LED_BLUE_PIN, preferably both."
#endif
/**
@@ -942,7 +942,7 @@
#else
#define COUNT_LCD_13 COUNT_LCD_12
#endif
-#if ENABLED(REPRAPWORLD_KEYPAD)
+#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI)
#define COUNT_LCD_14 INCREMENT(COUNT_LCD_13)
#else
#define COUNT_LCD_14 COUNT_LCD_13
--
GitLab