Merge branch 'master' into dev

This commit is contained in:
Evgenii Shavrin
2021-09-11 02:48:15 +03:00
committed by GitHub
28 changed files with 805 additions and 469 deletions

View File

@@ -13,9 +13,10 @@ install_ui(){
echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | "
echo -e "| | 7) [OctoPrint] | "
echo -e "| Klipper Webinterface: | 8) [MoonrakerTelegramBot]| "
echo -e "| 3) [Mainsail] | | "
echo -e "| 4) [Fluidd] | Webcam: | "
echo -e "| | 9) [MJPG-Streamer] | "
echo -e "| 3) [Mainsail] | 9) [PrettyGCode] | "
echo -e "| 4) [Fluidd] | | "
echo -e "| | Webcam: | "
echo -e "| | 10) [MJPG-Streamer] | "
quit_footer
}
@@ -41,6 +42,8 @@ install_menu(){
8)
do_action "install_MoonrakerTelegramBot" "install_ui";;
9)
do_action "install_pgc_for_klipper" "install_ui";;
10)
do_action "install_mjpg-streamer" "install_ui";;
Q|q)
clear; main_menu; break;;