chris/emcomm-tools-os-community
1
0
Fork 0
mirror of https://github.com/thetechprepper/emcomm-tools-os-community.git synced 2026-09-17 15:41:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from thetechprepper/misc/post-r4-build15-updates

Browse Source 
Fixes following post R4.15 end-to-end image testing. Fixed issue preventing et-radio from displaying configuration notes
This commit is contained in:
thetechprepper
2025-03-18 01:57:11 -07:00
committed by GitHub
parent 5c260ff83f 5160acaa4b
commit 43b359e4d0
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlay/opt/emcomm-tools/bin/et-radio
+3 -9
View File
@@ -2,19 +2,14 @@
# #
# Author : Gaston Gonzalez # Author : Gaston Gonzalez
# Date : 11 October 2024 # Date : 11 October 2024
# Updated : 5 February 2025 # Updated : 16 March 2025
# Purpose : A script for managaing plug-and-play radios # Purpose : A script for managaing plug-and-play radios
set -e source /opt/emcomm-tools/bin/et-common
ACTIVE_RADIO="${ET_HOME}/conf/radios.d/active-radio.json" ACTIVE_RADIO="${ET_HOME}/conf/radios.d/active-radio.json"
NO_RADIO_ID="no-radio" NO_RADIO_ID="no-radio"
YELLOW="\033[1;33m"
GREEN="\033[0;32m"
RED="\033[0;31m"
NC="\033[0m"
options=() options=()
options+=("${NO_RADIO_ID}" "No radio") options+=("${NO_RADIO_ID}" "No radio")
while IFS= read -r radio; do while IFS= read -r radio; do
@@ -51,8 +46,7 @@ if [ $exit_status -eq 0 ]; then
BLUETOOTH_TNC_CHECK=$(ps -ef | grep "[r]fcomm connect") BLUETOOTH_TNC_CHECK=$(ps -ef | grep "[r]fcomm connect")
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
et-log "Killing running processes for Bluetooth TNC" et-log "Killing running processes for Bluetooth TNC"
sudo /usr/bin/killall kissattach sudo /opt/emcomm-tools/bin/et-kill-bt
sudo /usr/bin/killall rfcomm
fi fi
printf "%-20s %-10s %-10s\n" "Radio ID" "Vendor" "Model" printf "%-20s %-10s %-10s\n" "Radio ID" "Vendor" "Model"
overlay/opt/emcomm-tools/bin/et-uv-pro
+2 -3
View File
@@ -2,7 +2,7 @@
# #
# Author : Gaston Gonzalez # Author : Gaston Gonzalez
# Date : 1 January 2025 # Date : 1 January 2025
# Updated : 16 March 2025 # Updated : 17 March 2025
# Purpose : Utility for accessing the Bluetooth TNC on the BTECH UV PRO. # Purpose : Utility for accessing the Bluetooth TNC on the BTECH UV PRO.
source /opt/emcomm-tools/bin/et-common source /opt/emcomm-tools/bin/et-common
@@ -236,8 +236,7 @@ EOF
is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}') is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}')
if [ "${is_paired}" != "yes" ]; then if [ "${is_paired}" != "yes" ]; then
echo -e "${RED}" echo -e "${RED}${DEVICE_NAME} is not paired. Run: '${WHITE}$(basename $0) pair${RED}'"
et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'"
echo -e "${NC}" echo -e "${NC}"
exit 1 exit 1
fi fi
overlay/opt/emcomm-tools/bin/et-vr-n76
+3 -3
View File
@@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
# #
# Author : Gaston Gonzalez # Author : Gaston Gonzalez
# : Cliff Jones
# Date : 1 January 2025 # Date : 1 January 2025
# Updated : 16 March 2025 # Updated : 17 March 2025
# Purpose : Utility for accessing the Bluetooth TNC on the BTECH UV PRO. # Purpose : Utility for accessing the Bluetooth TNC on the BTECH UV PRO.
source /opt/emcomm-tools/bin/et-common source /opt/emcomm-tools/bin/et-common
@@ -236,8 +237,7 @@ EOF
is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}') is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}')
if [ "${is_paired}" != "yes" ]; then if [ "${is_paired}" != "yes" ]; then
echo -e "${RED}" echo -e "${RED}${DEVICE_NAME} is not paired. Run: '${WHITE}$(basename $0) pair${RED}'"
et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'"
echo -e "${NC}" echo -e "${NC}"
exit 1 exit 1
fi fi