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

refactor: remove switch menu from advanced menu

Browse Source 
this function got replaced by the custom klipper repo function

Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-17 18:03:25 +02:00
parent 9c523e1ff6
commit 02d0ce8a78
1 changed files with 15 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
scripts/ui/advanced_menu.sh
View File

@@ -16,14 +16,13 @@ advanced_ui(){
echo -e "| ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${white} | " echo -e "| ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${white} | "
hr hr
echo -e "| Klipper: | Mainsail: | " echo -e "| Klipper: | Mainsail: | "
echo -e "| 1) [Switch Branch] | 7) [Theme installer] | " echo -e "| 1) [Rollback] | 6) [Theme installer] | "
echo -e "| 2) [Rollback] | | " echo -e "| | | "
echo -e "| | System: | " echo -e "| Firmware: | System: | "
echo -e "| Firmware: | 8) [Change hostname] | " echo -e "| 2) [Build only] | 7) [Change hostname] | "
echo -e "| 3) [Build only] | | " echo -e "| 3) [Flash only] | | "
echo -e "| 4) [Flash only] | Extras: | " echo -e "| 4) [Build + Flash] | Extras: | "
echo -e "| 5) [Build + Flash] | 9) [G-Code Shell Command] | " echo -e "| 5) [Get MCU ID] | 8) [G-Code Shell Command] | "
echo -e "| 6) [Get MCU ID] | | "
back_footer back_footer
} }
@@ -33,32 +32,30 @@ advanced_menu(){
read -p "${cyan}Perform action:${white} " action; echo read -p "${cyan}Perform action:${white} " action; echo
case "${action}" in case "${action}" in
1) 1)
do_action "switch_menu";;
2)
do_action "load_klipper_state" "advanced_ui";; do_action "load_klipper_state" "advanced_ui";;
3) 2)
do_action "build_fw" "advanced_ui";; do_action "build_fw" "advanced_ui";;
4) 3)
clear && print_header clear && print_header
do_action "init_flash_process" "advanced_ui";; do_action "init_flash_process" "advanced_ui";;
5) 4)
clear && print_header clear && print_header
status_msg "Please wait..." status_msg "Please wait..."
build_fw && init_flash_process build_fw && init_flash_process
advanced_ui;; advanced_ui;;
6) 5)
clear && print_header clear && print_header
select_mcu_connection select_mcu_connection
print_detected_mcu_to_screen print_detected_mcu_to_screen
advanced_ui;; advanced_ui;;
7) 6)
do_action "ms_theme_menu";; do_action "ms_theme_menu";;
8) 7)
clear clear
print_header print_header
create_custom_hostname && set_hostname create_custom_hostname && set_hostname
advanced_ui;; advanced_ui;;
9) 8)
do_action "setup_gcode_shell_command" "advanced_ui";; do_action "setup_gcode_shell_command" "advanced_ui";;
B|b) B|b)
clear; main_menu; break;; clear; main_menu; break;;
@@ -67,71 +64,4 @@ advanced_menu(){
esac esac
done done
advanced_menu advanced_menu
} }
#############################################################
#############################################################
switch_ui(){
top_border
echo -e "| $(title_msg "~~~~~~~~~ [ Switch Klipper Branch ] ~~~~~~~~~") |"
bottom_border
echo
echo -e " $(title_msg "Active Branch: ")${green}${GET_BRANCH}${white}"
echo
top_border
echo -e "| | "
echo -e "| KevinOConnor: | "
echo -e "| 1) [--> master] | "
echo -e "| | "
echo -e "| dmbutyugin: | "
echo -e "| 2) [--> scurve-shaping] | "
echo -e "| 3) [--> scurve-smoothing] | "
back_footer
}
switch_menu(){
if [ -d "${KLIPPER_DIR}" ]; then
read_branch
do_action "" "switch_ui"
while true; do
read -p "${cyan}Perform action:${white} " action; echo
case "${action}" in
1)
clear
print_header
switch_to_master
read_branch
print_msg && clear_msg
switch_ui;;
2)
clear
print_header
switch_to_scurve_shaping
read_branch
print_msg && clear_msg
switch_ui;;
3)
clear
print_header
switch_to_scurve_smoothing
read_branch
print_msg && clear_msg
switch_ui;;
4)
clear
print_header
switch_to_moonraker
read_branch
print_msg && clear_msg
switch_ui;;
B|b)
clear; advanced_menu; break;;
*)
deny_action "switch_ui";;
esac
done
else
ERROR_MSG="No Klipper directory found! Download Klipper first!"
fi
}