Merge pull request #28 from thetechprepper/feature/bt-qttermtcp-support

Streamlined Bluetooth TNC support for BTECH UV Pro and VGC VR-N76 for select operating modes: axcall, QtTermTCP and Winlink packet.

overlay/etc/skel/.config/QtTermTCP.ini

@@ -5,7 +5,11 @@ AGWMonEnable=0
 AGWPaclen=80
 AGWPort=8000
 AGWTermCall=N0CALL
-AGWToCalls=TTPBBS, 
+AGWToCalls=TTPBBS
+KISSEnable=1
+KISSMode=0
+KISSSerialPort=rfcomm0
+MYCALL=N0CALL
 PTT=HAMLIB
 PTTBAUD=0
 PTTMode=17

overlay/etc/sudoers.d/et-rfcomm

@@ -4,3 +4,5 @@
 
 %bluetooth ALL=(ALL) NOPASSWD: /usr/bin/killall kissattach
 %bluetooth ALL=(ALL) NOPASSWD: /usr/bin/killall rfcomm
+
+%bluetooth ALL=(ALL) NOPASSWD: /opt/emcomm-tools/bin/et-kill-bt

overlay/opt/emcomm-tools/bin/et-kill-bt

@@ -0,0 +1,40 @@
+#!/bin/bash
+# Author   : Gaston Gonzalez
+# Date     : 14 March 2025
+# UPdated  : 15 March 2025
+# Purpose  : Stops all services tied to Bluetooth TNC operations
+#
+# Post Conditions:
+# 1. All services started for supporting Bluetooth over serial are stopped.
+#
+# Note: If you try to re-establish a Bluetooth connection, you will needed to:
+#       1. Turn off and turn back on your radio.
+#       2. Wait 30 seconds before reconnecting (i.e. ./et-uv-pro connect)
+       
+source /opt/emcomm-tools/bin/et-common
+
+stop_all_bt_services() {
+  
+  PS_OUT=$(ps -ef | grep "[k]issattach");
+  if [[ $? -eq 0 ]]; then
+    echo "Killing kissattach processes"
+    killall kissattach
+  fi
+
+  PS_OUT=$(ps -ef | grep "[r]fcomm0");
+  if [[ $? -eq 0 ]]; then
+    ps -ef | grep "[r]fcomm0" | awk '{print $2}' | while read pid; do
+      echo "Killing rfcomm process: $pid"
+      kill $pid
+    done
+
+    echo -e "\n${YELLOW}Wait 30 seconds before reconnecting over Bluetooth${NC}\n"
+  fi
+}
+
+if [[ $EUID -ne 0 ]]; then
+    echo "This script must be run as root!"
+    exit 1
+fi
+
+stop_all_bt_services

overlay/opt/emcomm-tools/bin/et-mode

@@ -2,7 +2,7 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 6 November 2024
-# Updated  : 17 February 2025
+# Updated  : 15 March 2025
 # Purpose  : Configures the system for a specific mode of operation
 
 # Use a simple text file to save the state of the last mode selected
@@ -127,18 +127,6 @@ select_term_mode () {
   fi  
 }
 
-select_winlink_mode () {
-  winlink_mode=()
-
-  BLUETOOTH_TNC_CHECK=$(ps -ef | grep "[r]fcomm connect")
-  if [[ $? -eq 0 ]]; then
-    et-log "AX.25 over Bluetooth connected. Configuring Winlink for native AX.25"
-    start_and_wait_for_service et-service-winlink-native-packet
-    min http://localhost:8080
-    exit 0
-  fi
-}
-
 # Build list of options
 options=()
 options+=("${MODE_ID_NONE}" "No mode selected")
@@ -248,7 +236,7 @@ if [ $exit_status -eq 0 ]; then
       min http://localhost:8080
     ;;
     ${MODE_ID_WINLINK_PACKET})
-      select_winlink_mode
+      winlink_mode
       start_and_wait_for_service et-service-direwolf-simple 
       start_and_wait_for_service et-service-winlink-packet
       min http://localhost:8080

overlay/opt/emcomm-tools/bin/et-qttermtcp

@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 17 December 2024
-# Updated : 8 February 2025
+# Updated : 15 March 2025
 # Purpose : Wrapper script for starting JS8Call with PnP support
 #
 # Preconditions
