3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-03-28 08:59:06 +00:00
Code Issues Releases Wiki Activity

fix for TFT_CLASSIC_UI

Browse source
This commit is contained in:
ellensp 2024-07-17 03:45:06 +12:00
parent 7f86ebea6b
commit b6a2a3eead
2 changed files with 5 additions and 5 deletions

5
Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp
View file

@ -517,11 +517,6 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
FSTR_P str = nullptr; FSTR_P str = nullptr;
if (stage < CALIBRATION_SUCCESS) { if (stage < CALIBRATION_SUCCESS) {
tft_string.set(GET_TEXT(MSG_TOUCH_CALIBRATION));
tft.canvas(0, 0, TFT_WIDTH, tft_string.font_height());
tft.set_background(COLOR_BACKGROUND);
tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
// handle current state // handle current state
switch (stage) { switch (stage) {
case CALIBRATION_TOP_LEFT: str = GET_TEXT_F(MSG_TOP_LEFT); break; case CALIBRATION_TOP_LEFT: str = GET_TEXT_F(MSG_TOP_LEFT); break;

5
Marlin/src/lcd/tft/ui_common.cpp
View file

@ -456,6 +456,11 @@ void MarlinUI::clear_for_drawing() { clear_lcd(); }
touch.clear(); touch.clear();
if (stage < CALIBRATION_SUCCESS) { if (stage < CALIBRATION_SUCCESS) {
tft_string.set(GET_TEXT(MSG_TOUCH_CALIBRATION));
tft.canvas(0, 0, TFT_WIDTH, tft_string.font_height());
tft.set_background(COLOR_BACKGROUND);
tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
switch (stage) { switch (stage) {
case CALIBRATION_TOP_LEFT: tft_string.set(GET_TEXT(MSG_TOP_LEFT)); break; case CALIBRATION_TOP_LEFT: tft_string.set(GET_TEXT(MSG_TOP_LEFT)); break;
case CALIBRATION_TOP_RIGHT: tft_string.set(GET_TEXT(MSG_TOP_RIGHT)); break; case CALIBRATION_TOP_RIGHT: tft_string.set(GET_TEXT(MSG_TOP_RIGHT)); break;