From e9ea82e78d0c95ef1cee599093b4c91a6f97d709 Mon Sep 17 00:00:00 2001 From: stream2me <32234535+stream2me@users.noreply.github.com> Date: Sun, 10 Apr 2022 02:46:29 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Prefer=20os.replace,=20fix=20TFT?= =?UTF-8?q?=5FLVGL=5FUI=20build=20(#24001)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp | 2 +- buildroot/share/PlatformIO/scripts/offset_and_rename.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp index aee5573283..c047e322d6 100644 --- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp +++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp @@ -74,7 +74,7 @@ void lv_draw_level_settings() { #if HAS_BED_PROBE lv_screen_menu_item(scr, machine_menu.LevelingAutoZoffsetConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_LEVEL_ZOFFSET, 2); #if ENABLED(PROBE_OFFSET_WIZARD) - lv_screen_menu_item(scr, machine_menu.LevelingZoffsetWizard, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3); + lv_screen_menu_item(scr, machine_menu.LevelingZoffsetTitle, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3); #endif #endif lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_LEVEL_RETURN, true); diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py index 581a06e91e..ddbb786fec 100644 --- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py +++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py @@ -57,6 +57,6 @@ if pioutil.is_pio_build(): def rename_target(source, target, env): firmware = os.path.join(target[0].dir.path, board.get("build.rename")) - os.rename(target[0].path, firmware) + os.replace(target[0].path, firmware) marlin.add_post_action(rename_target)