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

feat: replace mjpg-streamer with crowsnest #286

Merged
KwadFan merged 13 commits from feat/crowsnest into master 2023-02-03 22:00:00 +01:00
Conversation 5 Commits 13 Files Changed 7 +5 -17
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 06c0f3c550 - Show all commits

9
scripts/ui/install_menu.sh
View File

@@ -29,10 +29,6 @@ function install_ui() {
echo -e "| | |"
echo -e "| Touchscreen GUI: | Webcam Streamer: |"
echo -e "| 5) [KlipperScreen] | 10) [Crowsnest] |"
# echo -e "| Touchscreen GUI: | |"
# echo -e "| 5) [KlipperScreen] | |"
# echo -e "| Touchscreen GUI: | Webcam Streamer: |"
# echo -e "| 5) [KlipperScreen] | 10) [MJPG-Streamer] |"
back_footer
}
@@ -70,11 +66,6 @@ function install_menu() {
do_action "moonraker_obico_setup_dialog" "install_ui";;
10)
do_action "install_crowsnest" "install_ui";;
# 10)
# do_action "install_mjpg-streamer" "install_ui";;
# clear && print_header
# print_error "Function currently disabled! Sorry!"
# install_ui;;
B|b)
clear; main_menu; break;;
*)

2
scripts/ui/main_menu.sh
View File

@@ -29,8 +29,8 @@ function main_ui() {
echo -e "| | Fluidd: $(print_status "fluidd")|"
echo -e "| | KlipperScreen: $(print_status "klipperscreen")|"
echo -e "| 6) [Settings] | Telegram Bot: $(print_status "telegram_bot")|"
echo -e "| | Obico: $(print_status "moonraker_obico")|"
echo -e "| | Crowsnest: $(print_status "crowsnest")|"
echo -e "| | Obico: $(print_status "moonraker_obico")|"
echo -e "| | |"
echo -e "| $(print_kiauh_version)| Octoprint: $(print_status "octoprint")|"
quit_footer

11
scripts/ui/remove_menu.sh
View File

@@ -21,10 +21,9 @@ function remove_ui() {
echo -e "| 1) [Klipper] | 6) [OctoPrint] |"
echo -e "| 2) [Moonraker] | |"
echo -e "| | Webcam Streamer: |"
echo -e "| Klipper Webinterface: | 7) [MJPG-Streamer] |"
echo -e "| 3) [Mainsail] | 12) [Crowsnest] |"
echo -e "| 4) [Fluidd] | |"
echo -e "| | Other: |"
echo -e "| Klipper Webinterface: | 7) [Crowsnest] |"
echo -e "| 3) [Mainsail] | |"
echo -e "| 4) [Fluidd] | Other: |"
echo -e "| | 8) [PrettyGCode] |"
echo -e "| Touchscreen GUI: | 9) [Telegram Bot] |"
echo -e "| 5) [KlipperScreen] | 10) [Obico for Klipper] |"
@@ -52,7 +51,7 @@ function remove_menu() {
6)
do_action "remove_octoprint" "remove_ui";;
7)
do_action "remove_mjpg-streamer" "remove_ui";;
do_action "remove_crowsnest" "remove_ui";;
8)
do_action "remove_prettygcode" "remove_ui";;
9)
@@ -61,8 +60,6 @@ function remove_menu() {
do_action "remove_moonraker_obico" "remove_ui";;
11)
do_action "remove_nginx" "remove_ui";;
12)
do_action "remove_crowsnest" "remove_ui";;
B|b)
clear; main_menu; break;;
*)