@@ -59,11 +59,18 @@ update-config () {
     fi
 
     sed -i "s|^AGWTermCall.*|AGWTermCall=${CALLSIGN}|g" ${CONF_FILE} 
+    sed -i "s|^MYCALL.*|MYCALL=${CALLSIGN}|g" ${CONF_FILE} 
     sed -i "s|^VARATermCall.*|VARATermCall=${CALLSIGN}|g" ${CONF_FILE} 
     sed -i "s|^YAPPPath.*|YAPPPath=${HOME}/Downloads|" ${CONF_FILE} 
 
     et-log "Updated QtTermTCP configuration with user callsign '${CALLSIGN}'"
 
+    PS_OUT=$(ps -ef | grep "[r]fcomm0");
+    if [[ $? -eq 0 ]]; then
+      et-log "Configuring for use with Bluetooth TNC"
+      return
+    fi
+    
     # 1. Check if the symlink was created by the udev rules
     if [ -e /dev/et-audio ]; then
 

overlay/opt/emcomm-tools/bin/et-uv-pro

@@ -2,9 +2,22 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 1 January 2025
-# Updated  : 3 February 2025
+# Updated  : 15 March 2025
-# Purpose  : Utility for accessing the Bluetooth TNC on the BTECH
+# Purpose  : Utility for accessing the Bluetooth TNC on the BTECH UV PRO.           
-#            UV PRO.           
+source /opt/emcomm-tools/bin/et-common
+
+CLEAN_UP=1
+
+cleanup() {
+  # Note: We need to reconnect to the Bluetooth device on every mode change. 
+  #       As such, we need kill all the rfcomm and kiss process on exit.
+  if [[ ${CLEAN_UP} -eq 1 ]]; then
+    sudo /opt/emcomm-tools/bin/et-kill-bt
+  fi
+}
+
+# Kill all Bluetooth TNC services on exit
+trap cleanup EXIT
 
 ACTIVE_RADIO="${ET_HOME}/conf/radios.d/btech-uvpro.bt.json"
 DEVICE_NAME="UV-PRO"
@@ -12,47 +25,35 @@ BT_DEVICE="/dev/rfcomm0"
 AX25_PORT="wl2k"
 AX25_CONF_FILE="/etc/ax25/axports"
 
-ESC="\x1B"
-RED="${ESC}[1;31m"
-BLUE="${ESC}[1;34m"
-GREEN="${ESC}[1;32m"
-WHITE="${ESC}[97m"
-YELLOW="${ESC}[1;33m"
-NC="${ESC}[0m"
-
 function usage() {
   echo "Usage: $(basename $0) <command>"
-  echo "  connect - Connect to radio via Bluetooth" 
+  echo "  c, connect - Connect to radio via Bluetooth" 
-  echo "  pair    - Pair radio (one-time operation)" 
+  echo "  p, pair    - Pair radio (one-time operation)" 
-  echo "  unpair  - Unpair radio" 
+  echo "  u, unpair  - Unpair radio" 
+
+  CLEAN_UP=0
 }
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
   usage
   exit 1
 fi
 
-error_message() {
+if [[ -e ${BT_DEVICE} ]]; then
-  echo -e "${RED}"
+  echo -e "${YELLOW}Your ${BLUE}${DEVICE_NAME}${YELLOW} may have a connection that needs to be cleaned up."
-  et-log $*
+  echo -e "Press ${WHITE}[ENTER]${YELLOW} to clean-up.${NC}"
-  echo -e "${NC}"
+  read -p ""
-}
   
-info_message() {
+  cleanup
-  echo -e "${BLUE}"
+fi
-  et-log $*
-  echo -e "${NC}"
-}
 
-success_message() {
+stop_all_services() {
-  echo -e "${GREEN}"
+  et-kill-all
-  et-log $*
-  echo -e "${NC}"
 }
 
 exit_if_no_active_radio () {
   if [ ! -e ${ACTIVE_RADIO} ]; then
-    error_message "${ACTIVE_RADIO} file not found"    
+    echo "${ACTIVE_RADIO} file not found"    
     exit 1
   fi
 }
@@ -60,7 +61,7 @@ exit_if_no_active_radio () {
 get_mac_or_exit () {
   MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
   if [ $? -ne 0 ]; then
-    error_message "No MAC address found in ${ACTIVE_RADIO}."
+    echo "No MAC address found in ${ACTIVE_RADIO}."
     exit 1
   fi
 }
@@ -72,7 +73,7 @@ update_ax25_conf() {
   CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign)
 
   if [ "${CALLSIGN}" = "N0CALL" ]; then
-    error_message "No callsign set. Run et-user first."
+    et-log "No callsign set. Run et-user first."
     exit 1
   fi
 
@@ -85,51 +86,87 @@ update_ax25_conf() {
 
   fi
 
-  info_message "Adding AX25 port for ${CALLSIGN}"
   echo "${AX25_PORT} ${CALLSIGN} 1200 255	2 1200 Packet" >> ${AX25_CONF_FILE}
 }
 
-stop_all_services() {
+do_kiss_attach() {
+  echo -e "${BLUE}Connecting KISS interface using ${BT_DEVICE} and AX.25 port: ${AX25_PORT}${NC}"
+  KISS_OUT=$(sudo kissattach ${BT_DEVICE} ${AX25_PORT})
     
-  PS_OUT=$(ps -ef | grep [k]issattach) 
+  if [[ $? -ne 0 ]]; then
-  if [ $? -eq 0 ]; then
+    echo -e "${RED}Failed to attach KISS port.${NC}"
-    info_message "Killing kissattach process(es)..."$
+    exit 1
-    sudo killall kissattach
   fi
 
-  sleep 3
+  KISS_OUT=$(sudo kissparms -c 1 -p ${AX25_PORT})
+}
 
-  PS2_OUT=$(ps -ef | grep -v krfcommd | grep [r]fcomm) 
+exit_on_service_failure() {
-  if [ $? -eq 0 ]; then
+  local systemd_unit_name="$1"
-    info_message "Killing rfcomm process(es)..."
+  systemctl is-active --user --quiet "${systemd_unit_name}"
-    sudo killall rfcomm
+  if [ $? -ne 0 ]; then
+    et-log "Can't start mode. ${systemd_unit_name} failed to start."
+    exit 1
   fi
 }
 
+TIMEOUT=15  # Total time to wait in seconds
+INTERVAL=2  # Interval between checks in seconds
+
+start_and_wait_for_service() {
+  local systemd_unit_name="$1"
+  local elapsed=0
+
+  et-log "Starting ${systemd_unit_name}..."
+  systemctl --user start ${systemd_unit_name}
+
+  et-log "Waiting for ${systemd_unit_name} to become active..."
+
+  while ! systemctl is-active --user --quiet "${systemd_unit_name}"; do
+      sleep "$INTERVAL"
+      elapsed=$((elapsed + INTERVAL))
+      if [ "$elapsed" -ge "$TIMEOUT" ]; then
+          et-log "Timeout reached. ${systemd_unit_name} failed to start."
+          exit 1
+      fi
+      et-log "Waiting for ${systemd_unit_name} to become active..."
+  done
+
+  # Some applications even when started still need a bit of extra time to be available. 
+  # Add a short think time of 2 seconds. The ARDOP modem requies extra time.
+  sleep 2
+
+  # Do one more check to ensure that we are running, otherwise exit.
+  exit_on_service_failure ${systemd_unit_name}
+}
+
+
 exit_if_no_active_radio
 
 case $1 in
-  pair)
+  p|pair)
 
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
     if [ $? -eq 0 ]; then
       PAIR_STATUS=$(bluetoothctl info "${MAC}" | grep "Paired:" | awk '{print $2}')
       if [ "${PAIR_STATUS}" == "yes" ]; then
-         error_message "Device with MAC ${MAC} is already paired."
+         echo "Device with MAC ${MAC} is already paired."
          exit 1
       fi
     fi 
 
     echo -e "${YELLOW}"
-    echo -e "1. Turn on the BTECH UV PRO"
+    echo -e "1. Turn off your ${DEVICE_NAME}"
-    echo -e "2. Goto Menu > Pairing and press OK"
+    echo -e "2. Turn on your ${DEVICE_NAME}"
-    read -p "3. Press [ENTER] when done."
+    echo -e "3. Goto Menu > Pairing and press OK"
+    echo -e "4. Press ${WHITE}[ENTER]${YELLOW} when done.${NC}"
+    read -p ""
 
-    info_message "Searching for ${DEVICE_NAME}..."
+    echo "Searching for ${DEVICE_NAME}..."
 
     HCI_OUT=$(hcitool scan | grep "${DEVICE_NAME}")
     if [ $? -ne 0 ]; then
-      error_message "Can't find ${DEVICE_NAME}. Make sure that the radio is on and in pairing mode."
+      echo "Can't find ${DEVICE_NAME}. Make sure that the radio is on and in pairing mode."
       exit 1
     fi
 
@@ -164,81 +201,106 @@ EOF
     sleep 1 && chmod 755 ${PAIR_SCRIPT} && expect ${PAIR_SCRIPT}
 
     ;;
-  unpair)
+  u|unpair)
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
     if [ $? -ne 0 ]; then
