mirror of
https://github.com/thetechprepper/emcomm-tools-os-community.git
synced 2026-09-17 15:41:44 -04:00
mercury - Updated all systemd service to user only three Mercury modes: ARQ, broadcast and custom
This commit is contained in:
+7
-6
@@ -1,19 +1,20 @@
|
|||||||
# Author : Gaston Gonzalez
|
# Author : Gaston Gonzalez
|
||||||
# Date : 16 July 2026
|
# Date : 16 July 2026
|
||||||
|
# Updated : 26 August 2026
|
||||||
# Purpose : User systemd unit file for EmComm Tools that starts mercury
|
# Purpose : User systemd unit file for EmComm Tools that starts mercury
|
||||||
# : in a fast configuration.
|
# : in an ARQ configuration.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# Check status : systemctl --user status et-service-mercury-fast
|
# Check status : systemctl --user status et-service-mercury-arq
|
||||||
# Start service : systemctl --user start et-service-mercury-fast
|
# Start service : systemctl --user start et-service-mercury-arq
|
||||||
# Stop service : systemctl --user stop et-service-mercury-fast
|
# Stop service : systemctl --user stop et-service-mercury-arq
|
||||||
# Reload this config : systemctl --user daemon-reload
|
# Reload this config : systemctl --user daemon-reload
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=EmComm Tools mercury default service for fast performance
|
Description=EmComm Tools Mercury HF service for ARQ mode
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/opt/emcomm-tools/bin/et-mercury fast
|
ExecStart=/opt/emcomm-tools/bin/et-mercury arq
|
||||||
Restart=no
|
Restart=no
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
+8
-7
@@ -1,19 +1,20 @@
|
|||||||
# Author : Gaston Gonzalez
|
# Author : Gaston Gonzalez
|
||||||
# Date : 16 July 2026
|
# Date : 16 July 2026
|
||||||
# Purpose : User systemd unit file for EmComm Tools that starts mercury
|
# Updated : 26 August 2026
|
||||||
# : in a balanced configuration.
|
# Purpose : User systemd unit file for EmComm Tools that starts Mercury
|
||||||
|
# : in a broadcast configuration.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# Check status : systemctl --user status et-service-mercury-balanced
|
# Check status : systemctl --user status et-service-mercury-broadcast
|
||||||
# Start service : systemctl --user start et-service-mercury-balanced
|
# Start service : systemctl --user start et-service-mercury-broadcast
|
||||||
# Stop service : systemctl --user stop et-service-mercury-balanced
|
# Stop service : systemctl --user stop et-service-mercury-broadcast
|
||||||
# Reload this config : systemctl --user daemon-reload
|
# Reload this config : systemctl --user daemon-reload
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=EmComm Tools mercury default service for balanced performance
|
Description=EmComm Tools Mercury HF service for broadcast mode
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/opt/emcomm-tools/bin/et-mercury balanced
|
ExecStart=/opt/emcomm-tools/bin/et-mercury broadcast
|
||||||
Restart=no
|
Restart=no
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
+4
-3
@@ -1,7 +1,8 @@
|
|||||||
# Author : Gaston Gonzalez
|
# Author : Gaston Gonzalez
|
||||||
# Date : 12 August 2026
|
# Date : 12 August 2026
|
||||||
|
# Updated : 26 August 2026
|
||||||
# Purpose : User systemd unit file for EmComm Tools that starts mercury
|
# Purpose : User systemd unit file for EmComm Tools that starts mercury
|
||||||
# : in a Winlink configuration.
|
# : in a custom, user-defined configuration.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# Check status : systemctl --user status et-service-mercury-winlink
|
# Check status : systemctl --user status et-service-mercury-winlink
|
||||||
@@ -10,10 +11,10 @@
|
|||||||
# Reload this config : systemctl --user daemon-reload
|
# Reload this config : systemctl --user daemon-reload
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=EmComm Tools mercury default service for winlink performance
|
Description=EmComm Tools Mercury HF service in a custom mode
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/opt/emcomm-tools/bin/et-mercury winlink
|
ExecStart=/opt/emcomm-tools/bin/et-mercury custom
|
||||||
Restart=no
|
Restart=no
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
@@ -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
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Author : Gaston Gonzalez
|
# Author : Gaston Gonzalez
|
||||||
# Date : 12 November 2024
|
# Date : 12 November 2024
|
||||||
# Updated : 23 August 2026
|
# Updated : 26 August 2026
|
||||||
# Purpose : Stops all EmComm Tools soundcard-based services (i.e. modems)
|
# Purpose : Stops all EmComm Tools soundcard-based services (i.e. modems)
|
||||||
# and radio applications to ensure a clean start for the next mode.
|
# and radio applications to ensure a clean start for the next mode.
|
||||||
|
|
||||||
@@ -40,10 +40,9 @@ stop_all_services() {
|
|||||||
pkill -9 modem73
|
pkill -9 modem73
|
||||||
|
|
||||||
# Stop the Mercury HF modem
|
# Stop the Mercury HF modem
|
||||||
systemctl --user stop et-service-mercury-balanced
|
systemctl --user stop et-service-mercury-arq
|
||||||
systemctl --user stop et-service-mercury-reliability
|
systemctl --user stop et-service-mercury-broadcast
|
||||||
systemctl --user stop et-service-mercury-fast
|
systemctl --user stop et-service-mercury-custom
|
||||||
systemctl --user stop et-service-mercury-winlink
|
|
||||||
pkill mercury
|
pkill mercury
|
||||||
|
|
||||||
# Stop VARA with a sledge hammer
|
# Stop VARA with a sledge hammer
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Author : Gaston Gonzalez
|
# Author : Gaston Gonzalez
|
||||||
# Date : 6 November 2024
|
# Date : 6 November 2024
|
||||||
# Updated : 23 August 2026
|
# Updated : 26 August 2026
|
||||||
# Purpose : Configures the system for a specific mode of operation
|
# Purpose : Configures the system for a specific mode of operation
|
||||||
|
|
||||||
# Use a simple text file to save the state of the last mode selected
|
# 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})
|
${MODE_ID_WINLINK_MERCURY})
|
||||||
et-log "Using Mercury as the modem."
|
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
|
start_and_wait_for_service et-service-winlink-mercury
|
||||||
min http://localhost:8080
|
min http://localhost:8080
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Author : Gaston Gonzalez
|
# Author : Gaston Gonzalez
|
||||||
# Date : 12 May 2026
|
# Date : 12 May 2026
|
||||||
# Updated : 21 July 2026
|
# Updated : 26 August 2026
|
||||||
# Purpose : Wrapper script for starting Reticulum with PnP support
|
# Purpose : Wrapper script for starting Reticulum with PnP support
|
||||||
#
|
#
|
||||||
# Preconditions:
|
# Preconditions:
|
||||||
@@ -111,12 +111,7 @@ if [[ $? -eq 0 ]]; then
|
|||||||
|
|
||||||
HAS_MERCURY_CONFIG=`grep "Mercury HF" ~/.reticulum/config`
|
HAS_MERCURY_CONFIG=`grep "Mercury HF" ~/.reticulum/config`
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
modem_options+=("mercury-reliability" "Max reliability (Slower Speed) [DATAC1]")
|
modem_options+=("mercury-broadcast" "Mercury Broadcast Mode")
|
||||||
# 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]")
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${#modem_options[@]} -gt 0 ]]; then
|
if [[ ${#modem_options[@]} -gt 0 ]]; then
|
||||||
@@ -178,17 +173,9 @@ if [[ $? -eq 0 ]]; then
|
|||||||
et-log "Starting modem73 in fastest mode"
|
et-log "Starting modem73 in fastest mode"
|
||||||
start_and_wait_for_service et-service-modem73-fastest
|
start_and_wait_for_service et-service-modem73-fastest
|
||||||
;;
|
;;
|
||||||
mercury-reliability)
|
mercury-broadcast)
|
||||||
et-log "Starting mercury in reliability mode"
|
et-log "Starting mercury in broadcast mode"
|
||||||
start_and_wait_for_service et-service-mercury-reliability
|
start_and_wait_for_service et-service-mercury-broadcast
|
||||||
;;
|
|
||||||
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
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user