feat: add mobileraker support

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-05-03 23:21:23 +02:00
parent 940f7cfbf1
commit 27455dfc64
5 changed files with 271 additions and 7 deletions

View File

@@ -13,6 +13,7 @@ from typing import Type, Optional
from components.crowsnest.crowsnest import install_crowsnest
from components.klipper import klipper_setup
from components.klipperscreen.klipperscreen import install_klipperscreen
from components.mobileraker.mobileraker import install_mobileraker
from components.moonraker import moonraker_setup
from components.webui_client import client_setup
from components.webui_client.client_config import client_config_setup
@@ -47,6 +48,7 @@ class InstallMenu(BaseMenu):
"5": Option(method=self.install_mainsail_config, menu=False),
"6": Option(method=self.install_fluidd_config, menu=False),
"7": Option(method=self.install_klipperscreen, menu=False),
"8": Option(method=self.install_mobileraker, menu=False),
"9": Option(method=self.install_crowsnest, menu=False),
}
@@ -96,5 +98,8 @@ class InstallMenu(BaseMenu):
def install_klipperscreen(self, **kwargs):
install_klipperscreen()
def install_mobileraker(self, **kwargs):
install_mobileraker()
def install_crowsnest(self, **kwargs):
install_crowsnest()

View File

@@ -13,6 +13,7 @@ from typing import Type, Optional
from components.crowsnest.crowsnest import remove_crowsnest
from components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
from components.klipperscreen.klipperscreen import remove_klipperscreen
from components.mobileraker.mobileraker import remove_mobileraker
from components.moonraker.menus.moonraker_remove_menu import (
MoonrakerRemoveMenu,
)
@@ -45,7 +46,8 @@ class RemoveMenu(BaseMenu):
"3": Option(method=self.remove_mainsail, menu=True),
"4": Option(method=self.remove_fluidd, menu=True),
"5": Option(method=self.remove_klipperscreen, menu=True),
"6": Option(method=self.remove_crowsnest, menu=True),
"6": Option(method=self.remove_mobileraker, menu=True),
"7": Option(method=self.remove_crowsnest, menu=True),
}
def print_menu(self):
@@ -62,11 +64,11 @@ class RemoveMenu(BaseMenu):
| Firmware & API: | Touchscreen GUI: |
| 1) [Klipper] | 5) [KlipperScreen] |
| 2) [Moonraker] | |
| | Webcam Streamer: |
| Klipper Webinterface: | 6) [Crowsnest] |
| | Android / iOS: |
| Klipper Webinterface: | 6) [Mobileraker] |
| 3) [Mainsail] | |
| 4) [Fluidd] | |
| | |
| 4) [Fluidd] | Webcam Streamer: |
| | 7) [Crowsnest] |
"""
)[1:]
print(menu, end="")
@@ -86,5 +88,8 @@ class RemoveMenu(BaseMenu):
def remove_klipperscreen(self, **kwargs):
remove_klipperscreen()
def remove_mobileraker(self, **kwargs):
remove_mobileraker()
def remove_crowsnest(self, **kwargs):
remove_crowsnest()

View File

@@ -19,6 +19,10 @@ from components.klipperscreen.klipperscreen import (
update_klipperscreen,
get_klipperscreen_status,
)
from components.mobileraker.mobileraker import (
update_mobileraker,
get_mobileraker_status,
)
from components.moonraker.moonraker_setup import update_moonraker
from components.moonraker.moonraker_utils import get_moonraker_status
from components.webui_client.client_config.client_config_setup import (
@@ -64,6 +68,8 @@ class UpdateMenu(BaseMenu):
self.fc_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.ks_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.ks_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mb_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mb_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.cn_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.cn_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
@@ -119,7 +125,7 @@ class UpdateMenu(BaseMenu):
| | | |
| Other: |---------------|---------------|
| 7) KlipperScreen | {self.ks_local:<22} | {self.ks_remote:<22} |
| 8) Mobileraker | | |
| 8) Mobileraker | {self.mb_local:<22} | {self.mb_remote:<22} |
| 9) Crowsnest | {self.cn_local:<22} | {self.cn_remote:<22} |
| |-------------------------------|
| 10) System | |
@@ -151,7 +157,8 @@ class UpdateMenu(BaseMenu):
def update_klipperscreen(self, **kwargs):
update_klipperscreen()
def update_mobileraker(self, **kwargs): ...
def update_mobileraker(self, **kwargs):
update_mobileraker()
def update_crowsnest(self, **kwargs):
update_crowsnest()
@@ -207,6 +214,13 @@ class UpdateMenu(BaseMenu):
)
self.ks_remote = f"{COLOR_GREEN}{ks_status.get('remote')}{RESET_FORMAT}"
# mobileraker
mb_status = get_mobileraker_status()
self.mb_local = self.format_local_status(
mb_status.get("local"), mb_status.get("remote")
)
self.mb_remote = f"{COLOR_GREEN}{mb_status.get('remote')}{RESET_FORMAT}"
# crowsnest
cn_status = get_crowsnest_status()
self.cn_local = self.format_local_status(