-      error_message "No MAC found in radio configuration file."
+      echo "No MAC found in radio configuration file."
       exit 1
     fi 
 
     PAIR_STATUS=$(bluetoothctl info "${MAC}")
     if [ $? -ne 0 ]; then
-       error_message "No device with ${MAC} found. Can't unpair."
+       echo "No device with ${MAC} found. Can't unpair."
        exit 1
     fi
 
-    info_message "Unpairing ${DEVICE_NAME}..."
+    echo "Unpairing ${DEVICE_NAME}..."
     bluetoothctl untrust ${MAC}
     bluetoothctl remove ${MAC}
 
     echo -e "${YELLOW}"
-    echo -e "You may also want to remove this device from your UV PRO"
+    echo -e "You may also want to remove this device from your ${DEVICE_NAME}"
     echo -e "under Menu > General Settings > Connection > Paired Devices." 
     echo -e "${NC}"
 
     ;;
-  connect)
+  c|connect)
     get_mac_or_exit
 
     echo -e "${YELLOW}"
-    echo -e "1. Turn on the BTECH UV PRO"
+    echo -e "1. Turn off your ${DEVICE_NAME}"
-    echo -e "2. Menu > General Settings > KISS TNC = checked"
+    echo -e "2. Turn on your ${DEVICE_NAME}"
-    read -p "3. Press [ENTER] when done."
+    echo -e "3. Goto Menu > General Settings > KISS TNC > Enable KISS TNC"
+    echo -e "4. Press ${WHITE}[ENTER]${YELLOW} when done.${NC}"
+    read -p ""
 
     is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}')
     if [ "${is_paired}" != "yes" ]; then
     echo -e "${RED}"
