MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Allow TEMP_STAT_LEDS with only one LED defined

Browse Source
This commit is contained in:
Scott Lahteine 2016-10-22 20:07:48 -05:00
parent 4b056d8184
commit ada935de87
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -9244,8 +9244,14 @@ void prepare_move_to_destination() {
bool new_led = (max_temp > 55.0) ? true : (max_temp < 54.0) ? false : red_led; bool new_led = (max_temp > 55.0) ? true : (max_temp < 54.0) ? false : red_led;
if (new_led != red_led) { if (new_led != red_led) {
red_led = new_led; red_led = new_led;
WRITE(STAT_LED_RED_PIN, new_led ? HIGH : LOW); #if PIN_EXISTS(STAT_LED_RED)
WRITE(STAT_LED_BLUE_PIN, new_led ? LOW : HIGH); 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
} }
} }
} }

6
Marlin/SanityCheck.h
View File

@ -770,8 +770,8 @@
/** /**
* Temperature status LEDs * Temperature status LEDs
*/ */
#if ENABLED(TEMP_STAT_LEDS) && !(PIN_EXISTS(STAT_LED_RED) && PIN_EXISTS(STAT_LED_BLUE)) #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." #error "TEMP_STAT_LEDS requires STAT_LED_RED_PIN or STAT_LED_BLUE_PIN, preferably both."
#endif #endif
/** /**
@ -942,7 +942,7 @@
#else #else
#define COUNT_LCD_13 COUNT_LCD_12 #define COUNT_LCD_13 COUNT_LCD_12
#endif #endif
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI)
#define COUNT_LCD_14 INCREMENT(COUNT_LCD_13) #define COUNT_LCD_14 INCREMENT(COUNT_LCD_13)
#else #else
#define COUNT_LCD_14 COUNT_LCD_13 #define COUNT_LCD_14 COUNT_LCD_13