|
@@ -313,7 +313,7 @@ void MarlinUI::init_lcd() {
|
313
|
313
|
t = 0;
|
314
|
314
|
#if ENABLED(TFTGLCD_PANEL_SPI)
|
315
|
315
|
// SPI speed must be less 10MHz
|
316
|
|
- _SET_OUTPUT(TFTGLCD_CS);
|
|
316
|
+ SET_OUTPUT(TFTGLCD_CS);
|
317
|
317
|
WRITE(TFTGLCD_CS, HIGH);
|
318
|
318
|
spiInit(TERN(__STM32F1__, SPI_QUARTER_SPEED, SPI_FULL_SPEED));
|
319
|
319
|
WRITE(TFTGLCD_CS, LOW);
|
|
@@ -855,13 +855,14 @@ void MarlinUI::draw_status_screen() {
|
855
|
855
|
void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) {
|
856
|
856
|
if (!PanelDetected) return;
|
857
|
857
|
ui.encoder_direction_normal();
|
858
|
|
- lcd.setCursor(0, MIDDLE_Y);
|
|
858
|
+ const uint8_t y = TERN0(AUTO_BED_LEVELING_UBL, ui.external_control) ? LCD_HEIGHT - 1 : MIDDLE_Y;
|
|
859
|
+ lcd.setCursor(0, y);
|
859
|
860
|
lcd.write(COLOR_EDIT);
|
860
|
861
|
lcd_put_u8str_P(pstr);
|
861
|
862
|
if (value) {
|
862
|
863
|
lcd.write(':');
|
863
|
|
- lcd.setCursor((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), MIDDLE_Y); // Right-justified, padded by spaces
|
864
|
|
- lcd.write(' '); // Overwrite char if value gets shorter
|
|
864
|
+ lcd.setCursor((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), y); // Right-justified, padded by spaces
|
|
865
|
+ lcd.write(' '); // Overwrite char if value gets shorter
|
865
|
866
|
lcd.print(value);
|
866
|
867
|
lcd.write(' ');
|
867
|
868
|
lcd.print_line();
|