PnP - Major fix. With this change all interfaces, including the DigiRig Mobile with no CAT, are using the the rigctld service as their interface. JS8Call settings are no longer losted on application restart.

This commit is contained in:
Gaston Gonzalez
2024-10-28 11:16:00 -07:00
parent d590dc6332
commit 1a22f483ac
5 changed files with 16 additions and 80 deletions
+3 -17
View File
@@ -2,7 +2,7 @@
#
# Author : Gaston Gonzalez
# Date : 24 October 2024
# Updated : 25 October 2024
# Updated : 28 October 2024
# Purpose : Wrapper script for starting JS8Call with PnP support
#
# Preconditions
@@ -10,8 +10,7 @@
#
# Postconditions
# 1. JS8Call audio settings updated
# 2. JS8Call rig settings updated
# 3. JS8Call started
# 2. JS8Call started
usage() {
echo "usage: $(basename $0) <command>"
@@ -26,7 +25,7 @@ fi
notify_user() {
notify-send \
-t 10000 \
-t 5000 \
--app-name="EmComm Tools" \
"$1"
}
@@ -42,19 +41,6 @@ update-config () {
[ -z "$ET_USER_CONFIG" ] && ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json"
# Special case for the DigiRig Mobile when connected to a radio that does
# not support CAT control.
if [ -L "${ET_HOME}/conf/radios.d/active-radio.json" ]; then
RIG_ID=$(cat "${ET_HOME}/conf/radios.d/active-radio.json" | jq -r .rigctrl.id)
if [ "${RIG_ID}" = "6" ]; then
JS8CALL_TEMPLATE_CONF_FILE=${ET_HOME}/conf/template.d/js8call/JS8Call.no-rigctl.ini
fi
fi
cp ${JS8CALL_TEMPLATE_CONF_FILE} ${JS8CALL_CONF_FILE}
et-log "Replaced JS8Call configuration with template: ${JS8CALL_TEMPLATE_CONF_FILE}"
# Update configuration with current callsign and grid
CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign)
GRID=$(cat ${ET_USER_CONFIG} | jq -r .grid)