fix: rework menus and UI

This commit is contained in:
th33xitus
2021-01-28 18:54:02 +01:00
parent 0c4f1a5378
commit f8aa88f480
6 changed files with 98 additions and 242 deletions

View File

@@ -18,10 +18,8 @@ quit_footer
}
advanced_menu(){
print_header
print_msg && clear_msg
read_octoprint_service_status
advanced_ui
do_action "" "advanced_ui"
while true; do
read -p "${cyan}Perform action:${default} " action; echo
case "$action" in
@@ -33,23 +31,11 @@ advanced_menu(){
print_msg && clear_msg
advanced_ui;;
1)
clear
print_header
switch_menu
print_msg && clear_msg
advanced_ui;;
do_action "switch_menu" "advanced_ui";;
2)
clear
print_header
load_klipper_state
print_msg && clear_msg
advanced_ui;;
do_action "load_klipper_state" "advanced_ui";;
3)
clear
print_header
build_fw
print_msg && clear_msg
advanced_ui;;
do_action "build_fw" "advanced_ui";;
4)
clear
print_header
@@ -61,11 +47,7 @@ advanced_menu(){
print_msg && clear_msg
advanced_ui;;
5)
clear
print_header
get_mcu_id
print_msg && clear_msg
advanced_ui;;
do_action "get_mcu_id" "advanced_ui";;
6)
clear
print_header
@@ -73,19 +55,11 @@ advanced_menu(){
print_msg && clear_msg
advanced_ui;;
7)
clear
print_header
setup_gcode_shell_command
print_msg && clear_msg
advanced_ui;;
do_action "setup_gcode_shell_command" "advanced_ui";;
Q|q)
clear; main_menu; break;;
*)
clear
print_header
print_unkown_cmd
print_msg && clear_msg
advanced_ui;;
deny_action "advanced_ui";;
esac
done
advanced_menu
@@ -115,8 +89,7 @@ switch_ui(){
switch_menu(){
if [ -d $KLIPPER_DIR ]; then
read_branch
print_msg && clear_msg
switch_ui
do_action "" "switch_ui"
while true; do
read -p "${cyan}Perform action:${default} " action; echo
case "$action" in
@@ -151,11 +124,7 @@ switch_menu(){
Q|q)
clear; advanced_menu; break;;
*)
clear
print_header
print_unkown_cmd
print_msg && clear_msg
switch_ui;;
deny_action "switch_ui";;
esac
done
else