-      et-log "UV Pro is not paired. Run: '$(basename $0) pair'"
+      et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'"
       echo -e "${NC}"
       exit 1
     fi  
  
-    echo -e "${GREEN}Found UV Pro with MAC address: ${MAC}" 
+    echo -e "Found ${DEVICE_NAME} with MAC address: ${MAC}" 
-    stop_all_services
 
     update_ax25_conf 
 
-    echo -e "${BLUE}Connecting to radio..." 
     sudo rfcomm connect /dev/rfcomm0 ${MAC} 1>/dev/null 2>&1 &
 
     sleep 10 && reset
 
-    if [ -e /dev/rfcomm0 ]; then
+    if [[ ! -e "${BT_DEVICE}" ]]; then
-      echo -e "${GREEN}UV Pro connected via Bluetooth serial${NC}" 
+      echo -e "${RED}Failed to connect via Bluetooth${NC}"
-    else
+      echo -e "${YELLOW}"
-      echo -e "${RED}UV Pro failed to connect via Bluetooth serial${NC}"
+      echo -e "1. Try turning off and back on your radio."
+      echo -e "2. Check your radio and ensure that ${BLUE}$(hostname)${YELLOW} is listed under:"
+      echo -e "   Menu > General Settings> Connection > Paired Devices: $(hostname)."
+      echo -e ""
+      echo -e "   If it is not listed, re-run: ${WHITE}$(basename $0) pair${NC}\n"
       exit 1
     fi
 
-    echo -e "${BLUE}Connecting KISS interface using ${BT_DEVICE} and AX.25 port: ${AX25_PORT}${NC}"
+    stop_all_services
-    KISS_OUT=$(sudo kissattach ${BT_DEVICE} ${AX25_PORT})
 
