From aa1b435da5058673d72798d204bcb879df735247 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Wed, 17 Apr 2024 19:58:40 +0200 Subject: [PATCH] feat: implement build + flash process Signed-off-by: Dominik Willner --- .../components/klipper_firmware/menus/klipper_flash_menu.py | 4 +--- kiauh/core/menus/advanced_menu.py | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py index 9c2394f..455732e 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py +++ b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py @@ -432,12 +432,10 @@ class KlipperFlashOverviewMenu(BaseMenu): print(menu, end="") def execute_flash(self, **kwargs): - from core.menus.advanced_menu import AdvancedMenu - start_flash_process(self.flash_options) Logger.print_info("Returning to MCU Flash Menu in 5 seconds ...") time.sleep(5) - KlipperFlashMethodMenu(previous_menu=AdvancedMenu).run() + KlipperFlashMethodMenu().run() def abort_process(self, **kwargs): from core.menus.advanced_menu import AdvancedMenu diff --git a/kiauh/core/menus/advanced_menu.py b/kiauh/core/menus/advanced_menu.py index 2235334..f86788e 100644 --- a/kiauh/core/menus/advanced_menu.py +++ b/kiauh/core/menus/advanced_menu.py @@ -39,6 +39,7 @@ class AdvancedMenu(BaseMenu): self.options = { "3": Option(method=self.build, menu=True), "4": Option(method=self.flash, menu=False), + "5": Option(method=self.build_flash, menu=False), "6": Option(method=self.get_id, menu=False), } @@ -70,6 +71,10 @@ class AdvancedMenu(BaseMenu): def flash(self, **kwargs): KlipperFlashMethodMenu(previous_menu=self.__class__).run() + def build_flash(self, **kwargs): + KlipperBuildFirmwareMenu(previous_menu=KlipperFlashMethodMenu).run() + KlipperFlashMethodMenu(previous_menu=self.__class__).run() + def get_id(self, **kwargs): KlipperSelectMcuConnectionMenu( previous_menu=self.__class__,