feat: replace mjpg-streamer with crowsnest (#286)

Co-authored-by: th33xitus <th33xitus@googlemail.com>
This commit is contained in:
Stephan Wendel
2023-02-03 21:59:59 +01:00
committed by GitHub
parent 8493269c6f
commit 7aa186e8b9
7 changed files with 266 additions and 12 deletions

View File

@@ -27,10 +27,8 @@ function install_ui() {
echo -e "| 3) [Mainsail] | 8) [Telegram Bot] |"
echo -e "| 4) [Fluidd] | 9) $(obico_install_title) |"
echo -e "| | |"
echo -e "| Touchscreen GUI: | |"
echo -e "| 5) [KlipperScreen] | |"
# echo -e "| Touchscreen GUI: | Webcam Streamer: |"
# echo -e "| 5) [KlipperScreen] | 10) [MJPG-Streamer] |"
echo -e "| Touchscreen GUI: | Webcam Streamer: |"
echo -e "| 5) [KlipperScreen] | 10) [Crowsnest] |"
back_footer
}
@@ -66,11 +64,8 @@ function install_menu() {
do_action "telegram_bot_setup_dialog" "install_ui";;
9)
do_action "moonraker_obico_setup_dialog" "install_ui";;
# 10)
# do_action "install_mjpg-streamer" "install_ui";;
# clear && print_header
# print_error "Function currently disabled! Sorry!"
# install_ui;;
10)
do_action "install_crowsnest" "install_ui";;
B|b)
clear; main_menu; break;;
*)

View File

@@ -29,6 +29,7 @@ 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 "| | Crowsnest: $(print_status "crowsnest")|"
echo -e "| | Obico: $(print_status "moonraker_obico")|"
echo -e "| | |"
echo -e "| $(print_kiauh_version)| Octoprint: $(print_status "octoprint")|"
@@ -107,6 +108,9 @@ function main_menu() {
"start octoprint") do_action_service "start" "octoprint"; main_ui;;
"stop octoprint") do_action_service "stop" "octoprint"; main_ui;;
"restart octoprint") do_action_service "restart" "octoprint"; main_ui;;
"start crowsnest") do_action_service "start" "crowsnest"; main_ui;;
"stop crowsnest") do_action_service "stop" "crowsnest"; main_ui;;
"restart crowsnest") do_action_service "restart" "crowsnest"; main_ui;;
update) do_action "update_kiauh" "main_ui";;
0)clear && print_header
#upload_selection

View File

@@ -21,7 +21,7 @@ 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 "| Klipper Webinterface: | 7) [Crowsnest] |"
echo -e "| 3) [Mainsail] | |"
echo -e "| 4) [Fluidd] | Other: |"
echo -e "| | 8) [PrettyGCode] |"
@@ -51,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)

View File

@@ -32,8 +32,9 @@ function update_ui() {
echo -e "| 6) [PrettyGCode] |$(compare_prettygcode_versions)|"
echo -e "| 7) [Telegram Bot] |$(compare_telegram_bot_versions)|"
echo -e "| 8) [Obico for Klipper]|$(compare_moonraker_obico_versions)|"
echo -e "| 9) [Crowsnest] |$(compare_crowsnest_versions)|"
echo -e "| |------------------------------|"
echo -e "| 9) [System] | $(check_system_updates) |"
echo -e "| 10)[System] | $(check_system_updates) |"
back_footer
}
@@ -63,6 +64,8 @@ function update_menu() {
8)
do_action "update_moonraker_obico" "update_ui";;
9)
do_action "update_crowsnest" "update_ui";;
10)
do_action "update_system" "update_ui";;
a)
do_action "update_all" "update_ui";;