From cd63034b7409fa3b54afed11742cd4c4ee6f3f69 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Mon, 15 Apr 2024 21:52:32 +0200 Subject: [PATCH] fix: ignore flash method when checking for firmware files Signed-off-by: Dominik Willner --- .../klipper_firmware/firmware_utils.py | 17 ++++++++--------- .../menus/klipper_flash_menu.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/kiauh/components/klipper_firmware/firmware_utils.py b/kiauh/components/klipper_firmware/firmware_utils.py index 698fdb1..a75fb22 100644 --- a/kiauh/components/klipper_firmware/firmware_utils.py +++ b/kiauh/components/klipper_firmware/firmware_utils.py @@ -20,17 +20,16 @@ from utils.logger import Logger from utils.system_utils import log_process -def find_firmware_file(method: FlashMethod) -> bool: +def find_firmware_file() -> bool: target = KLIPPER_DIR.joinpath("out") target_exists = target.exists() - if method is FlashMethod.REGULAR: - f1 = "klipper.elf.hex" - f2 = "klipper.elf" - fw_file_exists = target.joinpath(f1).exists() and target.joinpath(f2).exists() - elif method is FlashMethod.SD_CARD: - fw_file_exists = target.joinpath("klipper.bin").exists() - else: - raise Exception("Unknown flash method") + + f1 = "klipper.elf.hex" + f2 = "klipper.elf" + f3 = "klipper.bin" + fw_file_exists = ( + target.joinpath(f1).exists() and target.joinpath(f2).exists() + ) or target.joinpath(f3).exists() return target_exists and fw_file_exists diff --git a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py index f414924..09b1322 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py +++ b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py @@ -101,7 +101,7 @@ class KlipperFlashMethodMenu(BaseMenu): self.goto_next_menu() def goto_next_menu(self, **kwargs): - if find_firmware_file(self.flash_options.flash_method): + if find_firmware_file(): KlipperFlashCommandMenu(previous_menu=self.__class__).run() else: KlipperNoFirmwareErrorMenu().run()