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

Resolved merge conflict with et-js8call

Browse Source
This commit is contained in:
thetechprepper
2025-10-07 06:28:42 -07:00
parent b70f3c0564 59542f47c3
commit 1ebd76099d
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlay/etc/skel/.fldigi/fldigi_def.xml
+2 -2
View File
@@ -1096,7 +1096,7 @@ value 2 to 8 -->
<!-- type: double; default: 4.5
6, 4.5, 3 or 2 baud -->
<FSQBAUD>4.5</FSQBAUD>
<FSQBAUD>3</FSQBAUD>
<!-- type: int; default: 3
3 / 6 -->
@@ -1132,7 +1132,7 @@ QTC text string -->
<!-- type: bool; default: 0
0 - NO, 1 - YES
convert operator MYCALL to lower case for directed call triggers -->
<FSQLOWERCASE>0</FSQLOWERCASE>
<FSQLOWERCASE>1</FSQLOWERCASE>
<!-- type: int; default: 6
Time out auto replies after XX seconds -->
overlay/opt/emcomm-tools/bin/et-fldigi
+4 -11
View File
@@ -2,6 +2,7 @@
#
# Author : Gaston Gonzalez
# Date : 2 October 2025
# Updated : 5 October 2025
# Purpose : Wrapper script for starting fldigi with PnP support
#
# Preconditions
@@ -127,18 +128,10 @@ update-config () {
# Update grid based on ETC geolocation services
###############################################
et-log "Updating your grid square..."
curl -f -s "http://localhost:1981/api/geo/position" > ${GEO_CONF}
if [[ $? -eq 0 ]]; then
GRID=$(jq -r -e '.position.gridSquare' ${GEO_CONF})
if [[ $? -eq 0 ]]; then
et-log "Using grid square '${GRID}' for your location"
sed -i "s|^<MYLOC>.*|<MYLOC>${GRID}</MYLOC>|" ${FLDIGI_CONF_FILE}
fi
fi
[[ -e ${GEO_CONF} ]] && rm ${GEO_CONF}
GRID=$(et-system-info grid)
et-log "Using grid square '${GRID}' for your location"
sed -i "s|^<MYLOC>.*|<MYLOC>${GRID}</MYLOC>|" ${FLDIGI_CONF_FILE}
#####################################################################
# Configure CAT interface using Hamlib's rig control daemon (rigctld)
overlay/opt/emcomm-tools/bin/et-js8call
+1 -1
View File
@@ -55,7 +55,7 @@ update-config() {
# Update configuration with current callsign and grid
CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign)
GRID=$(cat ${ET_USER_CONFIG} | jq -r .grid)
GRID=$(et-system-info grid)
if [ "${CALLSIGN}" = "N0CALL" ]; then
notify_user "Can't start JS8Call. No callsign set. Run: et-user."
overlay/opt/emcomm-tools/bin/et-system-info
+15 -1
View File
@@ -41,7 +41,21 @@ case $1 in
cat ${ET_USER_CONFIG} | jq -r .callsign
;;
grid)
cat ${ET_USER_CONFIG} | jq -r .grid
FALLBACK_GRID=$(jq -r -e '.grid' ${ET_USER_CONFIG})
GEO_CONF=/tmp/geo.tmp
curl -f -s "http://localhost:1981/api/geo/position" > ${GEO_CONF}
if [[ $? -eq 0 ]]; then
API_GRID=$(jq -r -e '.position.gridSquare' ${GEO_CONF})
[[ -e ${GEO_CONF} ]] && rm ${GEO_CONF}
if [[ $? -eq 0 ]]; then
echo ${API_GRID}
exit
fi
fi
echo ${FALLBACK_GRID}
;;
et-audio)