-    if [ $? -eq 0 ]; then
+    echo -e "\nSelect a packet application to start:"
-      echo -e "${GREEN}Packet port ready"
+    options=("axcall" "QtTermTCP" "Winlink" "Exit")
-    else 
-      echo -e "${RED}Failed to setup radio for packet.${NC}"
-      exit 1
-    fi
 
-    KISS_OUT=$(sudo kissparms -c 1 -p ${AX25_PORT})
+    select opt in "${options[@]}"
+    do
+      case $opt in
+        "axcall")
+          do_kiss_attach
+          echo -e "${YELLOW}"
+          echo -e "SAMPLE COMMANDS               DESCRIPTION                     "
+          echo -e "----------------------------- --------------------------------"
+          echo -e "axcall wl2k <STATION>         Connect directly to a node      "
+          echo -e "axcall wl2k <STATION> <DIGI>  Connect to node via a digipeater"
+          echo -e "sudo axlisten -a -tttt -c     Monitor inbound and outbound traffic"
+          echo -e "${NC}"
 
-    echo -e "${YELLOW}"
+          # We can't have the rfcomm and kiss processes killed.
-    echo -e "SAMPLE COMMANDS                  DESCRIPTION                     "
+          CLEAN_UP=0
-    echo -e "-------------------------------  --------------------------------"
+          break
-    echo -e "axcall ${AX25_PORT} <STATION>    Connect directly to a node      "
+          ;;
-    echo -e "axcall ${AX25_PORT} <DIGI>       Connect to node via a digipeater"
+        "QtTermTCP")
-    echo -e "sudo axlisten -a -tttt -c        Monitor inbound and outbound traffic"
+          et-qttermtcp start 1>/dev/null 2>&1
-    echo -e "${NC}"
+          break
+          ;;
+        "Winlink")
+          do_kiss_attach
+          start_and_wait_for_service et-service-winlink-native-packet
+          min http://localhost:8080 1>/dev/null 2>&1
+          break
+          ;;
+        "Exit")
+          break
+          ;;
+        *)
+          echo "Invalid option, please select a number from the list."
+          ;;
+       esac
+    done
 
     ;;
   *)

overlay/opt/emcomm-tools/bin/et-vr-n76

@@ -1,11 +1,24 @@
 #!/bin/bash
 #
-# Authors   : Gaston Gonzalez
+# Authors  : Gaston Gonzalez
-#           : Clifton Jones
+#          : Clifton Jones
-# Date      : 1 January 2025
+# Date     : 1 January 2025
-# Updated   : 19 February 2025
+# Updated  : 15 March 2025
-# Purpose   : Utility for accessing the Bluetooth TNC on the VGC VR-N76
+# Purpose  : Utility for accessing the Bluetooth TNC on the VGC VR-N76.           
-#
+source /opt/emcomm-tools/bin/et-common
+
+CLEAN_UP=1
+
+cleanup() {
+  # Note: We need to reconnect to the Bluetooth device on every mode change. 
+  #       As such, we need kill all the rfcomm and kiss process on exit.
+  if [[ ${CLEAN_UP} -eq 1 ]]; then
+    sudo /opt/emcomm-tools/bin/et-kill-bt
+  fi
+}
+
+# Kill all Bluetooth TNC services on exit
+trap cleanup EXIT
 
 ACTIVE_RADIO="${ET_HOME}/conf/radios.d/vgc-vrn76.bt.json"
 DEVICE_NAME="VR-N76"
@@ -13,47 +26,35 @@ BT_DEVICE="/dev/rfcomm0"
 AX25_PORT="wl2k"
 AX25_CONF_FILE="/etc/ax25/axports"
 
-ESC="\x1B"
-RED="${ESC}[1;31m"
-BLUE="${ESC}[1;34m"
-GREEN="${ESC}[1;32m"
-WHITE="${ESC}[97m"
-YELLOW="${ESC}[1;33m"
-NC="${ESC}[0m"
-
 function usage() {
   echo "Usage: $(basename $0) <command>"
-  echo "  connect - Connect to radio via Bluetooth" 
+  echo "  c, connect - Connect to radio via Bluetooth" 
-  echo "  pair    - Pair radio (one-time operation)" 
+  echo "  p, pair    - Pair radio (one-time operation)" 
-  echo "  unpair  - Unpair radio" 
+  echo "  u, unpair  - Unpair radio" 
+
+  CLEAN_UP=0
 }
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
   usage
   exit 1
 fi
 
