h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor!: removing support for DWC

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-02 00:27:42 +02:00
parent e26a34b316
commit 6272f99f10
21 changed files with 47 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/ui/backup_menu.sh
View File

@@ -12,9 +12,8 @@ backup_ui(){
echo -e "| | 6) [KlipperScreen] | "
echo -e "| Klipper API: | | "
echo -e "| 2) [Moonraker] | Other: | "
echo -e "| 3) [Moonraker DB] | 7) [Duet Web Control] | "
echo -e "| | 8) [OctoPrint] | "
echo -e "| | 9) [MoonrakerTelegramBot] | "
echo -e "| 3) [Moonraker DB] | 7) [OctoPrint] | "
echo -e "| | 8) [MoonrakerTelegramBot] | "
back_footer
}
@@ -38,10 +37,8 @@ backup_menu(){
6)
do_action "backup_klipperscreen" "backup_ui";;
7)
do_action "backup_dwc2" "backup_ui";;
8)
do_action "backup_octoprint" "backup_ui";;
9)
8)
do_action "backup_MoonrakerTelegramBot" "backup_ui";;
B|b)
clear; main_menu; break;;

24
scripts/ui/install_menu.sh
View File

@@ -1,19 +1,19 @@
install_ui(){
top_border
echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${default} | "
echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${white} | "
hr
echo -e "| You need this menu usually only for installing | "
echo -e "| all necessary dependencies for the various | "
echo -e "| functions on a completely fresh system. | "
hr
echo -e "| Firmware & API: | Other: | "
echo -e "| 1) [Klipper] | 6) [Duet Web Control] | "
echo -e "| 2) [Moonraker] | 7) [OctoPrint] | "
echo -e "| | 8) [PrettyGCode] | "
echo -e "| Klipper Webinterface: | 9) [Telegram Bot] | "
echo -e "| 3) [Mainsail] | | "
echo -e "| 4) [Fluidd] | Webcam: | "
echo -e "| | 10) [MJPG-Streamer] | "
echo -e "| 1) [Klipper] | 6) [OctoPrint] | "
echo -e "| 2) [Moonraker] | 7) [PrettyGCode] | "
echo -e "| | 8) [Telegram Bot] | "
echo -e "| Klipper Webinterface: | | "
echo -e "| 3) [Mainsail] | Webcam: | "
echo -e "| 4) [Fluidd] | 9) [MJPG-Streamer] | "
echo -e "| | | "
echo -e "| Touchscreen GUI: | | "
echo -e "| 5) [KlipperScreen] | | "
back_footer
@@ -35,14 +35,12 @@ install_menu(){
5)
do_action "install_klipperscreen" "install_ui";;
6)
do_action "dwc_setup_dialog" "install_ui";;
7)
do_action "octoprint_setup_dialog" "install_ui";;
8)
7)
do_action "install_pgc_for_klipper" "install_ui";;
9)
8)
do_action "install_MoonrakerTelegramBot" "install_ui";;
10)
9)
do_action "install_mjpg-streamer" "install_ui";;
B|b)
clear; main_menu; break;;

9
scripts/ui/main_menu.sh
View File

@@ -13,8 +13,7 @@ main_ui(){
echo -e "| | KlipperScreen: $KLIPPERSCREEN_STATUS|"
echo -e "| 6) [Settings] | Telegram Bot: $MOONRAKER_TELEGRAM_BOT_STATUS|"
echo -e "| | |"
echo -e "| | DWC2: $DWC2_STATUS|"
echo -e "| ${cyan}$KIAUH_VER${default}| Octoprint: $OCTOPRINT_STATUS|"
echo -e "| ${cyan}${KIAUH_VER}${white}| Octoprint: $OCTOPRINT_STATUS|"
quit_footer
}
@@ -49,7 +48,6 @@ main_menu(){
print_kiauh_version
# klipper_status
# moonraker_status
dwc2_status
fluidd_status
mainsail_status
octoprint_status
@@ -60,16 +58,13 @@ main_menu(){
main_ui
while true; do
read -p "${cyan}Perform action:${default} " action; echo
case "$action" in
case "${action}" in
"start klipper") do_action_service "start" "klipper"; main_ui;;
"stop klipper") do_action_service "stop" "klipper"; main_ui;;
"restart klipper") do_action_service "restart" "klipper"; main_ui;;
"start moonraker") do_action_service "start" "moonraker"; main_ui;;
"stop moonraker") do_action_service "stop" "moonraker"; main_ui;;
"restart moonraker")do_action_service "restart" "moonraker"; main_ui;;
"start dwc") do_action_service "start" "dwc"; main_ui;;
"stop dwc") do_action_service "stop" "dwc"; main_ui;;
"restart dwc") do_action_service "restart" "dwc"; main_ui;;
"start octoprint") do_action_service "start" "octoprint"; main_ui;;
"stop octoprint") do_action_service "stop" "octoprint"; main_ui;;
"restart octoprint") do_action_service "restart" "octoprint"; main_ui;;

