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

Post R5.11 Updated - Updated et-system-info to pull the maidenhead grid from the ETC API if available. Update the JS8Call and fldigi wrapper scripts to use the grid from et-system-info.

Browse Source
This commit is contained in:
thetechprepper
2025-10-05 10:49:32 -07:00
parent bc5aa093d1
commit 9de72b72c2
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlay/opt/emcomm-tools/bin/et-fldigi
+4 -11
View File
@@ -2,6 +2,7 @@
# #
# Author : Gaston Gonzalez # Author : Gaston Gonzalez
# Date : 2 October 2025 # Date : 2 October 2025
# Updated : 5 October 2025
# Purpose : Wrapper script for starting fldigi with PnP support # Purpose : Wrapper script for starting fldigi with PnP support
# #
# Preconditions # Preconditions
@@ -127,18 +128,10 @@ update-config () {
# Update grid based on ETC geolocation services # Update grid based on ETC geolocation services
############################################### ###############################################
et-log "Updating your grid square..." 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) # Configure CAT interface using Hamlib's rig control daemon (rigctld)
overlay/opt/emcomm-tools/bin/et-js8call
+2 -2
View File
@@ -2,7 +2,7 @@
# #
# Author : Gaston Gonzalez # Author : Gaston Gonzalez
# Date : 24 October 2024 # Date : 24 October 2024
# Updated : 20 November 2024 # Updated : 5 October 2025
# Purpose : Wrapper script for starting JS8Call with PnP support # Purpose : Wrapper script for starting JS8Call with PnP support
# #
# Preconditions # Preconditions
@@ -50,7 +50,7 @@ update-config () {
# Update configuration with current callsign and grid # Update configuration with current callsign and grid
CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign) 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 if [ "${CALLSIGN}" = "N0CALL" ]; then
notify_user "Can't start JS8Call. No callsign set. Run: et-user." 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 cat ${ET_USER_CONFIG} | jq -r .callsign
;; ;;
grid) 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) et-audio)