zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
stream2me 2022-04-10 02:46:29 +02:00 committed by Scott Lahteine
parent 18b17fc97d
commit e9ea82e78d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
View file

@ -74,7 +74,7 @@ void lv_draw_level_settings() {
#if HAS_BED_PROBE #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); 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) #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
#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); 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);

2
buildroot/share/PlatformIO/scripts/offset_and_rename.py
View file

@ -57,6 +57,6 @@ if pioutil.is_pio_build():
def rename_target(source, target, env): def rename_target(source, target, env):
firmware = os.path.join(target[0].dir.path, board.get("build.rename")) 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) marlin.add_post_action(rename_target)