-error_message() {
+if [[ -e ${BT_DEVICE} ]]; then
-  echo -e "${RED}"
+  echo -e "${YELLOW}Your ${BLUE}${DEVICE_NAME}${YELLOW} may have a connection that needs to be cleaned up."
-  et-log $*
+  echo -e "Press ${WHITE}[ENTER]${YELLOW} to clean-up.${NC}"
-  echo -e "${NC}"
+  read -p ""
-}
   
-info_message() {
+  cleanup
-  echo -e "${BLUE}"
+fi
-  et-log $*
-  echo -e "${NC}"
-}
 
-success_message() {
+stop_all_services() {
-  echo -e "${GREEN}"
+  et-kill-all
-  et-log $*
-  echo -e "${NC}"
 }
 
 exit_if_no_active_radio () {
   if [ ! -e ${ACTIVE_RADIO} ]; then
-    error_message "${ACTIVE_RADIO} file not found"    
+    echo "${ACTIVE_RADIO} file not found"    
     exit 1
   fi
 }
@@ -61,7 +62,7 @@ exit_if_no_active_radio () {
 get_mac_or_exit () {
   MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
   if [ $? -ne 0 ]; then
-    error_message "No MAC address found in ${ACTIVE_RADIO}."
+    echo "No MAC address found in ${ACTIVE_RADIO}."
     exit 1
   fi
 }
@@ -73,7 +74,7 @@ update_ax25_conf() {
   CALLSIGN=$(cat ${ET_USER_CONFIG} | jq -r .callsign)
 
   if [ "${CALLSIGN}" = "N0CALL" ]; then
-    error_message "No callsign set. Run et-user first."
+    et-log "No callsign set. Run et-user first."
     exit 1
   fi
 
@@ -86,51 +87,87 @@ update_ax25_conf() {
 
   fi
 
-  info_message "Adding AX25 port for ${CALLSIGN}"
   echo "${AX25_PORT} ${CALLSIGN} 1200 255	2 1200 Packet" >> ${AX25_CONF_FILE}
 }
 
-stop_all_services() {
+do_kiss_attach() {
+  echo -e "${BLUE}Connecting KISS interface using ${BT_DEVICE} and AX.25 port: ${AX25_PORT}${NC}"
+  KISS_OUT=$(sudo kissattach ${BT_DEVICE} ${AX25_PORT})
     
-  PS_OUT=$(ps -ef | grep [k]issattach) 
+  if [[ $? -ne 0 ]]; then
-  if [ $? -eq 0 ]; then
+    echo -e "${RED}Failed to attach KISS port.${NC}"
-    info_message "Killing kissattach process(es)..."$
+    exit 1
-    sudo killall kissattach
   fi
 
-  sleep 3
+  KISS_OUT=$(sudo kissparms -c 1 -p ${AX25_PORT})
+}
 
-  PS2_OUT=$(ps -ef | grep -v krfcommd | grep [r]fcomm) 
+exit_on_service_failure() {
-  if [ $? -eq 0 ]; then
+  local systemd_unit_name="$1"
-    info_message "Killing rfcomm process(es)..."
+  systemctl is-active --user --quiet "${systemd_unit_name}"
-    sudo killall rfcomm
+  if [ $? -ne 0 ]; then
+    et-log "Can't start mode. ${systemd_unit_name} failed to start."
+    exit 1
   fi
 }
 
+TIMEOUT=15  # Total time to wait in seconds
+INTERVAL=2  # Interval between checks in seconds
+
+start_and_wait_for_service() {
+  local systemd_unit_name="$1"
+  local elapsed=0
+
+  et-log "Starting ${systemd_unit_name}..."
+  systemctl --user start ${systemd_unit_name}
+
+  et-log "Waiting for ${systemd_unit_name} to become active..."
+
+  while ! systemctl is-active --user --quiet "${systemd_unit_name}"; do
+      sleep "$INTERVAL"
+      elapsed=$((elapsed + INTERVAL))
+      if [ "$elapsed" -ge "$TIMEOUT" ]; then
+          et-log "Timeout reached. ${systemd_unit_name} failed to start."
+          exit 1
+      fi
+      et-log "Waiting for ${systemd_unit_name} to become active..."
+  done
+
+  # Some applications even when started still need a bit of extra time to be available. 
+  # Add a short think time of 2 seconds. The ARDOP modem requies extra time.
+  sleep 2
+
+  # Do one more check to ensure that we are running, otherwise exit.
+  exit_on_service_failure ${systemd_unit_name}
+}
+
+
 exit_if_no_active_radio
 
 case $1 in
-  pair)
+  p|pair)
 
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
     if [ $? -eq 0 ]; then
       PAIR_STATUS=$(bluetoothctl info "${MAC}" | grep "Paired:" | awk '{print $2}')
       if [ "${PAIR_STATUS}" == "yes" ]; then
-         error_message "Device with MAC ${MAC} is already paired."
+         echo "Device with MAC ${MAC} is already paired."
          exit 1
       fi
     fi 
 
     echo -e "${YELLOW}"
-    echo -e "1. Turn on the VGC VR-N76"
+    echo -e "1. Turn off your ${DEVICE_NAME}"
-    echo -e "2. Goto Menu > Pairing and press OK"
+    echo -e "2. Turn on your ${DEVICE_NAME}"
-    read -p "3. Press [ENTER] when done."
+    echo -e "3. Goto Menu > Pairing and press OK"
+    echo -e "4. Press ${WHITE}[ENTER]${YELLOW} when done.${NC}"
+    read -p ""
 
-    info_message "Searching for ${DEVICE_NAME}..."
+    echo "Searching for ${DEVICE_NAME}..."
 
     HCI_OUT=$(hcitool scan | grep "${DEVICE_NAME}")
     if [ $? -ne 0 ]; then
-      error_message "Can't find ${DEVICE_NAME}. Make sure that the radio is on and in pairing mode."
+      echo "Can't find ${DEVICE_NAME}. Make sure that the radio is on and in pairing mode."
       exit 1
     fi
 
@@ -165,81 +202,106 @@ EOF
     sleep 1 && chmod 755 ${PAIR_SCRIPT} && expect ${PAIR_SCRIPT}
 
     ;;
-  unpair)
+  u|unpair)
     MAC=$(cat ${ACTIVE_RADIO} | jq -e -r .bluetooth.mac)
     if [ $? -ne 0 ]; then
