From d41865e69332e96f592f5f3e1e7c67df153e545f Mon Sep 17 00:00:00 2001 From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com> Date: Tue, 21 Jan 2025 03:06:16 -0600 Subject: [PATCH 1/6] Update install_menu.py added DroidKlipp --- kiauh/core/menus/install_menu.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py index a5fbe9c..f2516ba 100644 --- a/kiauh/core/menus/install_menu.py +++ b/kiauh/core/menus/install_menu.py @@ -40,7 +40,6 @@ class InstallMenu(BaseMenu): def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None: from core.menus.main_menu import MainMenu - self.previous_menu = previous_menu if previous_menu is not None else MainMenu def set_options(self) -> None: @@ -53,6 +52,7 @@ class InstallMenu(BaseMenu): "6": Option(method=self.install_fluidd_config), "7": Option(method=self.install_klipperscreen), "8": Option(method=self.install_crowsnest), + "9": Option(method=self.install_droidklipp), # Add DroidKlipp option } def print_menu(self) -> None: @@ -61,15 +61,17 @@ class InstallMenu(BaseMenu): ╟───────────────────────────┬───────────────────────────╢ ║ Firmware & API: │ Touchscreen GUI: ║ ║ 1) [Klipper] │ 7) [KlipperScreen] ║ - ║ 2) [Moonraker] │ ║ + ║ 2) [Moonraker] │ 8) [DroidKlipp] ║ + ║ │ ║ ║ │ Webcam Streamer: ║ - ║ Webinterface: │ 8) [Crowsnest] ║ + ║ Webinterface: │ 9) [Crowsnest] ║ ║ 3) [Mainsail] │ ║ ║ 4) [Fluidd] │ ║ ║ │ ║ ║ Client-Config: │ ║ ║ 5) [Mainsail-Config] │ ║ ║ 6) [Fluidd-Config] │ ║ + ║ │ ║ ╟───────────────────────────┴───────────────────────────╢ """ )[1:] @@ -106,3 +108,7 @@ class InstallMenu(BaseMenu): def install_crowsnest(self, **kwargs) -> None: install_crowsnest() + + # Add this method to handle DroidKlipp installation + def install_droidklipp(self, **kwargs) -> None: + install_droidklipp() # Call the function to install DroidKlipp From ef44ba8253c3b392a72f98822712c5ed9f8b1e76 Mon Sep 17 00:00:00 2001 From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com> Date: Tue, 21 Jan 2025 03:07:03 -0600 Subject: [PATCH 2/6] droidklipp droidklipp --- kiauh/components/droidklipp/droidklipp.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 kiauh/components/droidklipp/droidklipp.py diff --git a/kiauh/components/droidklipp/droidklipp.py b/kiauh/components/droidklipp/droidklipp.py new file mode 100644 index 0000000..65b24d8 --- /dev/null +++ b/kiauh/components/droidklipp/droidklipp.py @@ -0,0 +1,21 @@ +import os +import subprocess + +def install_droidklipp(): + try: + print("Installing DroidKlipp...") + subprocess.run(['sudo', 'apt', 'install', '-y', 'adb', 'tmux'], check=True) + + droidklipp_repo_url = "https://github.com/CodeMasterCody3D/DroidKlipp.git" + if not os.path.isdir('DroidKlipp'): + subprocess.run(['git', 'clone', droidklipp_repo_url], check=True) + + os.chdir('DroidKlipp') + subprocess.run(['sudo', 'chmod', '+x', 'droidklipp.sh'], check=True) + subprocess.run(['./droidklipp.sh'], check=True) + + print("DroidKlipp installation complete!") + except subprocess.CalledProcessError as e: + print(f"Error during installation: {e}") + except Exception as e: + print(f"Unexpected error: {e}") From 89ad92468d02b6a46e25f9ba4735b705a61b5b40 Mon Sep 17 00:00:00 2001 From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com> Date: Tue, 21 Jan 2025 03:09:55 -0600 Subject: [PATCH 3/6] Update README.md install update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 72ece02..3ded283 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ sudo apt-get update && sudo apt-get install git -y Once git is installed, use the following command to download KIAUH into your home-directory: ```shell -cd ~ && git clone https://github.com/dw-0/kiauh.git +cd ~ && git clone https://github.com/CodeMasterCody3D/kiauhPlusDroidKlipp.git ``` * **Step 3:** \ From 66975cd9139c4f3787aca7bfb42f96a39dd0168e Mon Sep 17 00:00:00 2001 From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com> Date: Tue, 21 Jan 2025 03:13:08 -0600 Subject: [PATCH 4/6] Update README.md updated readme to add DroidKlipp --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ded283..077ac81 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ cd ~ && git clone https://github.com/CodeMasterCody3D/kiauhPlusDroidKlipp.git Finally, start KIAUH by running the next command: ```shell -./kiauh/kiauh.sh +./kiauhPlusDroidKlipp/kiauh.sh ``` * **Step 4:** \ From 41fccb88fd68a5e62cab3b53cae8888920e94dab Mon Sep 17 00:00:00 2001 From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com> Date: Tue, 21 Jan 2025 03:24:45 -0600 Subject: [PATCH 5/6] Update common.py droidklipp --- kiauh/utils/common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py index 2880e6d..d5cbb93 100644 --- a/kiauh/utils/common.py +++ b/kiauh/utils/common.py @@ -9,6 +9,8 @@ from __future__ import annotations +from components.droidklipp.droidklipp import install_droidklipp + import re from datetime import datetime from pathlib import Path From fc494e21da92c0ff89d435168d4b2c67e3f8083d Mon Sep 17 00:00:00 2001 From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com> Date: Tue, 21 Jan 2025 03:25:46 -0600 Subject: [PATCH 6/6] Update main_menu.py droidklipp --- kiauh/core/menus/main_menu.py | 1 + 1 file changed, 1 insertion(+) diff --git a/kiauh/core/menus/main_menu.py b/kiauh/core/menus/main_menu.py index 7ab4c8b..6ae9b0d 100644 --- a/kiauh/core/menus/main_menu.py +++ b/kiauh/core/menus/main_menu.py @@ -12,6 +12,7 @@ import sys import textwrap from typing import Callable, Type +from components.droidklipp.droidklipp import install_droidklipp from components.crowsnest.crowsnest import get_crowsnest_status from components.klipper.klipper_utils import get_klipper_status from components.klipperscreen.klipperscreen import get_klipperscreen_status