diff --git a/overlay/etc/skel/.reticulum/config.blueprint.mercury-only-node b/overlay/etc/skel/.reticulum/config.blueprint.mercury-only-node index 240fc0a..1d2907c 100644 --- a/overlay/etc/skel/.reticulum/config.blueprint.mercury-only-node +++ b/overlay/etc/skel/.reticulum/config.blueprint.mercury-only-node @@ -2,8 +2,7 @@ # Date : 16 July 2026 # Blueprint : Radio-Only Node, transport disabled # Purpose : This confguration is a blueprint for a radio-only node. -# It uses Mercury as the radio interface. If a supported -# et-lora device is detected, it will be enabled, too. +# It uses Mercury as the radio interface. [reticulum] @@ -82,51 +81,8 @@ [[Default Interface]] type = AutoInterface - enabled = No - - [[RNode LoRa Interface]] - type = RNodeInterface - mode = roaming - #enabled = {{ET_RETICULUM_INTERFACE_RNODE_ENABLED}} enabled = no - port = /dev/et-lora - - # Set frequency to 915 MHz - frequency = 915000000 - #frequency = {{ET_RETICULUM_INTERFACE_RNODE_FREQUENCY}} - - # Set LoRa bandwidth to 125 KHz - bandwidth = 125000 - #bandwidth = {{ET_RETICULUM_INTERFACE_RNODE_BANDWIDTH}} - - # Set TX power in dBm - # - # 7 dBm = 5 mW - # 10 dBm = 10 mW - # 14 dBm = 25 mW - # 17 dBm = 50 mW - # 20 dBm = 100 mW - # 22 dBm = 158 mW - # 24 dBm = 251 mW - # 27 dBm = 501 mW - # 28 dBm = 631 mW - # 30 dBm = 1000 mW (1 W) - txpower = {{ET_RETICULUM_INTERFACE_RNODE_TXPOWER}} - - # Select spreading factor 8. Valid - # range is 7 through 12, with 7 - # being the fastest and 12 having - # the longest range. - spreadingfactor = 9 - #spreadingfactor = {{ET_RETICULUM_INTERFACE_RNODE_SPREADINGFACTOR}} - - # Select coding rate 5. Valid range - # is 5 throough 8, with 5 being the - # fastest, and 8 the longest range. - codingrate = 5 - #codingrate = {{ET_RETICULUM_INTERFACE_RNODE_CODINGRATE}} - # See https://github.com/Rhizomatica/mercury/blob/mercuryv2/docs/RETICULUM.md [[Mercury HF]] type = TCPClientInterface diff --git a/overlay/etc/skel/.reticulum/config.blueprint.modem73-only-node b/overlay/etc/skel/.reticulum/config.blueprint.modem73-only-node index d547aeb..80b3245 100644 --- a/overlay/etc/skel/.reticulum/config.blueprint.modem73-only-node +++ b/overlay/etc/skel/.reticulum/config.blueprint.modem73-only-node @@ -3,8 +3,7 @@ # Updated : 16 July 2026 # Blueprint : Radio-Only Node, transport disabled # Purpose : This confguration is a blueprint for a radio-only node. -# It uses modem73 as the radio interface. If a supported -# et-lora device is detected, it will be enabled, too. +# It uses modem73 as the radio interface. [reticulum] @@ -85,48 +84,6 @@ type = AutoInterface enabled = no - [[RNode LoRa Interface]] - type = RNodeInterface - mode = roaming - enabled = {{ET_RETICULUM_INTERFACE_RNODE_ENABLED}} - - port = /dev/et-lora - - # Set frequency to 915 MHz - frequency = 915000000 - #frequency = {{ET_RETICULUM_INTERFACE_RNODE_FREQUENCY}} - - # Set LoRa bandwidth to 125 KHz - bandwidth = 125000 - #bandwidth = {{ET_RETICULUM_INTERFACE_RNODE_BANDWIDTH}} - - # Set TX power in dBm - # - # 7 dBm = 5 mW - # 10 dBm = 10 mW - # 14 dBm = 25 mW - # 17 dBm = 50 mW - # 20 dBm = 100 mW - # 22 dBm = 158 mW - # 24 dBm = 251 mW - # 27 dBm = 501 mW - # 28 dBm = 631 mW - # 30 dBm = 1000 mW (1 W) - txpower = {{ET_RETICULUM_INTERFACE_RNODE_TXPOWER}} - - # Select spreading factor 8. Valid - # range is 7 through 12, with 7 - # being the fastest and 12 having - # the longest range. - spreadingfactor = 9 - #spreadingfactor = {{ET_RETICULUM_INTERFACE_RNODE_SPREADINGFACTOR}} - - # Select coding rate 5. Valid range - # is 5 throough 8, with 5 being the - # fastest, and 8 the longest range. - codingrate = 5 - #codingrate = {{ET_RETICULUM_INTERFACE_RNODE_CODINGRATE}} - [[modem73]] type = Modem73Interface mode = roaming diff --git a/overlay/etc/skel/.reticulum/config.blueprint.packet-only-node b/overlay/etc/skel/.reticulum/config.blueprint.packet-only-node index df2c98a..d03764a 100644 --- a/overlay/etc/skel/.reticulum/config.blueprint.packet-only-node +++ b/overlay/etc/skel/.reticulum/config.blueprint.packet-only-node @@ -3,8 +3,7 @@ # Updated : 16 July 2026 # Blueprint : Radio-Only Node, transport disabled # Purpose : This confguration is a blueprint for a radio-only node. -# It uses an AX.25 KISS radio interface. If a supported -# et-lora device is detected, it will be enabled, too. +# It uses an AX.25 KISS radio interface. [reticulum] @@ -96,45 +95,3 @@ port = /tmp/kisstnc mtu = 256 - - [[RNode LoRa Interface]] - type = RNodeInterface - mode = roaming - enabled = {{ET_RETICULUM_INTERFACE_RNODE_ENABLED}} - - port = /dev/et-lora - - # Set frequency to 915 MHz - frequency = 915000000 - #frequency = {{ET_RETICULUM_INTERFACE_RNODE_FREQUENCY}} - - # Set LoRa bandwidth to 125 KHz - bandwidth = 125000 - #bandwidth = {{ET_RETICULUM_INTERFACE_RNODE_BANDWIDTH}} - - # Set TX power in dBm - # - # 7 dBm = 5 mW - # 10 dBm = 10 mW - # 14 dBm = 25 mW - # 17 dBm = 50 mW - # 20 dBm = 100 mW - # 22 dBm = 158 mW - # 24 dBm = 251 mW - # 27 dBm = 501 mW - # 28 dBm = 631 mW - # 30 dBm = 1000 mW (1 W) - txpower = {{ET_RETICULUM_INTERFACE_RNODE_TXPOWER}} - - # Select spreading factor 8. Valid - # range is 7 through 12, with 7 - # being the fastest and 12 having - # the longest range. - spreadingfactor = 9 - #spreadingfactor = {{ET_RETICULUM_INTERFACE_RNODE_SPREADINGFACTOR}} - - # Select coding rate 5. Valid range - # is 5 throough 8, with 5 being the - # fastest, and 8 the longest range. - codingrate = 5 - #codingrate = {{ET_RETICULUM_INTERFACE_RNODE_CODINGRATE}} diff --git a/overlay/opt/emcomm-tools/bin/et-reticulum b/overlay/opt/emcomm-tools/bin/et-reticulum index f420650..66ea060 100755 --- a/overlay/opt/emcomm-tools/bin/et-reticulum +++ b/overlay/opt/emcomm-tools/bin/et-reticulum @@ -108,6 +108,13 @@ if [[ $? -eq 0 ]]; then modem_options+=("modem73-fastest" "Fastest (Lowest Reliability) [QAM64]") fi + HAS_MERCURY_CONFIG=`grep "Mercury HF" ~/.reticulum/config` + if [[ $? -eq 0 ]]; then + modem_options+=("mercury-reliability" "Max reliability (Slower Speed) [DATAC1]") + modem_options+=("mercury-balanced" "Balanced (Reliability and Speed) [DATAC17]") + modem_options+=("mercury-fast" "Fast (Low Reliability) [QAM16C2]") + fi + modem_choice=$(dialog \ --clear \ --title "Reticulum Configuration" \ @@ -156,6 +163,18 @@ 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 + ;; *) et-log "No modem specified" ;; @@ -178,6 +197,19 @@ else fi sed -i "s|{{ET_RETICULUM_INTERFACE_MODEM73_ENABLED}}|${INTERFACE_MODEM73_ENABLED}|g" ${RETICULUM_CONF_FILE} +############################################################ +# Mercurcy HF interface updates +############################################################ + +# Enable/disable intereface based on PnP device detection +IS_MERCURY_RUNNING=`ps -ef | grep [m]ercury` +if [[ $? -eq 0 ]]; then + INTERFACE_MERCURY_ENABLED="yes" +else + INTERFACE_MERCURY_ENABLED="no" +fi +sed -i "s|{{ET_RETICULUM_INTERFACE_MERCURY_ENABLED}}|${INTERFACE_MERCURY_ENABLED}|g" ${RETICULUM_CONF_FILE} + ############################################################ # AX.25 KISS (Packet Radio) interface updates ############################################################