zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Formatting and lcd contrast masking

Browse source
This commit is contained in:
Scott Lahteine 2015-04-07 21:11:03 -07:00
parent eb6e3886f4
commit 43773ff735
2 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/dogm_lcd_implementation.h
View file

@ -308,7 +308,6 @@ static void lcd_implementation_status_screen() {
#if HAS_FAN
int per = ((fanSpeed + 1) * 100) / 256;
if (per) {
lcd_print(itostr3(per));
lcd_print('%');
}

16
Marlin/ultralcd.cpp
View file

@ -968,8 +968,7 @@ static void lcd_control_volumetric_menu() {
static void lcd_set_contrast() {
if (encoderPosition != 0) {
lcd_contrast -= encoderPosition;
if (lcd_contrast < 0) lcd_contrast = 0;
else if (lcd_contrast > 63) lcd_contrast = 63;
lcd_contrast &= 0x3F;
encoderPosition = 0;
lcdDrawUpdate = 1;
u8g.setContrast(lcd_contrast);
@ -1003,10 +1002,12 @@ static void lcd_control_retract_menu() {
#endif // FWRETRACT
#if SDCARDDETECT == -1
static void lcd_sd_refresh() {
card.initsd();
currentMenuViewOffset = 0;
}
#endif
static void lcd_sd_updir() {
@ -1031,11 +1032,12 @@ void lcd_sdcard_menu() {
for (uint16_t i = 0; i < fileCnt; i++) {
if (_menuItemNr == _lineNr) {
#ifndef SDCARD_RATHERRECENTFIRST
card.getfilename(i);
#else
card.getfilename(fileCnt-1-i);
card.getfilename(
#ifdef SDCARD_RATHERRECENTFIRST
fileCnt-1 -
#endif
i
);
if (card.filenameIsDir)
MENU_ITEM(sddirectory, MSG_CARD_MENU, card.filename, card.longFilename);
else
@ -1456,7 +1458,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#ifdef DOGLCD
void lcd_setcontrast(uint8_t value) {
lcd_contrast = value & 63;
lcd_contrast = value & 0x3F;
u8g.setContrast(lcd_contrast);
}
#endif