From c304040b559c292acfb64c8f125ab8ad575466c1 Mon Sep 17 00:00:00 2001 From: Gaston Gonzalez Date: Thu, 7 Nov 2024 09:51:45 -0700 Subject: [PATCH] et-mode - Minor fixes for mode state following pre-build 14 testing --- overlay/opt/emcomm-tools/bin/et-mode | 5 +++-- overlay/opt/emcomm-tools/bin/et-system-info | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/overlay/opt/emcomm-tools/bin/et-mode b/overlay/opt/emcomm-tools/bin/et-mode index d4e23c5..523ceb0 100755 --- a/overlay/opt/emcomm-tools/bin/et-mode +++ b/overlay/opt/emcomm-tools/bin/et-mode @@ -73,7 +73,7 @@ options+=("${MODE_ID_WINLINK_ARDOP}" "Winlink ARDOP") options+=("${MODE_ID_WINLINK_PACKET}" "Winlink Packet") # Prompt user for option and save exit status -SELECTED_MODE=$(dialog --clear --menu "Select a mode:" 20 60 10 "${options[@]}" 3>&1 1>&2 2>&3) +SELECTED_MODE=$(dialog --clear --menu "Select a mode:" 30 40 10 "${options[@]}" 3>&1 1>&2 2>&3) exit_status=$? tput sgr 0 && clear @@ -82,6 +82,8 @@ if [ $exit_status -eq 0 ]; then stop_all_services + echo ${SELECTED_MODE} > ${MODE_STATUS_FILE} + case ${SELECTED_MODE} in ${MODE_ID_NONE}) et-log "No mode selected" @@ -110,7 +112,6 @@ if [ $exit_status -eq 0 ]; then ;; esac - echo ${SELECTED_MODE} > ${MODE_STATUS_FILE} else et-log "No mode selected" diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info index 476c2b5..3dd249d 100755 --- a/overlay/opt/emcomm-tools/bin/et-system-info +++ b/overlay/opt/emcomm-tools/bin/et-system-info @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 6 October 2024 -# Updated : 6 November 2024 +# Updated : 7 November 2024 # Purpose : Utility script for dumping system information function usage() { @@ -170,6 +170,7 @@ case $1 in ;; et-mode) + SELECTED_MODE=$(cat "${HOME}/.config/emcomm-tools/et-mode") MODE_ID_NONE="none" @@ -178,6 +179,12 @@ case $1 in MODE_ID_WINLINK_ARDOP="winlink-ardop" MODE_ID_WINLINK_PACKET="winlink-packet" + if [ ! -e /dev/et-audio ]; then + echo "Run 'et-mode' to set" + echo ${MODE_ID_NONE} > "${HOME}/.config/emcomm-tools/et-mode" + exit 0 + fi + case ${SELECTED_MODE} in ${MODE_ID_NONE}) echo "Not selected"