Merge 2aefd86040 into 2a08e3eb15

Signed-off-by: Andrey Kozhevnikov <coderusinbox@gmail.com>

kiauh/components/klipper/__init__.py

@@ -25,6 +25,7 @@ KLIPPER_SERVICE_NAME = "klipper.service"
 
 # directories
 KLIPPER_DIR = Path.home().joinpath("klipper")
+KLIPPER_KCONFIGS_DIR = Path.home().joinpath("klipper-kconfigs")
 KLIPPER_ENV_DIR = Path.home().joinpath("klippy-env")
 KLIPPER_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("klipper-backups")
 

kiauh/components/klipper_firmware/menus/klipper_build_menu.py

@@ -13,7 +13,7 @@ from typing import List, Set, Type
 from os import path, listdir, mkdir
 from shutil import copyfile
 
-from components.klipper import KLIPPER_DIR
+from components.klipper import KLIPPER_DIR, KLIPPER_KCONFIGS_DIR
 from components.klipper_firmware.firmware_utils import (
     run_make,
     run_make_clean,
@@ -41,8 +41,8 @@ class KlipperKConfigMenu(BaseMenu):
         self.title_color = Color.CYAN
         self.previous_menu: Type[BaseMenu] | None = previous_menu
         self.flash_options = FlashOptions()
-        self.kconfigs_dirname = path.expanduser("~/klipper/kconfigs")
-        self.kconfig_default = path.expanduser("~/klipper/.config")
+        self.kconfigs_dirname = KLIPPER_KCONFIGS_DIR
+        self.kconfig_default = path.join(KLIPPER_DIR, ".config")
         self.kconfig = self.kconfig_default if not path.isdir(self.kconfigs_dirname) else None
 
     def run(self) -> None:
@@ -60,8 +60,7 @@ class KlipperKConfigMenu(BaseMenu):
 
     def set_options(self) -> None:
         if not path.isdir(self.kconfigs_dirname):
-            if self.previous_menu is not None:
-                self.previous_menu().run()
+            return
 
         self.input_label_txt = "Select config or action to continue (default=n)"
         self.default_option = Option(method=self.select_config, opt_data=self.kconfig_default)
@@ -123,8 +122,8 @@ class KlipperBuildFirmwareMenu(BaseMenu):
         self.deps: Set[str] = {"build-essential", "dpkg-dev", "make"}
         self.missing_deps: List[str] = check_package_install(self.deps)
         self.flash_options = FlashOptions()
-        self.kconfigs_dirname = path.expanduser("~/klipper/kconfigs")
-        self.kconfig_default = path.expanduser("~/klipper/.config")
+        self.kconfigs_dirname = KLIPPER_KCONFIGS_DIR
+        self.kconfig_default = path.join(KLIPPER_DIR, ".config")
         self.kconfig = self.flash_options.selected_kconfig
 
     def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None: