From c9af2f05939b5f6c2b998a5ead2c18da441d5cf3 Mon Sep 17 00:00:00 2001
From: Gaston Gonzalez <info@thetechprepper.com>
Date: Fri, 25 Oct 2024 15:58:35 -0700
Subject: [PATCH] Conky - Added support for displaying callsign and grid

---
 overlay/etc/skel/.conkyrc                   |  4 ++++
 overlay/opt/emcomm-tools/bin/et-system-info | 12 +++++++++++-
 overlay/opt/emcomm-tools/bin/et-user        |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/overlay/etc/skel/.conkyrc b/overlay/etc/skel/.conkyrc
index 1173e7d..6a20cd7 100644
--- a/overlay/etc/skel/.conkyrc
+++ b/overlay/etc/skel/.conkyrc
@@ -36,6 +36,10 @@ CAT  : ${execpi 10 et-system-info et-cat}
 GPS  : ${execpi 10 et-system-info et-gps}
 Audio: ${execpi 10 et-system-info et-audio}
 
+${font DejaVu Sans:bold:size=10}${color #8d5133}${alignc}OPERATOR
+${font DejaVu Sans Mono:size=11}${color yellow}Callsign: ${execpi 10 et-system-info callsign}
+Grid    : ${execpi 10 et-system-info grid} 
+
 ${font DejaVu Sans:bold:size=9}${color #805f4f}${alignc}${execp /opt/emcomm-tools/bin/et-system-info release}
 ]];
 
diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info
index df82ac7..fcc9879 100755
--- a/overlay/opt/emcomm-tools/bin/et-system-info
+++ b/overlay/opt/emcomm-tools/bin/et-system-info
@@ -2,16 +2,18 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 6 October 2024
-# Updated  : 23 October 2024
+# Updated  : 25 October 2024
 # Purpose  : Utility script for dumping system information
 
 function usage() {
   echo "Usage: $(basename $0) <command>"
   echo "  active-radio  - Display model of active radio" 
+  echo "  callsign      - Current callsign"
   echo "  et-audio      - Show state of audio interface"
   echo "  et-audio-card - Display audio card and device: <card>,<device>"
   echo "  et-cat        - Show state of CAT control interface"
   echo "  et-gps        - Show state of GPS interface"
+  echo "  grid          - Current grid square defined by user"
   echo "  ip            - System IP address"
   echo "  release       - EmComm Tools release"
 }
@@ -21,6 +23,8 @@ if [ $# -ne 1 ]; then
   exit 1
 fi
 
+[ -z "$ET_USER_CONFIG" ] && ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json"
+
 case $1 in
   active-radio)
     if [ -L  "${ET_HOME}/conf/radios.d/active-radio.json" ]; then
@@ -29,6 +33,12 @@ case $1 in
       echo "No radio selected"
     fi 
     ;;
+  callsign)
+    cat ${ET_USER_CONFIG} | jq -r .callsign
+    ;;
+  grid)
+    cat ${ET_USER_CONFIG} | jq -r .grid
+    ;;
   et-audio)
 
     # 1. Check if the symlink was created by the udev rules
diff --git a/overlay/opt/emcomm-tools/bin/et-user b/overlay/opt/emcomm-tools/bin/et-user
index 9cbc92a..e58e454 100755
--- a/overlay/opt/emcomm-tools/bin/et-user
+++ b/overlay/opt/emcomm-tools/bin/et-user
@@ -4,7 +4,7 @@
 # Date     : 25 October 2024
 # Purpose  : Set user-specific settings for EmComm Tools.
 
-ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json"
+[ -z "$ET_USER_CONFIG" ] && ET_USER_CONFIG="${HOME}/.config/emcomm-tools/user.json"
 
 if [ ! -e ${ET_USER_CONFIG} ]; then
   cp /etc/skel/.config/emcomm-tools/user.json ${ET_USER_CONFIG}