Przeglądaj źródła

🐛 Prefer os.replace, fix TFT_LVGL_UI build (#24001)

stream2me 2 lat temu
rodzic
commit
46e282bd6d
No account linked to committer's email address

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp Wyświetl plik

@@ -74,7 +74,7 @@ void lv_draw_level_settings() {
74 74
   #if HAS_BED_PROBE
75 75
     lv_screen_menu_item(scr, machine_menu.LevelingAutoZoffsetConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_LEVEL_ZOFFSET, 2);
76 76
     #if ENABLED(PROBE_OFFSET_WIZARD)
77
-      lv_screen_menu_item(scr, machine_menu.LevelingZoffsetWizard, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3);
77
+      lv_screen_menu_item(scr, machine_menu.LevelingZoffsetTitle, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3);
78 78
     #endif
79 79
   #endif
80 80
   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);

+ 1
- 1
buildroot/share/PlatformIO/scripts/offset_and_rename.py Wyświetl plik

@@ -57,6 +57,6 @@ if pioutil.is_pio_build():
57 57
 
58 58
 		def rename_target(source, target, env):
59 59
 			firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
60
-			os.rename(target[0].path, firmware)
60
+			os.replace(target[0].path, firmware)
61 61
 
62 62
 		marlin.add_post_action(rename_target)

Ładowanie…
Anuluj
Zapisz