-      error_message "No MAC found in radio configuration file."
+      echo "No MAC found in radio configuration file."
       exit 1
     fi 
 
     PAIR_STATUS=$(bluetoothctl info "${MAC}")
     if [ $? -ne 0 ]; then
-       error_message "No device with ${MAC} found. Can't unpair."
+       echo "No device with ${MAC} found. Can't unpair."
        exit 1
     fi
 
-    info_message "Unpairing ${DEVICE_NAME}..."
+    echo "Unpairing ${DEVICE_NAME}..."
     bluetoothctl untrust ${MAC}
     bluetoothctl remove ${MAC}
 
     echo -e "${YELLOW}"
-    echo -e "You may also want to remove this device from your VR-N76"
+    echo -e "You may also want to remove this device from your ${DEVICE_NAME}"
     echo -e "under Menu > General Settings > Connection > Paired Devices." 
     echo -e "${NC}"
 
     ;;
-  connect)
+  c|connect)
     get_mac_or_exit
 
     echo -e "${YELLOW}"
-    echo -e "1. Turn on the VGC VR-N76"
+    echo -e "1. Turn off your ${DEVICE_NAME}"
-    echo -e "2. Menu > General Settings > KISS TNC = checked"
+    echo -e "2. Turn on your ${DEVICE_NAME}"
-    read -p "3. Press [ENTER] when done."
+    echo -e "3. Goto Menu > General Settings > KISS TNC > Enable KISS TNC"
+    echo -e "4. Press ${WHITE}[ENTER]${YELLOW} when done.${NC}"
+    read -p ""
 
     is_paired=$(bluetoothctl info ${MAC} | grep "Paired" | awk '{print $2}')
     if [ "${is_paired}" != "yes" ]; then
     echo -e "${RED}"
