From 28548efa751db0937997e2416856d501d92e57f0 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue, 18 Mar 2025 06:54:21 +1300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20TFT=20touch=20calibrat?= =?UTF-8?q?e=20(#26200)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp | 1 + Marlin/src/lcd/language/language_en.h | 9 +++++---- Marlin/src/lcd/tft/ui_common.cpp | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp index 73b35b0ec2..e458c8e4c4 100644 --- a/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp +++ b/Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp @@ -542,6 +542,7 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT, tftio.set_window(TFT_PIXEL_OFFSET_X, TFT_PIXEL_OFFSET_Y, X_HI, Y_HI); do { set_font(FONT_MENU); + lcd_put_u8str(0, 7, GET_TEXT_F(MSG_TOUCH_CALIBRATION)); lcd_put_u8str(0, LCD_PIXEL_HEIGHT / 2, str); } while (u8g.nextPage()); drawing_screen = false; diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 307ff2590e..b033dc3c74 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -924,10 +924,11 @@ namespace LanguageNarrow_en { LSTR MSG_SOUND = _UxGT("Sound"); - LSTR MSG_TOP_LEFT = _UxGT("Top Left"); - LSTR MSG_BOTTOM_LEFT = _UxGT("Bottom Left"); - LSTR MSG_TOP_RIGHT = _UxGT("Top Right"); - LSTR MSG_BOTTOM_RIGHT = _UxGT("Bottom Right"); + LSTR MSG_TOP_LEFT = _UxGT("Touch Top Left"); + LSTR MSG_BOTTOM_LEFT = _UxGT("Touch Bottom Left"); + LSTR MSG_TOP_RIGHT = _UxGT("Touch Top Right"); + LSTR MSG_BOTTOM_RIGHT = _UxGT("Touch Bottom Right"); + LSTR MSG_TOUCH_CALIBRATION = _UxGT("Touch Calibration"); LSTR MSG_CALIBRATION_COMPLETED = _UxGT("Calibration Completed"); LSTR MSG_CALIBRATION_FAILED = _UxGT("Calibration Failed"); diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp index e71a74247b..6d59e0ce8b 100644 --- a/Marlin/src/lcd/tft/ui_common.cpp +++ b/Marlin/src/lcd/tft/ui_common.cpp @@ -487,6 +487,11 @@ void MarlinUI::clear_for_drawing() { clear_lcd(); } touch.clear(); 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) { 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;