|
@@ -298,12 +298,12 @@ static void lcd_implementation_init()
|
298
|
298
|
#endif
|
299
|
299
|
|
300
|
300
|
#elif defined(LCD_I2C_TYPE_MCP23017)
|
301
|
|
- lcd.setMCPType(LTI_TYPE_MCP23017);
|
|
301
|
+ lcd.setMCPType(LTI_TYPE_MCP23017);
|
302
|
302
|
lcd.begin(LCD_WIDTH, LCD_HEIGHT);
|
303
|
303
|
lcd.setBacklight(0); //set all the LEDs off to begin with
|
304
|
304
|
|
305
|
305
|
#elif defined(LCD_I2C_TYPE_MCP23008)
|
306
|
|
- lcd.setMCPType(LTI_TYPE_MCP23008);
|
|
306
|
+ lcd.setMCPType(LTI_TYPE_MCP23008);
|
307
|
307
|
lcd.begin(LCD_WIDTH, LCD_HEIGHT);
|
308
|
308
|
|
309
|
309
|
#else
|
|
@@ -497,9 +497,9 @@ static void lcd_implementation_drawmenu_generic(uint8_t row, const char* pstr, c
|
497
|
497
|
char c;
|
498
|
498
|
//Use all characters in narrow LCDs
|
499
|
499
|
#if LCD_WIDTH < 20
|
500
|
|
- uint8_t n = LCD_WIDTH - 1 - 1;
|
|
500
|
+ uint8_t n = LCD_WIDTH - 1 - 1;
|
501
|
501
|
#else
|
502
|
|
- uint8_t n = LCD_WIDTH - 1 - 2;
|
|
502
|
+ uint8_t n = LCD_WIDTH - 1 - 2;
|
503
|
503
|
#endif
|
504
|
504
|
lcd.setCursor(0, row);
|
505
|
505
|
lcd.print(pre_char);
|
|
@@ -519,9 +519,9 @@ static void lcd_implementation_drawmenu_setting_edit_generic(uint8_t row, const
|
519
|
519
|
char c;
|
520
|
520
|
//Use all characters in narrow LCDs
|
521
|
521
|
#if LCD_WIDTH < 20
|
522
|
|
- uint8_t n = LCD_WIDTH - 1 - 1 - strlen(data);
|
|
522
|
+ uint8_t n = LCD_WIDTH - 1 - 1 - strlen(data);
|
523
|
523
|
#else
|
524
|
|
- uint8_t n = LCD_WIDTH - 1 - 2 - strlen(data);
|
|
524
|
+ uint8_t n = LCD_WIDTH - 1 - 2 - strlen(data);
|
525
|
525
|
#endif
|
526
|
526
|
lcd.setCursor(0, row);
|
527
|
527
|
lcd.print(pre_char);
|
|
@@ -541,9 +541,9 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(uint8_t row, cons
|
541
|
541
|
char c;
|
542
|
542
|
//Use all characters in narrow LCDs
|
543
|
543
|
#if LCD_WIDTH < 20
|
544
|
|
- uint8_t n = LCD_WIDTH - 1 - 1 - strlen_P(data);
|
|
544
|
+ uint8_t n = LCD_WIDTH - 1 - 1 - strlen_P(data);
|
545
|
545
|
#else
|
546
|
|
- uint8_t n = LCD_WIDTH - 1 - 2 - strlen_P(data);
|
|
546
|
+ uint8_t n = LCD_WIDTH - 1 - 2 - strlen_P(data);
|
547
|
547
|
#endif
|
548
|
548
|
lcd.setCursor(0, row);
|
549
|
549
|
lcd.print(pre_char);
|
|
@@ -600,9 +600,9 @@ void lcd_implementation_drawedit(const char* pstr, char* value)
|
600
|
600
|
lcd_printPGM(pstr);
|
601
|
601
|
lcd.print(':');
|
602
|
602
|
#if LCD_WIDTH < 20
|
603
|
|
- lcd.setCursor(LCD_WIDTH - strlen(value), 1);
|
|
603
|
+ lcd.setCursor(LCD_WIDTH - strlen(value), 1);
|
604
|
604
|
#else
|
605
|
|
- lcd.setCursor(LCD_WIDTH -1 - strlen(value), 1);
|
|
605
|
+ lcd.setCursor(LCD_WIDTH -1 - strlen(value), 1);
|
606
|
606
|
#endif
|
607
|
607
|
lcd.print(value);
|
608
|
608
|
}
|
|
@@ -720,11 +720,11 @@ static void lcd_implementation_update_indicators()
|
720
|
720
|
//set the LEDS - referred to as backlights by the LiquidTWI2 library
|
721
|
721
|
static uint8_t ledsprev = 0;
|
722
|
722
|
uint8_t leds = 0;
|
723
|
|
- if (isHeatingBed()) leds |= LED_A;
|
724
|
|
- if (isHeatingHotend(0)) leds |= LED_B;
|
|
723
|
+ if (target_temperature_bed > 0) leds |= LED_A;
|
|
724
|
+ if (target_temperature[0] > 0) leds |= LED_B;
|
725
|
725
|
if (fanSpeed) leds |= LED_C;
|
726
|
726
|
#if EXTRUDERS > 1
|
727
|
|
- if (isHeatingHotend(1)) leds |= LED_C;
|
|
727
|
+ if (target_temperature[1] > 0) leds |= LED_C;
|
728
|
728
|
#endif
|
729
|
729
|
if (leds != ledsprev) {
|
730
|
730
|
lcd.setBacklight(leds);
|