From 536ea8352c3a821d53fc6aeed88eb5e9f3e5215e Mon Sep 17 00:00:00 2001
From: Gaston Gonzalez <info@thetechprepper.com>
Date: Wed, 23 Oct 2024 15:45:41 -0700
Subject: [PATCH] Audio - Added udev rules for DigiRig Mobile and DigiRig Lite

---
 .../etc/udev/rules.d/90-et-digirig-lite.rules  | 10 ++++++----
 .../udev/rules.d/90-et-digirig-mobile.rules    | 15 ++++++++-------
 overlay/opt/emcomm-tools/bin/et-system-info    | 18 ++++++++++++++++--
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/overlay/etc/udev/rules.d/90-et-digirig-lite.rules b/overlay/etc/udev/rules.d/90-et-digirig-lite.rules
index 7ef3a22..c5630df 100644
--- a/overlay/etc/udev/rules.d/90-et-digirig-lite.rules
+++ b/overlay/etc/udev/rules.d/90-et-digirig-lite.rules
@@ -1,13 +1,15 @@
-# Author   : Gaston Gonzalez
-# Date     : 17 October 2024
-# Purpose  : udev rules for the DigiRig Lite
+# Author  : Gaston Gonzalez
+# Date    : 17 October 2024
+# Updated : 21 October 2024 
+# Purpose : udev rules for the DigiRig Lite
 #
 # Preconditions:
 # 1. DigiRig Lite connected via USB cable
 #
 # Postconditions:
+# 1. /dev/et-audio created
 
 SUBSYSTEM=="sound", ATTRS{idVendor}=="0d8c", ATTRS{idProduct}=="0012", ENV{ET_DEVICE}=="", \
     ACTION=="add", \
     ATTR{id}="ET_AUDIO", \
-    ENV{ET_DEVICE}="DIGIRIG_LITE", ENV{ET_SUBDEVICE}="AUDIO", GROUP="dialout", MODE="0660", SYMLINK+="et-audio"
+    ENV{ET_DEVICE}="DIGIRIG_LITE", ENV{ET_SUBDEVICE}="AUDIO", GROUP="audio", MODE="0660", SYMLINK+="et-audio"
diff --git a/overlay/etc/udev/rules.d/90-et-digirig-mobile.rules b/overlay/etc/udev/rules.d/90-et-digirig-mobile.rules
index 7c35b11..74a26ca 100644
--- a/overlay/etc/udev/rules.d/90-et-digirig-mobile.rules
+++ b/overlay/etc/udev/rules.d/90-et-digirig-mobile.rules
@@ -1,25 +1,26 @@
 # Author   : Gaston Gonzalez
 # Date     : 30 September 2024
-# Updated  : 11 October 2024
+# Updated  : 23 October 2024
 # Purpose  : udev rules for the DigiRig Mobile v1.9 
 #
 # Preconditions:
-# 1. DigiRig Mobile  connected via USB cable
+# 1. DigiRig Mobile connected via USB cable
 # 2. This rule is processed after the IC-7200
 #
 # Postconditions:
 # 1. /dev/et-cat created
 # 2. rigctld is started
-# 
+# 3. /dev/et-audio created
 
-# The IC-7200 uses the same chipsset. In order to avoid incorrect detection, we will check
-# for the presence of ET_DEVICE as the IC-7200 will set it as an earlier rule. With this
-# approach, the DigiRig Mobile rules must be processed later in the chain.
 SUBSYSTEM=="tty", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", ENV{ET_DEVICE}=="", \
     ACTION=="add", \
     ENV{SYSTEMD_WANTS}="", \
     ENV{ET_DEVICE}="DIGIRIG_MOBILE", ENV{ET_SUBDEVICE}="CAT", GROUP="dialout", MODE="0660", SYMLINK+="et-cat", \
     RUN+="/usr/bin/systemctl start rigctld"
 
+SUBSYSTEM=="sound", ATTRS{idVendor}=="0d8c", ATTRS{idProduct}=="013c", ENV{ET_DEVICE}=="", \
+    ACTION=="add", \
+    ATTR{id}="ET_AUDIO", \
+    ENV{ET_DEVICE}="DIGIRIG_MOBILE", ENV{ET_SUBDEVICE}="AUDIO", GROUP="audio", MODE="0660", SYMLINK+="et-audio"
+
 # TODO: Add rules for earlier 1.9 release
-# TODO: Add rules for sound card
diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info
index 19d0157..329bc4e 100755
--- a/overlay/opt/emcomm-tools/bin/et-system-info
+++ b/overlay/opt/emcomm-tools/bin/et-system-info
@@ -2,7 +2,7 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 6 October 2024
-# Updated  : 21 October 2024
+# Updated  : 23 October 2024
 # Purpose  : Utility script for dumping system information
 
 function usage() {
@@ -36,7 +36,21 @@ case $1 in
 
       UDEV_OUT=$(udevadm info /dev/et-audio | grep ET_DEVICE)
       if [ $? -eq 0 ]; then
-        udevadm info /dev/et-audio | grep ET_DEVICE | cut -d"=" -f2
+
+        # Display friendly audio device name
+        ET_DEVICE=$(udevadm info /dev/et-audio | grep ET_DEVICE | cut -d"=" -f2)
+        case $ET_DEVICE in
+          "DIGIRIG_LITE")
+            echo "DigiRig Lite"
+          ;;
+          "DIGIRIG_MOBILE")
+            echo "DigiRig Mobile"
+          ;;
+          *)
+            echo $ET_DEVICE
+          ;;
+        esac
+
       else
         echo "Connected" 
       fi