fix: refactor main menu, add dwc and octoprint commands

This commit is contained in:
th33xitus
2021-01-31 15:59:50 +01:00
parent fa8a9ff7ba
commit 26eecbc94b
2 changed files with 20 additions and 22 deletions

View File

@@ -45,8 +45,7 @@ kiauh_update_msg(){
### TODO: rework other menus to make use of the following functions too and make them more readable ### TODO: rework other menus to make use of the following functions too and make them more readable
do_action(){ do_action(){
clear clear && print_header
print_header
### $1 is the action the user wants to fire ### $1 is the action the user wants to fire
$1 $1
print_msg && clear_msg print_msg && clear_msg
@@ -55,8 +54,7 @@ do_action(){
} }
deny_action(){ deny_action(){
clear clear && print_header
print_header
print_unkown_cmd print_unkown_cmd
print_msg && clear_msg print_msg && clear_msg
$1 $1

View File

@@ -44,29 +44,29 @@ main_menu(){
read -p "${cyan}Perform action:${default} " action; echo read -p "${cyan}Perform action:${default} " action; echo
case "$action" in case "$action" in
"start klipper") "start klipper")
clear && print_header do_action "klipper_service start" "main_ui";;
klipper_service "start"
main_ui;;
"stop klipper") "stop klipper")
clear && print_header do_action "klipper_service stop" "main_ui";;
klipper_service "stop"
main_ui;;
"restart klipper") "restart klipper")
clear && print_header do_action "klipper_service restart" "main_ui";;
klipper_service "restart"
main_ui;;
"start moonraker") "start moonraker")
clear && print_header do_action "moonraker_service start" "main_ui";;
moonraker_service "start"
main_ui;;
"stop moonraker") "stop moonraker")
clear && print_header do_action "moonraker_service stop" "main_ui";;
moonraker_service "stop"
main_ui;;
"restart moonraker") "restart moonraker")
clear && print_header do_action "moonraker_service restart" "main_ui";;
moonraker_service "restart" "start dwc")
main_ui;; do_action "dwc_service start" "main_ui";;
"stop dwc")
do_action "dwc_service stop" "main_ui";;
"restart dwc")
do_action "dwc_service restart" "main_ui";;
"start octoprint")
do_action "octoprint_service start" "main_ui";;
"stop octoprint")
do_action "octoprint_service stop" "main_ui";;
"restart octoprint")
do_action "octoprint_service restart" "main_ui";;
update) update)
do_action "update_kiauh" "main_ui";; do_action "update_kiauh" "main_ui";;
0) 0)