From 9de72b72c2e96bdb3d38117156f1b0b1dc1a5e9f Mon Sep 17 00:00:00 2001
From: thetechprepper <info@thetechprepper.com>
Date: Sun, 5 Oct 2025 10:49:32 -0700
Subject: [PATCH] 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.

---
 overlay/opt/emcomm-tools/bin/et-fldigi      | 15 ++++-----------
 overlay/opt/emcomm-tools/bin/et-js8call     |  4 ++--
 overlay/opt/emcomm-tools/bin/et-system-info | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/overlay/opt/emcomm-tools/bin/et-fldigi b/overlay/opt/emcomm-tools/bin/et-fldigi
index 70d0e52..7823bc5 100755
--- a/overlay/opt/emcomm-tools/bin/et-fldigi
+++ b/overlay/opt/emcomm-tools/bin/et-fldigi
@@ -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)
diff --git a/overlay/opt/emcomm-tools/bin/et-js8call b/overlay/opt/emcomm-tools/bin/et-js8call
index 9f5783b..76315d2 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 : 20 November 2024
+# Updated : 5 October 2025
 # Purpose : Wrapper script for starting JS8Call with PnP support
 #
 # Preconditions
@@ -50,7 +50,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."
diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info
index 6514133..c06d7ab 100755
--- a/overlay/opt/emcomm-tools/bin/et-system-info
+++ b/overlay/opt/emcomm-tools/bin/et-system-info
@@ -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)