From 5210ebca8a0bd0eca53392c15ae92254443f51d3 Mon Sep 17 00:00:00 2001 From: Gaston Gonzalez Date: Fri, 1 Nov 2024 15:00:10 -0700 Subject: [PATCH] Dire Wolf - Added initial et-direwolf wrapper script. Added initial Dire Wolf template for basic/simple packet operation --- overlay/opt/emcomm-tools/bin/et-direwolf | 114 ++++++++++++++++++ overlay/opt/emcomm-tools/bin/et-js8call | 3 +- .../packet/direwolf.simple-packet.conf | 8 +- scripts/install-emcomm-tools.sh | 6 +- 4 files changed, 125 insertions(+), 6 deletions(-) create mode 100755 overlay/opt/emcomm-tools/bin/et-direwolf diff --git a/overlay/opt/emcomm-tools/bin/et-direwolf b/overlay/opt/emcomm-tools/bin/et-direwolf new file mode 100755 index 0000000..31c49fb --- /dev/null +++ b/overlay/opt/emcomm-tools/bin/et-direwolf @@ -0,0 +1,114 @@ +#!/bin/bash +# +# Author : Gaston Gonzalez +# Date : 1 November 2024 +# Purpose : Wrapper script for starting Dire Wolf with PnP support +# +# Preconditions: +# 1. Supported radio and audio interface are connected and properly detected +# +# Postconditions: +# 1. Audio settings updated +# 2. Dire Wolf started + +DIREWOLF_CONF_FILE=${ET_HOME}/conf/template.d/packet/direwolf.conf + +usage() { + echo "usage: $(basename $0) " + echo " start - Update config and start Dire Wolf" + echo " update-config - Update config" +} + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + +notify_user() { + notify-send \ + -t 5000 \ + --app-name="EmComm Tools" \ + "$1" +} + +start() { + update-config + + if [ $? -eq 0 ]; then + CMD="direwolf -c ${DIREWOLF_CONF_FILE} -t 0 -p" + et-log "Starting Dire Wolf with: '${CMD}'" + echo + ${CMD} + else + et-log "Error updating configuration. Can't start Dire Wolf" + exit 1 + fi +} + +update-config () { + + DIREWOLF_TEMPLATE_CONF_FILE=${ET_HOME}/conf/template.d/packet/direwolf.simple-packet.conf + + [ -z "$ET_USER_CONFIG" ] && ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json" + + CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign) + + if [ "${CALLSIGN}" = "N0CALL" ]; then + notify_user "Can't start Dire Worlf. No callsign set. Run: et-user." + exit 1 + fi + + # 1. Check if the symlink was created by the udev rules + if [ -e /dev/et-audio ]; then + + # 2. Check that this device was properly tagged with the ET_AUDIO env variable with a udev rule + APLAY_OUT=$(arecord -l | grep ET_AUDIO) + if [ $? -eq 0 ]; then + AUDIO_CARD=$(echo $APLAY_OUT | cut -d":" -f1 | awk '{print $2}') + AUDIO_DEVICE=$(echo $APLAY_OUT | cut -d"," -f2 | cut -d":" -f1 | awk '{print $2}') + DIREWOLF_AUDIO_DEVICE="plughw:${AUDIO_CARD},${AUDIO_DEVICE}" + + et-log "Creating '${DIREWOLF_CONF_FILE}' from template '${DIREWOLF_TEMPLATE_CONF_FILE}'" + cp ${DIREWOLF_TEMPLATE_CONF_FILE} ${DIREWOLF_CONF_FILE} + + # 3. Update callsign + sed -i "s|{{ET_CALLSIGN}}|${CALLSIGN}|g" ${DIREWOLF_CONF_FILE} + + # 4. Update audio device + et-log "Using '${DIREWOLF_AUDIO_DEVICE}' as audio device for Dire Wolf configuration." + sed -i "s|{{ET_AUDIO_DEVICE}}|${DIREWOLF_AUDIO_DEVICE}|g" ${DIREWOLF_CONF_FILE} + + echo "Generated the configuration below..." + echo + cat ${DIREWOLF_CONF_FILE} + echo + + # Configure ALSA settings for sound card + /opt/emcomm-tools/bin/et-audio update-config + + else + et-log "No ET_AUDIO device detected." + notify_user "Can't start Dire Wolf. No ET_AUDIO device detected." + exit 1 + fi + else + et-log "No ET_AUDIO device plugged in." + notify_user "Can't start Dire Wolf. No supported audio device plugged in." + exit 1 + fi + +} + +case $1 in + start) + start + ;; + update-config) + update-config + ;; + *) + echo "Invalid command." + usage + exit 1 + ;; +esac diff --git a/overlay/opt/emcomm-tools/bin/et-js8call b/overlay/opt/emcomm-tools/bin/et-js8call index 4474709..4393151 100755 --- a/overlay/opt/emcomm-tools/bin/et-js8call +++ b/overlay/opt/emcomm-tools/bin/et-js8call @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 24 October 2024 -# Updated : 31 October 2024 +# Updated : 1 November 2024 # Purpose : Wrapper script for starting JS8Call with PnP support # # Preconditions @@ -37,7 +37,6 @@ start() { update-config () { JS8CALL_CONF_FILE="${HOME}/.config/JS8Call.ini" - JS8CALL_TEMPLATE_CONF_FILE=${ET_HOME}/conf/template.d/js8call/JS8Call.rigctl.ini [ -z "$ET_USER_CONFIG" ] && ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json" diff --git a/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple-packet.conf b/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple-packet.conf index d2a6fb2..a6d9ea8 100644 --- a/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple-packet.conf +++ b/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple-packet.conf @@ -3,17 +3,19 @@ # Purpose : Dire Wolf template for basic packet operation # Audio settings -ADEVICE {{ET_AUDIO_DEVICE}} +#ADEVICE {{ET_AUDIO_DEVICE}} +ADEVICE plughw:1,0 CHANNEL 0 # User settings -MYCALL {{ET_CALLSIGN}} +#MYCALL {{ET_CALLSIGN}} +MYCALL KT7RUN # Modem settings MODEM 1200 +# Rig control settings. Do not change this. # EmComm Tools uses Hamlib's rig control daemon for all radio interfaces. -# Do not change this. PTT RIG 2 localhost:4532 # Enable ports to allow other applications use Dire Wolf as the packet engine diff --git a/scripts/install-emcomm-tools.sh b/scripts/install-emcomm-tools.sh index 20cb349..186544a 100755 --- a/scripts/install-emcomm-tools.sh +++ b/scripts/install-emcomm-tools.sh @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 6 October 2024 -# Updated : 9 October 2024 +# Updated : 1 November 2024 # Purpose : Install EmComm Tools applications et-log "Installing EmComm Tools applications..." @@ -17,3 +17,7 @@ et-log "Setting up permission for shared data access..." chgrp -v -R $ET_GROUP $ET_HOME/conf/radios.d chmod -v 775 $ET_HOME/conf/radios.d chmod -v 664 $ET_HOME/conf/radios.d/*.json + +chgrp -v -R $ET_GROUP $ET_HOME/conf/template.d/packet +chmod -v 775 $ET_HOME/conf/template.d/packet +chmod -v 664 $ET_HOME/conf/template.d/packet/*.conf