27
scripts/ui/remove_menu.sh
View File

@@ -1,6 +1,6 @@
remove_ui(){
top_border
echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default} | "
echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${white} | "
hr
echo -e "| Directories which remain untouched: | "
echo -e "| --> Your printer configuration directory | "
@@ -11,13 +11,12 @@ remove_ui(){
echo -e "| 1) [Klipper] | 5) [KlipperScreen] | "
echo -e "| | | "
echo -e "| Klipper API: | Other: | "
echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | "
echo -e "| | 7) [OctoPrint] | "
echo -e "| Klipper Webinterface: | 8) [PrettyGCode] | "
echo -e "| 3) [Mainsail] | 9) [Telegram Bot] | "
echo -e "| 4) [Fluidd] | | "
echo -e "| | 10) [MJPG-Streamer] | "
echo -e "| | 11) [NGINX] | "
echo -e "| 2) [Moonraker] | 6) [OctoPrint] | "
echo -e "| | 7) [PrettyGCode] | "
echo -e "| Klipper Webinterface: | 9) [Telegram Bot] | "
echo -e "| 3) [Mainsail] | | "
echo -e "| 4) [Fluidd] | 9) [MJPG-Streamer] | "
echo -e "| | 10) [NGINX] | "
back_footer
}
@@ -25,7 +24,7 @@ remove_menu(){
do_action "" "remove_ui"
while true; do
read -p "${cyan}Perform action:${default} " action; echo
case "$action" in
case "${action}" in
1)
do_action "remove_klipper" "remove_ui";;
2)
@@ -37,16 +36,14 @@ remove_menu(){
5)
do_action "remove_klipperscreen" "remove_ui";;
6)
do_action "remove_dwc2" "remove_ui";;
7)
do_action "remove_octoprint" "remove_ui";;
8)
7)
do_action "remove_prettygcode" "remove_ui";;
9)
8)
do_action "remove_MoonrakerTelegramBot" "remove_ui";;
10)
9)
do_action "remove_mjpg-streamer" "remove_ui";;
11)
10)
do_action "remove_nginx" "remove_ui";;
B|b)
clear; main_menu; break;;

24
scripts/ui/update_menu.sh
View File

@@ -1,9 +1,9 @@
update_ui(){
ui_print_versions
top_border
echo -e "| ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${default} | "
echo -e "| ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${white} | "
hr
echo -e "| 0) $BB4U_STATUS| "
echo -e "| 0) ${BB4U_STATUS}| "
hr
echo -e "| a) [Update all] | | | "
echo -e "| | Installed: | Latest: | "
@@ -19,12 +19,10 @@ update_ui(){
echo -e "| 5) [KlipperScreen] | $LOCAL_KLIPPERSCREEN_COMMIT | $REMOTE_KLIPPERSCREEN_COMMIT | "
echo -e "| | | | "
echo -e "| Other: |---------------|--------------| "
echo -e "| 6) [DWC2-for-Klipper] | $LOCAL_DWC2FK_COMMIT | $REMOTE_DWC2FK_COMMIT | "
echo -e "| 7) [DWC2 Web UI] | $DWC2_LOCAL_VER | $DWC2_REMOTE_VER | "
echo -e "| 8) [PrettyGCode] | $LOCAL_PGC_COMMIT | $REMOTE_PGC_COMMIT | "
echo -e "| 9) [Telegram Bot] | $LOCAL_MOONRAKER_TELEGRAM_BOT_COMMIT | $REMOTE_MOONRAKER_TELEGRAM_BOT_COMMIT | "
echo -e "| 6) [PrettyGCode] | $LOCAL_PGC_COMMIT | $REMOTE_PGC_COMMIT | "
echo -e "| 7) [Telegram Bot] | $LOCAL_MOONRAKER_TELEGRAM_BOT_COMMIT | $REMOTE_MOONRAKER_TELEGRAM_BOT_COMMIT | "
echo -e "| |------------------------------| "
echo -e "| 10) [System] | $DISPLAY_SYS_UPDATE | "
echo -e "| 8) [System] | $DISPLAY_SYS_UPDATE | "
back_footer
}
@@ -32,8 +30,8 @@ update_menu(){
read_bb4u_stat
do_action "" "update_ui"
while true; do
read -p "${cyan}Perform action:${default} " action; echo
case "$action" in
read -p "${cyan}Perform action:${white} " action; echo
case "${action}" in
0)
do_action "toggle_backups" "update_ui";;
1)
@@ -47,14 +45,10 @@ update_menu(){
5)
do_action "update_klipperscreen" "update_ui";;
6)
do_action "update_dwc2fk" "update_ui";;
7)
do_action "update_dwc2" "update_ui";;
8)
do_action "update_pgc_for_klipper" "update_ui";;
9)
7)
do_action "update_MoonrakerTelegramBot" "update_ui";;
10)
8)
do_action "update_system" "update_ui";;
a)
do_action "update_all" "update_ui";;