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

Streamline the Obico linking process in KIAUH

Browse Source
This commit is contained in:
Kenneth Jiang
2022-08-01 06:46:06 -07:00
parent 121dde5a95
commit 767f8e14f8
3 changed files with 253 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/ui/install_menu.sh
View File

@@ -12,6 +12,11 @@
set -e
function install_ui() {
local moonraker_obico_status=$(print_status "moonraker_obico") moonraker_obico_menu="[Obico for Klipper] "
if echo ${moonraker_obico_status} | grep -q "Not linked!"; then
moonraker_obico_menu="[Link to Obico Server]"
fi
top_border
echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${white} |"
hr
@@ -25,7 +30,7 @@ function install_ui() {
echo -e "| | Other: |"
echo -e "| Klipper Webinterface: | 7) [PrettyGCode] |"
echo -e "| 3) [Mainsail] | 8) [Telegram Bot] |"
echo -e "| 4) [Fluidd] | 9) [Obico for Klipper] |"
echo -e "| 4) [Fluidd] | 9) ${moonraker_obico_menu}|"
echo -e "| | |"
echo -e "| Touchscreen GUI: | Webcam Streamer: |"
echo -e "| 5) [KlipperScreen] | 10) [MJPG-Streamer] |"

4
scripts/ui/main_menu.sh
View File

@@ -24,7 +24,7 @@ function main_ui() {
echo -e "| 5) [Backup] | 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 "obico")|"
echo -e "| | Obico: $(print_status "moonraker_obico")|"
echo -e "| | |"
echo -e "| $(print_kiauh_version)| Octoprint: $(print_status "octoprint")|"
quit_footer
@@ -49,7 +49,7 @@ function print_status() {
if [[ ${status} == "Not installed!" ]]; then
status="${red}${status}${white}"
elif [[ ${status} == "Incomplete!" ]]; then
elif [[ ${status} == "Incomplete!" ]] || [[ ${status} == "Not linked!" ]]; then
status="${yellow}${status}${white}"
else
status="${green}${status}${white}"