From 5cf4885a94a1c59ee297597d4139377c9cb0fb8d Mon Sep 17 00:00:00 2001 From: thetechprepper Date: Wed, 26 Aug 2026 10:37:28 -0700 Subject: [PATCH] mercury - Updated all systemd service to user only three Mercury modes: ARQ, broadcast and custom --- ...service => et-service-mercury-arq.service} | 13 ++++++----- ...e => et-service-mercury-broadcast.service} | 15 ++++++------ ...vice => et-service-mercury-custom.service} | 7 +++--- .../et-service-mercury-reliability.service | 20 ---------------- overlay/opt/emcomm-tools/bin/et-kill-all | 9 ++++---- overlay/opt/emcomm-tools/bin/et-mode | 4 ++-- overlay/opt/emcomm-tools/bin/et-reticulum | 23 ++++--------------- 7 files changed, 30 insertions(+), 61 deletions(-) rename overlay/etc/skel/.config/systemd/user/{et-service-mercury-fast.service => et-service-mercury-arq.service} (70%) rename overlay/etc/skel/.config/systemd/user/{et-service-mercury-balanced.service => et-service-mercury-broadcast.service} (65%) rename overlay/etc/skel/.config/systemd/user/{et-service-mercury-winlink.service => et-service-mercury-custom.service} (71%) delete mode 100644 overlay/etc/skel/.config/systemd/user/et-service-mercury-reliability.service diff --git a/overlay/etc/skel/.config/systemd/user/et-service-mercury-fast.service b/overlay/etc/skel/.config/systemd/user/et-service-mercury-arq.service similarity index 70% rename from overlay/etc/skel/.config/systemd/user/et-service-mercury-fast.service rename to overlay/etc/skel/.config/systemd/user/et-service-mercury-arq.service index c66e698..84177f4 100644 --- a/overlay/etc/skel/.config/systemd/user/et-service-mercury-fast.service +++ b/overlay/etc/skel/.config/systemd/user/et-service-mercury-arq.service @@ -1,19 +1,20 @@ # Author : Gaston Gonzalez # Date : 16 July 2026 +# Updated : 26 August 2026 # Purpose : User systemd unit file for EmComm Tools that starts mercury -# : in a fast configuration. +# : in an ARQ configuration. # # Usage: -# Check status : systemctl --user status et-service-mercury-fast -# Start service : systemctl --user start et-service-mercury-fast -# Stop service : systemctl --user stop et-service-mercury-fast +# Check status : systemctl --user status et-service-mercury-arq +# Start service : systemctl --user start et-service-mercury-arq +# Stop service : systemctl --user stop et-service-mercury-arq # Reload this config : systemctl --user daemon-reload [Unit] -Description=EmComm Tools mercury default service for fast performance +Description=EmComm Tools Mercury HF service for ARQ mode [Service] -ExecStart=/opt/emcomm-tools/bin/et-mercury fast +ExecStart=/opt/emcomm-tools/bin/et-mercury arq Restart=no [Install] diff --git a/overlay/etc/skel/.config/systemd/user/et-service-mercury-balanced.service b/overlay/etc/skel/.config/systemd/user/et-service-mercury-broadcast.service similarity index 65% rename from overlay/etc/skel/.config/systemd/user/et-service-mercury-balanced.service rename to overlay/etc/skel/.config/systemd/user/et-service-mercury-broadcast.service index c1c9c7f..2f9b6d2 100644 --- a/overlay/etc/skel/.config/systemd/user/et-service-mercury-balanced.service +++ b/overlay/etc/skel/.config/systemd/user/et-service-mercury-broadcast.service @@ -1,19 +1,20 @@ # Author : Gaston Gonzalez # Date : 16 July 2026 -# Purpose : User systemd unit file for EmComm Tools that starts mercury -# : in a balanced configuration. +# Updated : 26 August 2026 +# Purpose : User systemd unit file for EmComm Tools that starts Mercury +# : in a broadcast configuration. # # Usage: -# Check status : systemctl --user status et-service-mercury-balanced -# Start service : systemctl --user start et-service-mercury-balanced -# Stop service : systemctl --user stop et-service-mercury-balanced +# Check status : systemctl --user status et-service-mercury-broadcast +# Start service : systemctl --user start et-service-mercury-broadcast +# Stop service : systemctl --user stop et-service-mercury-broadcast # Reload this config : systemctl --user daemon-reload [Unit] -Description=EmComm Tools mercury default service for balanced performance +Description=EmComm Tools Mercury HF service for broadcast mode [Service] -ExecStart=/opt/emcomm-tools/bin/et-mercury balanced +ExecStart=/opt/emcomm-tools/bin/et-mercury broadcast Restart=no [Install] diff --git a/overlay/etc/skel/.config/systemd/user/et-service-mercury-winlink.service b/overlay/etc/skel/.config/systemd/user/et-service-mercury-custom.service similarity index 71% rename from overlay/etc/skel/.config/systemd/user/et-service-mercury-winlink.service rename to overlay/etc/skel/.config/systemd/user/et-service-mercury-custom.service index 24bbef7..84873e5 100644 --- a/overlay/etc/skel/.config/systemd/user/et-service-mercury-winlink.service +++ b/overlay/etc/skel/.config/systemd/user/et-service-mercury-custom.service @@ -1,7 +1,8 @@ # Author : Gaston Gonzalez # Date : 12 August 2026 +# Updated : 26 August 2026 # Purpose : User systemd unit file for EmComm Tools that starts mercury -# : in a Winlink configuration. +# : in a custom, user-defined configuration. # # Usage: # Check status : systemctl --user status et-service-mercury-winlink @@ -10,10 +11,10 @@ # Reload this config : systemctl --user daemon-reload [Unit] -Description=EmComm Tools mercury default service for winlink performance +Description=EmComm Tools Mercury HF service in a custom mode [Service] -ExecStart=/opt/emcomm-tools/bin/et-mercury winlink +ExecStart=/opt/emcomm-tools/bin/et-mercury custom Restart=no [Install] diff --git a/overlay/etc/skel/.config/systemd/user/et-service-mercury-reliability.service b/overlay/etc/skel/.config/systemd/user/et-service-mercury-reliability.service deleted file mode 100644 index 44a9664..0000000 --- a/overlay/etc/skel/.config/systemd/user/et-service-mercury-reliability.service +++ /dev/null @@ -1,20 +0,0 @@ -# Author : Gaston Gonzalez -# Date : 16 July 2026 -# Purpose : User systemd unit file for EmComm Tools that starts mercury -# : in a reliability configuration. -# -# Usage: -# Check status : systemctl --user status et-service-mercury-reliability -# Start service : systemctl --user start et-service-mercury-reliability -# Stop service : systemctl --user stop et-service-mercury-reliability -# Reload this config : systemctl --user daemon-reload - -[Unit] -Description=EmComm Tools mercury default service for reliability performance - -[Service] -ExecStart=/opt/emcomm-tools/bin/et-mercury reliability -Restart=no - -[Install] -WantedBy=multi-user.target diff --git a/overlay/opt/emcomm-tools/bin/et-kill-all b/overlay/opt/emcomm-tools/bin/et-kill-all index 389edf3..6a4e7e0 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 : 23 August 2026 +# Updated : 26 August 2026 # Purpose : Stops all EmComm Tools soundcard-based services (i.e. modems) # and radio applications to ensure a clean start for the next mode. @@ -40,10 +40,9 @@ stop_all_services() { pkill -9 modem73 # Stop the Mercury HF modem - systemctl --user stop et-service-mercury-balanced - systemctl --user stop et-service-mercury-reliability - systemctl --user stop et-service-mercury-fast - systemctl --user stop et-service-mercury-winlink + systemctl --user stop et-service-mercury-arq + systemctl --user stop et-service-mercury-broadcast + systemctl --user stop et-service-mercury-custom pkill mercury # Stop VARA with a sledge hammer diff --git a/overlay/opt/emcomm-tools/bin/et-mode b/overlay/opt/emcomm-tools/bin/et-mode index a57a262..8071909 100755 --- a/overlay/opt/emcomm-tools/bin/et-mode +++ b/overlay/opt/emcomm-tools/bin/et-mode @@ -2,7 +2,7 @@ # # Author : Gaston Gonzalez # Date : 6 November 2024 -# Updated : 23 August 2026 +# Updated : 26 August 2026 # Purpose : Configures the system for a specific mode of operation # Use a simple text file to save the state of the last mode selected @@ -256,7 +256,7 @@ if [ $exit_status -eq 0 ]; then ;; ${MODE_ID_WINLINK_MERCURY}) et-log "Using Mercury as the modem." - start_and_wait_for_service et-service-mercury-winlink + start_and_wait_for_service et-service-mercury-arq start_and_wait_for_service et-service-winlink-mercury min http://localhost:8080 ;; diff --git a/overlay/opt/emcomm-tools/bin/et-reticulum b/overlay/opt/emcomm-tools/bin/et-reticulum index 7aa2e28..24746ca 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 : 21 July 2026 +# Updated : 26 August 2026 # Purpose : Wrapper script for starting Reticulum with PnP support # # Preconditions: @@ -111,12 +111,7 @@ if [[ $? -eq 0 ]]; then HAS_MERCURY_CONFIG=`grep "Mercury HF" ~/.reticulum/config` if [[ $? -eq 0 ]]; then - modem_options+=("mercury-reliability" "Max reliability (Slower Speed) [DATAC1]") - # The modes below, DATAC17 and QAM16C2, are documented on the RETICULUM.md - # documenation on the mercury GitHub project, but are not yet supported in - # version 1.9.9. Disabling these options from the UI for now. - #modem_options+=("mercury-balanced" "Balanced (Reliability and Speed) [DATAC17]") - #modem_options+=("mercury-fast" "Fast (Low Reliability) [QAM16C2]") + modem_options+=("mercury-broadcast" "Mercury Broadcast Mode") fi if [[ ${#modem_options[@]} -gt 0 ]]; then @@ -178,17 +173,9 @@ if [[ $? -eq 0 ]]; then et-log "Starting modem73 in fastest mode" start_and_wait_for_service et-service-modem73-fastest ;; - mercury-reliability) - et-log "Starting mercury in reliability mode" - start_and_wait_for_service et-service-mercury-reliability - ;; - mercury-balanced) - et-log "Starting mercury in balanced mode" - start_and_wait_for_service et-service-mercury-balanced - ;; - mercury-fast) - et-log "Starting mercury in fast mode" - start_and_wait_for_service et-service-mercury-fast + mercury-broadcast) + et-log "Starting mercury in broadcast mode" + start_and_wait_for_service et-service-mercury-broadcast ;; esac fi