diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config index 2d98653..238d9ac 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config @@ -50,9 +50,8 @@ ingest_data() { # usage: `ingest_data "command.sh -argument" key_width` local output_string="" # Read the output from femto-meshtasticd-config.sh and store output_string while IFS=':' read -r key value; do - # Trim leading/trailing spaces from key and value - key=$(femto-utils.sh -R "$(echo "$key" | xargs)") - value=$(femto-utils.sh -R "$(echo "$value" | xargs)") + key=$(femto-utils.sh -R "$(echo "$key")") + value=$(femto-utils.sh -R "$(echo "$value" | xargs)") # Trim leading/trailing spaces from value if [[ -z "$key" && -z "$value" ]]; then output_string+="---\n" else @@ -62,6 +61,18 @@ ingest_data() { # usage: `ingest_data "command.sh -argument" key_width` echo -e "$output_string" } +check_meshtasticd_running() { + if echo $(femto-utils.sh -C "meshtasticd") | grep -q "not running"; then + dialog --no-collapse --title "Meshtasticd service" --yesno "Meshtasticd service is not running but is required.\n\nStart service?" 9 50 + if [ $? -eq 0 ]; then #unless cancel/no + femto-meshtasticd-config.sh -s + return 0 + else + return 1 + fi + fi +} + wifi_config() { local title2="Wi-Fi (wlan0) Settings" local config=$(dialog --no-collapse --title "$title2" --form "↑ ↓ to navigate, [ESC] to cancel." 10 45 0 \ @@ -225,12 +236,14 @@ utilities() { dialog --no-collapse --colors --title "Networking info" --msgbox "$(ingest_data "femto-utils.sh -n" 15)" 0 0 ;; 6) # Meshtastic node info) - loading "Loading Meshtastic node info..." - dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "$(ingest_data "femto-meshtasticd-config.sh -i" 15)" 0 0 + check_meshtasticd_running && ( + loading "Loading Meshtastic node info..." + dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "$(ingest_data "femto-meshtasticd-config.sh -i" 15)" 0 0 + ) ;; 7) # Complete system info) loading "Loading complete system info..." - dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "$(ingest_data "femto-utils.sh -i" 15)" 0 0 + dialog --no-collapse --colors --title "Complete system info" --msgbox "$(ingest_data "femto-utils.sh -i" 15)" 0 0 ;; 8) break ;; esac @@ -422,107 +435,119 @@ meshtastic_settings() { [ $? -eq 1 ] && break # Exit the loop if the user selects "Cancel" or closes the dialog case $meshtastic_choice in 1) # view node info) - loading "Getting node info..." - dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "$(ingest_data "femto-meshtasticd-config.sh -i" 15)" 0 0 + check_meshtasticd_running && ( + loading "Getting node info..." + dialog --no-collapse --colors --title "Meshtastic node info" --msgbox "$(ingest_data "femto-meshtasticd-config.sh -i" 15)" 0 0 + ) ;; 2) # get current configuration URL & QR code) - loading "Getting Meshtastic QR code and URL..." - femto-meshtasticd-config.sh -g - pause + check_meshtasticd_running && ( + loading "Getting Meshtastic QR code and URL..." + femto-meshtasticd-config.sh -g + pause + ) ;; 3) # set URL) - newurl=$(dialog --no-collapse --title "Meshtastic URL" --inputbox "New Meshtastic LoRa configuration URL (SHIFT+INS to paste):" 8 60 3>&1 1>&2 2>&3) - if [ -n "$newurl" ]; then #if a URL was entered - dialog --no-collapse --title "$title" --yesno "New Meshtastic LoRa configuration URL:\n$newurl\n\nConfirm?" 15 60 - if [ $? -eq 0 ]; then #unless cancel/no - loading "Sending command..." - dialog --no-collapse --colors --title "Meshtastic URL" --msgbox "$(femto-meshtasticd-config.sh -q "$newurl" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + check_meshtasticd_running && ( + newurl=$(dialog --no-collapse --title "Meshtastic URL" --inputbox "New Meshtastic LoRa configuration URL (SHIFT+INS to paste):" 8 60 3>&1 1>&2 2>&3) + if [ -n "$newurl" ]; then #if a URL was entered + dialog --no-collapse --title "$title" --yesno "New Meshtastic LoRa configuration URL:\n$newurl\n\nConfirm?" 15 60 + if [ $? -eq 0 ]; then #unless cancel/no + loading "Sending command..." + dialog --no-collapse --colors --title "Meshtastic URL" --msgbox "$(femto-meshtasticd-config.sh -q "$newurl" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + fi fi - fi + ) ;; 4) # set radio) - set_lora_radio + check_meshtasticd_running && ( + set_lora_radio + ) ;; 5) # remote admin) - choice="" # zero the choice before loading the submenu - while true; do - choice=$(dialog --no-collapse --cancel-label "Back" --default-item "$choice" --title "Meshtastic Security Settings" --item-help --menu "" 16 40 5 \ - 1 "View/change public key" "" \ - 2 "View/change private key" "" \ - " " "" "" \ - 3 "View admin keys" "" \ - 4 "Set admin key" "" \ - 5 "Clear admin keys" "" \ - 6 "Legacy admin channel" "" \ - " " "" "" \ - 7 "Return to previous menu" "" 3>&1 1>&2 2>&3) - [ $? -eq 1 ] && break # Exit the loop if the user selects "Cancel" or closes the dialog - case $choice in - 1) # view/change public key) - loading "Getting current public key..." - key=$(femto-meshtasticd-config.sh -u) - if [ -n "$key" ]; then - dialog --no-collapse --title "Meshtastic public key" --yesno "Current public key:\n$key\n\nSet new key?" 9 55 - if [ $? -eq 0 ]; then #unless cancel/no - key=$(dialog --no-collapse --title "Meshtastic public key" --inputbox "New Meshtastic public key (SHIFT+INS to paste):" 8 60 3>&1 1>&2 2>&3) + check_meshtasticd_running && ( + choice="" # zero the choice before loading the submenu + while true; do + choice=$(dialog --no-collapse --cancel-label "Back" --default-item "$choice" --title "Meshtastic Security Settings" --item-help --menu "" 16 40 5 \ + 1 "View/change public key" "" \ + 2 "View/change private key" "" \ + " " "" "" \ + 3 "View admin keys" "" \ + 4 "Set admin key" "" \ + 5 "Clear admin keys" "" \ + 6 "Legacy admin channel" "" \ + " " "" "" \ + 7 "Return to previous menu" "" 3>&1 1>&2 2>&3) + [ $? -eq 1 ] && break # Exit the loop if the user selects "Cancel" or closes the dialog + case $choice in + 1) # view/change public key) + loading "Getting current public key..." + key=$(femto-meshtasticd-config.sh -u) + if [ -n "$key" ]; then + dialog --no-collapse --title "Meshtastic public key" --yesno "Current public key:\n$key\n\nSet new key?" 9 55 if [ $? -eq 0 ]; then #unless cancel/no - loading "Sending command..." - dialog --no-collapse --colors --title "Meshtastic public key" --msgbox "$(femto-meshtasticd-config.sh -U "$key" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + key=$(dialog --no-collapse --title "Meshtastic public key" --inputbox "New Meshtastic public key (SHIFT+INS to paste):" 8 60 3>&1 1>&2 2>&3) + if [ $? -eq 0 ]; then #unless cancel/no + loading "Sending command..." + dialog --no-collapse --colors --title "Meshtastic public key" --msgbox "$(femto-meshtasticd-config.sh -U "$key" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + fi fi + else + dialog --no-collapse --colors --title "Meshtastic public key" --msgbox "\Z1Failed to communicate with Meshtasticd.\Zn\n\nIs the service running?\n" 0 0 fi - else - dialog --no-collapse --colors --title "Meshtastic public key" --msgbox "\Z1Failed to communicate with Meshtasticd.\Zn\n\nIs the service running?\n" 0 0 - fi - ;; - 2) # view/change private key) - loading "Getting current private key..." - key=$(femto-meshtasticd-config.sh -u) - if [ -n "$key" ]; then - dialog --no-collapse --title "Meshtastic private key" --yesno "Current private key:\n$key\n\nSet new key?" 9 55 - if [ $? -eq 0 ]; then #unless cancel/no - key=$(dialog --no-collapse --title "Meshtastic private key" --inputbox "New Meshtastic private key (SHIFT+INS to paste):" 8 60 3>&1 1>&2 2>&3) + ;; + 2) # view/change private key) + loading "Getting current private key..." + key=$(femto-meshtasticd-config.sh -u) + if [ -n "$key" ]; then + dialog --no-collapse --title "Meshtastic private key" --yesno "Current private key:\n$key\n\nSet new key?" 9 55 if [ $? -eq 0 ]; then #unless cancel/no - loading "Sending command..." - dialog --no-collapse --colors --title "Meshtastic private key" --msgbox "$(femto-meshtasticd-config.sh -R "$key" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + key=$(dialog --no-collapse --title "Meshtastic private key" --inputbox "New Meshtastic private key (SHIFT+INS to paste):" 8 60 3>&1 1>&2 2>&3) + if [ $? -eq 0 ]; then #unless cancel/no + loading "Sending command..." + dialog --no-collapse --colors --title "Meshtastic private key" --msgbox "$(femto-meshtasticd-config.sh -R "$key" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + fi fi + else + dialog --no-collapse --colors --title "Meshtastic private key" --msgbox "\Z1Failed to communicate with Meshtasticd.\Zn\n\nIs the service running?\n" 0 0 fi - else - dialog --no-collapse --colors --title "Meshtastic private key" --msgbox "\Z1Failed to communicate with Meshtasticd.\Zn\n\nIs the service running?\n" 0 0 - fi - ;; - 3) # view admin keys) - loading "Getting Admin Keys..." - dialog --no-collapse --title "Admin keys" --msgbox "Up to 3 admin keys are permitted, more will be ignored.\n\nKeys:$(femto-meshtasticd-config.sh -a | tail -n 1 | sed 's/|n/\\n/g')" 0 0 - ;; - 4) # set admin key) - key=$(dialog --no-collapse --title "Admin Keys" --inputbox "Meshtastic admin key - up to 3, more will be ignored.\n\n(SHIFT+INS to paste):" 11 40 3>&1 1>&2 2>&3) - if [ -n "$key" ]; then #if a key was entered - loading "Sending command..." - dialog --no-collapse --colors --title "Admin Keys" --msgbox "$(femto-meshtasticd-config.sh -A "$key" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 - fi - ;; - 5) # clear admin keys) - dialog --no-collapse --title "Admin Keys" --yesno "Meshtasticd can have up to 3 admin keys. If more are added, they will be ignored.\n\nClear admin key list?\n" 0 0 - if [ $? -eq 0 ]; then #unless cancel/no - loading "Sending command..." - dialog --no-collapse --colors --title "Admin Keys" --msgbox "$(femto-meshtasticd-config.sh -c && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 - fi - ;; - 6) # legacy admin) - legacy_admin - ;; - 7) # return to previous menu) - break - ;; - esac - done + ;; + 3) # view admin keys) + loading "Getting Admin Keys..." + dialog --no-collapse --title "Admin keys" --msgbox "Up to 3 admin keys are permitted, more will be ignored.\n\nKeys:$(femto-meshtasticd-config.sh -a | tail -n 1 | sed 's/|n/\\n/g')" 0 0 + ;; + 4) # set admin key) + key=$(dialog --no-collapse --title "Admin Keys" --inputbox "Meshtastic admin key - up to 3, more will be ignored.\n\n(SHIFT+INS to paste):" 11 40 3>&1 1>&2 2>&3) + if [ -n "$key" ]; then #if a key was entered + loading "Sending command..." + dialog --no-collapse --colors --title "Admin Keys" --msgbox "$(femto-meshtasticd-config.sh -A "$key" && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + fi + ;; + 5) # clear admin keys) + dialog --no-collapse --title "Admin Keys" --yesno "Meshtasticd can have up to 3 admin keys. If more are added, they will be ignored.\n\nClear admin key list?\n" 0 0 + if [ $? -eq 0 ]; then #unless cancel/no + loading "Sending command..." + dialog --no-collapse --colors --title "Admin Keys" --msgbox "$(femto-meshtasticd-config.sh -c && echo -e "\n\Z4Command successful!\Zn\n" || echo -e "\n\Z1Command failed.\Zn\n")" 0 0 + fi + ;; + 6) # legacy admin) + legacy_admin + ;; + 7) # return to previous menu) + break + ;; + esac + done + ) ;; 6) #test mesh connectivity) - dialog --no-collapse --title "Meshtastic Connectivity Test" --yesno "Will send \"test\" to channel 0 and wait for acknowledgement. Will try up to 3 times.\n\nPerform test?" 10 45 - if [ $? -eq 0 ]; then #unless cancel/no - dialog --no-collapse --infobox "Performing mesh connectivity test.\n\nThis may take a while..." 6 45 - dialog --no-collapse --colors --title "Meshtasticd connectivity test" --msgbox "$(femto-utils.sh -R "$(femto-meshtasticd-config.sh -w)")" 0 0 - fi + check_meshtasticd_running && ( + dialog --no-collapse --title "Meshtastic Connectivity Test" --yesno "Will send \"test\" to channel 0 and wait for acknowledgement. Will try up to 3 times.\n\nPerform test?" 10 45 + if [ $? -eq 0 ]; then #unless cancel/no + dialog --no-collapse --infobox "Performing mesh connectivity test.\n\nThis may take a while..." 6 45 + dialog --no-collapse --colors --title "Meshtasticd connectivity test" --msgbox "$(femto-utils.sh -R "$(femto-meshtasticd-config.sh -w)")" 0 0 + fi + ) ;; 7) #manage meshtasticd service) choice="" # zero the choice before loading the submenu diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-meshtasticd-config.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-meshtasticd-config.sh index e915361..fe193b0 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-meshtasticd-config.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-meshtasticd-config.sh @@ -101,7 +101,7 @@ while getopts ":higkl:q:uU:rR:aA:cpo:sM:Stwuxm" opt; do output_array+=("Role=$(echo "$output" | grep -oP '"role":\s*"\K[^"]+' | head -n 1)") freq_offset=$(echo "$output" | grep -oP '"bandwidth":\s*\K\w+') if [ "$freq_offset" != 0 ]; then # only display frequency offset if not 0 - output_array+=("Override freq=$freq_offset") + output_array+=("Freq offset=$freq_offset") fi output_array+=("Region=$(echo "$output" | grep -oP '"region":\s*"\K[^"]+')") output_array+=("Hop limit=$(echo "$output" | grep -oP '"hopLimit":\s*\K\w+')") @@ -110,7 +110,7 @@ while getopts ":higkl:q:uU:rR:aA:cpo:sM:Stwuxm" opt; do freq_slot+=("Freq slot=$freq_slot") fi override_freq=$(echo "$output" | grep -oP '"overrideFrequency":\s*\K[0-9.]+') - if [ "$override_freq" != "0" ]; then # only display override frequency if not 0 + if [ "$override_freq" != "0.0" ]; then # only display override frequency if not 0.0 output_array+=("Override freq=$override_freq") fi output_array+=("Public key=$(echo "$output" | grep -oP '"publicKey":\s*"\K[^"]+' | head -n 1)") diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-utils.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-utils.sh index 5935c4b..924595d 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-utils.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-utils.sh @@ -142,7 +142,7 @@ peripherals_info() { fi done fi - done <<< "$(echo "$(sudo i2cdetect -y 3)")" + done <<< "$(echo "$(timeout 3 i2cdetect -y 3)")" # when no i2c devices are connected, i2cdetect tries to connect for a solid 25 seconds. The timeout prevents this [[ -z "$i2c_addresses" ]] && i2c_addresses="none detected" # if no addresses found, "none detected" echo -e "LoRa radio:$lora_radio\n\