Formatting and lcd contrast masking
This commit is contained in:
parent
eb6e3886f4
commit
43773ff735
2 changed files with 55 additions and 54 deletions
|
@ -198,16 +198,16 @@ static void lcd_implementation_init()
|
||||||
u8g.setContrast(lcd_contrast);
|
u8g.setContrast(lcd_contrast);
|
||||||
// FIXME: remove this workaround
|
// FIXME: remove this workaround
|
||||||
// Uncomment this if you have the first generation (V1.10) of STBs board
|
// Uncomment this if you have the first generation (V1.10) of STBs board
|
||||||
// pinMode(17, OUTPUT); // Enable LCD backlight
|
// pinMode(17, OUTPUT); // Enable LCD backlight
|
||||||
// digitalWrite(17, HIGH);
|
// digitalWrite(17, HIGH);
|
||||||
|
|
||||||
#ifdef LCD_SCREEN_ROT_90
|
#ifdef LCD_SCREEN_ROT_90
|
||||||
u8g.setRot90(); // Rotate screen by 90°
|
u8g.setRot90(); // Rotate screen by 90°
|
||||||
#elif defined(LCD_SCREEN_ROT_180)
|
#elif defined(LCD_SCREEN_ROT_180)
|
||||||
u8g.setRot180(); // Rotate screen by 180°
|
u8g.setRot180(); // Rotate screen by 180°
|
||||||
#elif defined(LCD_SCREEN_ROT_270)
|
#elif defined(LCD_SCREEN_ROT_270)
|
||||||
u8g.setRot270(); // Rotate screen by 270°
|
u8g.setRot270(); // Rotate screen by 270°
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Show splashscreen
|
// Show splashscreen
|
||||||
int offx = (u8g.getWidth() - START_BMPWIDTH) / 2;
|
int offx = (u8g.getWidth() - START_BMPWIDTH) / 2;
|
||||||
|
@ -220,7 +220,7 @@ static void lcd_implementation_init()
|
||||||
int txt1X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE1) - 1)*DOG_CHAR_WIDTH) / 2;
|
int txt1X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE1) - 1)*DOG_CHAR_WIDTH) / 2;
|
||||||
|
|
||||||
u8g.firstPage();
|
u8g.firstPage();
|
||||||
do {
|
do {
|
||||||
if (show_splashscreen) {
|
if (show_splashscreen) {
|
||||||
u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
|
u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
|
||||||
lcd_setFont(FONT_MENU);
|
lcd_setFont(FONT_MENU);
|
||||||
|
@ -232,7 +232,7 @@ static void lcd_implementation_init()
|
||||||
u8g.drawStr(txt2X, u8g.getHeight() - DOG_CHAR_HEIGHT*1/2, STRING_SPLASH_LINE2);
|
u8g.drawStr(txt2X, u8g.getHeight() - DOG_CHAR_HEIGHT*1/2, STRING_SPLASH_LINE2);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
} while (u8g.nextPage());
|
} while (u8g.nextPage());
|
||||||
show_splashscreen = false;
|
show_splashscreen = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -308,7 +308,6 @@ static void lcd_implementation_status_screen() {
|
||||||
#if HAS_FAN
|
#if HAS_FAN
|
||||||
int per = ((fanSpeed + 1) * 100) / 256;
|
int per = ((fanSpeed + 1) * 100) / 256;
|
||||||
if (per) {
|
if (per) {
|
||||||
|
|
||||||
lcd_print(itostr3(per));
|
lcd_print(itostr3(per));
|
||||||
lcd_print('%');
|
lcd_print('%');
|
||||||
}
|
}
|
||||||
|
|
|
@ -422,7 +422,7 @@ static void lcd_main_menu() {
|
||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
|
#if defined(SDSUPPORT) && defined(MENU_ADDAUTOSTART)
|
||||||
static void lcd_autostart_sd() {
|
static void lcd_autostart_sd() {
|
||||||
card.autostart_index = 0;
|
card.autostart_index = 0;
|
||||||
card.setroot();
|
card.setroot();
|
||||||
|
@ -431,7 +431,7 @@ static void lcd_main_menu() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void lcd_set_home_offsets() {
|
void lcd_set_home_offsets() {
|
||||||
for(int8_t i=0; i < NUM_AXIS; i++) {
|
for (int8_t i=0; i < NUM_AXIS; i++) {
|
||||||
if (i != E_AXIS) {
|
if (i != E_AXIS) {
|
||||||
home_offset[i] -= current_position[i];
|
home_offset[i] -= current_position[i];
|
||||||
current_position[i] = 0.0;
|
current_position[i] = 0.0;
|
||||||
|
@ -965,48 +965,49 @@ static void lcd_control_volumetric_menu() {
|
||||||
|
|
||||||
#ifdef DOGLCD
|
#ifdef DOGLCD
|
||||||
|
|
||||||
static void lcd_set_contrast() {
|
static void lcd_set_contrast() {
|
||||||
if (encoderPosition != 0) {
|
if (encoderPosition != 0) {
|
||||||
lcd_contrast -= encoderPosition;
|
lcd_contrast -= encoderPosition;
|
||||||
if (lcd_contrast < 0) lcd_contrast = 0;
|
lcd_contrast &= 0x3F;
|
||||||
else if (lcd_contrast > 63) lcd_contrast = 63;
|
encoderPosition = 0;
|
||||||
encoderPosition = 0;
|
lcdDrawUpdate = 1;
|
||||||
lcdDrawUpdate = 1;
|
u8g.setContrast(lcd_contrast);
|
||||||
u8g.setContrast(lcd_contrast);
|
}
|
||||||
|
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));
|
||||||
|
if (LCD_CLICKED) lcd_goto_menu(lcd_control_menu);
|
||||||
}
|
}
|
||||||
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));
|
|
||||||
if (LCD_CLICKED) lcd_goto_menu(lcd_control_menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif //DOGLCD
|
#endif // DOGLCD
|
||||||
|
|
||||||
#ifdef FWRETRACT
|
#ifdef FWRETRACT
|
||||||
|
|
||||||
static void lcd_control_retract_menu() {
|
static void lcd_control_retract_menu() {
|
||||||
START_MENU();
|
START_MENU();
|
||||||
MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
|
MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
|
||||||
MENU_ITEM_EDIT(bool, MSG_AUTORETRACT, &autoretract_enabled);
|
MENU_ITEM_EDIT(bool, MSG_AUTORETRACT, &autoretract_enabled);
|
||||||
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT, &retract_length, 0, 100);
|
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT, &retract_length, 0, 100);
|
||||||
#if EXTRUDERS > 1
|
#if EXTRUDERS > 1
|
||||||
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
|
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
|
||||||
#endif
|
#endif
|
||||||
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate, 1, 999);
|
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate, 1, 999);
|
||||||
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
|
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
|
||||||
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100);
|
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100);
|
||||||
#if EXTRUDERS > 1
|
#if EXTRUDERS > 1
|
||||||
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, 0, 100);
|
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, 0, 100);
|
||||||
#endif
|
#endif
|
||||||
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &retract_recover_feedrate, 1, 999);
|
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &retract_recover_feedrate, 1, 999);
|
||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //FWRETRACT
|
#endif // FWRETRACT
|
||||||
|
|
||||||
#if SDCARDDETECT == -1
|
#if SDCARDDETECT == -1
|
||||||
|
|
||||||
static void lcd_sd_refresh() {
|
static void lcd_sd_refresh() {
|
||||||
card.initsd();
|
card.initsd();
|
||||||
currentMenuViewOffset = 0;
|
currentMenuViewOffset = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void lcd_sd_updir() {
|
static void lcd_sd_updir() {
|
||||||
|
@ -1029,13 +1030,14 @@ void lcd_sdcard_menu() {
|
||||||
MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
|
MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(uint16_t i = 0; i < fileCnt; i++) {
|
for (uint16_t i = 0; i < fileCnt; i++) {
|
||||||
if (_menuItemNr == _lineNr) {
|
if (_menuItemNr == _lineNr) {
|
||||||
#ifndef SDCARD_RATHERRECENTFIRST
|
card.getfilename(
|
||||||
card.getfilename(i);
|
#ifdef SDCARD_RATHERRECENTFIRST
|
||||||
#else
|
fileCnt-1 -
|
||||||
card.getfilename(fileCnt-1-i);
|
#endif
|
||||||
#endif
|
i
|
||||||
|
);
|
||||||
if (card.filenameIsDir)
|
if (card.filenameIsDir)
|
||||||
MENU_ITEM(sddirectory, MSG_CARD_MENU, card.filename, card.longFilename);
|
MENU_ITEM(sddirectory, MSG_CARD_MENU, card.filename, card.longFilename);
|
||||||
else
|
else
|
||||||
|
@ -1456,7 +1458,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
||||||
|
|
||||||
#ifdef DOGLCD
|
#ifdef DOGLCD
|
||||||
void lcd_setcontrast(uint8_t value) {
|
void lcd_setcontrast(uint8_t value) {
|
||||||
lcd_contrast = value & 63;
|
lcd_contrast = value & 0x3F;
|
||||||
u8g.setContrast(lcd_contrast);
|
u8g.setContrast(lcd_contrast);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Reference in a new issue