From f3f9f8585304613c6afe0619b9039c28ae331892 Mon Sep 17 00:00:00 2001
From: thetechprepper <info@thetechprepper.com>
Date: Sun, 28 Jun 2026 13:00:23 -0700
Subject: [PATCH] modem73 - Add support for stopping all services to support a
 clean start of Reticulum

---
 overlay/opt/emcomm-tools/bin/et-kill-all  |  3 ++-
 overlay/opt/emcomm-tools/bin/et-reticulum | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/overlay/opt/emcomm-tools/bin/et-kill-all b/overlay/opt/emcomm-tools/bin/et-kill-all
index 62839f9..151d1ce 100755
--- a/overlay/opt/emcomm-tools/bin/et-kill-all
+++ b/overlay/opt/emcomm-tools/bin/et-kill-all
@@ -2,7 +2,7 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 12 November 2024
-# Updated  : 12 May 2026
+# Updated  : 28 June 2026
 # Purpose  : Stops all EmComm Tools sound-based services (i.e. modems) and
 #            amatuer radio applications to ensure a clean start for the next mode.
 
@@ -29,6 +29,7 @@ stop_all_services() {
   systemctl --user stop et-service-direwolf-simple
   systemctl --user stop et-service-direwolf-aprs-digipeater
   systemctl --user stop et-service-direwolf-packet-digipeater
+  systemctl --user stop et-service-modem73-default
 
   # Stop VARA with a sledge hammer
   pkill et-winlink
diff --git a/overlay/opt/emcomm-tools/bin/et-reticulum b/overlay/opt/emcomm-tools/bin/et-reticulum
index 6f14cae..299abad 100755
--- a/overlay/opt/emcomm-tools/bin/et-reticulum
+++ b/overlay/opt/emcomm-tools/bin/et-reticulum
@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 12 May 2026
-# Updated : 15 May 2026
+# Updated : 28 June 2026
 # Purpose : Wrapper script for starting Reticulum with PnP support
 #
 # Preconditions:
@@ -14,6 +14,9 @@
 # 3. Reticulum started
 . /opt/emcomm-tools/bin/et-common
 
+# Ensure that no other modes are running
+et-kill-all
+
 APP="Reticulum"
 RETICULUM_CONF_DIR="${HOME}/.reticulum"
 RETICULUM_CONF_FILE="${RETICULUM_CONF_DIR}/config"
@@ -81,8 +84,9 @@ if [[ $? -eq 0 ]]; then
   et-log "Radio connected and detected." 
 
   modem_options=()
-  modem_options+=("1200" "1200 baud (VHF/UHF operation)")
-  modem_options+=("300" "300 baud (HF option)")
+  modem_options+=("1200-packet" "1200 baud packet (VHF/UHF)")
+  modem_options+=("300-packet" "300 baud packet (HF)")
+  modem_options+=("modem73-default" "modem73 (HF/VHF/UHF)")
 
   modem_choice=$(dialog \
     --clear \
@@ -104,14 +108,18 @@ if [[ $? -eq 0 ]]; then
     et-log "User canceled modem selection. Packet modem will not be started and interface will not be enabled."
   else
     case ${modem_choice} in
-      300)
+      300-packet)
         et-log "Starting 300 baud packet modem"
         start_and_wait_for_service et-service-direwolf-300
       ;;
-      1200)
+      1200-packet)
         et-log "Starting 1200 baud packet modem"
         start_and_wait_for_service et-service-direwolf-simple
       ;;
+      modem73-default)
+        et-log "Starting modem73 with defaults"
+        start_and_wait_for_service et-service-modem73-default
+      ;;
       *)
         et-log "No modem specified"
       ;;