-      et-log "VR-N76 is not paired. Run: '$(basename $0) pair'"
+      et-log "${DEVICE_NAME} is not paired. Run: '$(basename $0) pair'"
       echo -e "${NC}"
       exit 1
     fi  
  
-    echo -e "${GREEN}Found VR-N76 with MAC address: ${MAC}" 
+    echo -e "Found ${DEVICE_NAME} with MAC address: ${MAC}" 
-    stop_all_services
 
     update_ax25_conf 
 
-    echo -e "${BLUE}Connecting to radio..." 
     sudo rfcomm connect /dev/rfcomm0 ${MAC} 1>/dev/null 2>&1 &
 
     sleep 10 && reset
 
-    if [ -e /dev/rfcomm0 ]; then
+    if [[ ! -e "${BT_DEVICE}" ]]; then
-      echo -e "${GREEN}VR-N76 connected via Bluetooth serial${NC}" 
+      echo -e "${RED}Failed to connect via Bluetooth${NC}"
-    else
+      echo -e "${YELLOW}"
-      echo -e "${RED}VR-N76 failed to connect via Bluetooth serial${NC}"
+      echo -e "1. Try turning off and back on your radio."
+      echo -e "2. Check your radio and ensure that ${BLUE}$(hostname)${YELLOW} is listed under:"
+      echo -e "   Menu > General Settings> Connection > Paired Devices: $(hostname)."
+      echo -e ""
+      echo -e "   If it is not listed, re-run: ${WHITE}$(basename $0) pair${NC}\n"
       exit 1
     fi
 
-    echo -e "${BLUE}Connecting KISS interface using ${BT_DEVICE} and AX.25 port: ${AX25_PORT}${NC}"
+    stop_all_services
-    KISS_OUT=$(sudo kissattach ${BT_DEVICE} ${AX25_PORT})
 
-    if [ $? -eq 0 ]; then
+    echo -e "\nSelect a packet application to start:"
-      echo -e "${GREEN}Packet port ready"
+    options=("axcall" "QtTermTCP" "Winlink" "Exit")
-    else 
-      echo -e "${RED}Failed to setup radio for packet.${NC}"
-      exit 1
-    fi
 
-    KISS_OUT=$(sudo kissparms -c 1 -p ${AX25_PORT})
+    select opt in "${options[@]}"
+    do
+      case $opt in
+        "axcall")
+          do_kiss_attach
+          echo -e "${YELLOW}"
+          echo -e "SAMPLE COMMANDS               DESCRIPTION                     "
+          echo -e "----------------------------- --------------------------------"
+          echo -e "axcall wl2k <STATION>         Connect directly to a node      "
+          echo -e "axcall wl2k <STATION> <DIGI>  Connect to node via a digipeater"
+          echo -e "sudo axlisten -a -tttt -c     Monitor inbound and outbound traffic"
+          echo -e "${NC}"
 
-    echo -e "${YELLOW}"
+          # We can't have the rfcomm and kiss processes killed.
-    echo -e "SAMPLE COMMANDS                  DESCRIPTION                     "
+          CLEAN_UP=0
-    echo -e "-------------------------------  --------------------------------"
+          break
-    echo -e "axcall ${AX25_PORT} <STATION>    Connect directly to a node      "
+          ;;
-    echo -e "axcall ${AX25_PORT} <DIGI>       Connect to node via a digipeater"
+        "QtTermTCP")
-    echo -e "sudo axlisten -a -tttt -c        Monitor inbound and outbound traffic"
+          et-qttermtcp start 1>/dev/null 2>&1
-    echo -e "${NC}"
+          break
+          ;;
+        "Winlink")
+          do_kiss_attach
+          start_and_wait_for_service et-service-winlink-native-packet
+          min http://localhost:8080 1>/dev/null 2>&1
+          break
+          ;;
+        "Exit")
+          break
+          ;;
+        *)
+          echo "Invalid option, please select a number from the list."
+          ;;
+       esac
+    done
 
     ;;
   *)

scripts/install-base.sh

@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 16 March 2024
-# Updated : 11 February 2024
+# Updated : 28 February 2025
 # Purpose : Install base tools and configuration
 set -e
 
@@ -25,6 +25,7 @@ apt install \
   openjdk-20-jdk \
   openssh-server \
   screen \
+  socat \
   steghide \
   stow \
   xsel \