SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Patch tabs, heater led tests

Browse source
This commit is contained in:
Scott Lahteine 2019-11-06 16:28:36 -06:00
parent a89f4703df
commit e6dfc991ae
3 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View file

@ -1066,9 +1066,13 @@ void MarlinUI::draw_status_screen() {
static uint8_t ledsprev = 0; static uint8_t ledsprev = 0;
uint8_t leds = 0; uint8_t leds = 0;
#if HAS_HEATED_BED
if (thermalManager.degTargetBed() > 0) leds |= LED_A; if (thermalManager.degTargetBed() > 0) leds |= LED_A;
#endif
#if HOTENDS
if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B; if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B;
#endif
#if FAN_COUNT > 0 #if FAN_COUNT > 0
if (0 if (0

8
Marlin/src/lcd/ultralcd.cpp
View file

@ -1233,11 +1233,11 @@ void MarlinUI::update() {
#endif // UP || DWN || LFT || RT #endif // UP || DWN || LFT || RT
buttons = newbutton buttons = (newbutton
#if HAS_SLOW_BUTTONS #if HAS_SLOW_BUTTONS
| slow_buttons | slow_buttons
#endif #endif
; );
#elif HAS_ADC_BUTTONS #elif HAS_ADC_BUTTONS
@ -1254,13 +1254,13 @@ void MarlinUI::update() {
#if HAS_SHIFT_ENCODER #if HAS_SHIFT_ENCODER
GET_SHIFT_BUTTON_STATES( GET_SHIFT_BUTTON_STATES((
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
keypad_buttons keypad_buttons
#else #else
buttons buttons
#endif #endif
); ));
#endif #endif