From ea0cbc5e1cc3b71c3176489d496da0b4f6609aa2 Mon Sep 17 00:00:00 2001 From: Allan Nathanson <42244061+Allan-N@users.noreply.github.com> Date: Sun, 5 Jan 2025 13:54:32 -0500 Subject: [PATCH] Add a new "Full-duplex node, that do not repeat audio" node type When creating new nodes we prompt for the general type of node. Our list of commonly used node types did not include a full-duplex node that does not repeat audio. This change adds a new type that will start a node off with defaults using the SimpleUSB channel driver and duplex=3. --- bin/node-setup | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/bin/node-setup b/bin/node-setup index e9414c2..11563d4 100755 --- a/bin/node-setup +++ b/bin/node-setup @@ -325,13 +325,11 @@ do_update_node_duplex() { fi newarr+=("$i" "${duplex_modes[$i]}" "$ONOFF") done - ((i++)) ANSWER=$(whiptail \ --title "$TITLE" \ --radiolist "Select the duplex type.\n\nUse the arrow keys to scroll and the space bar to select." \ - $WT_HEIGHT $WT_WIDTH \ - $i \ + $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \ "${newarr[@]}" \ 3>&1 1>&2 2>&3) if [[ $? -ne 0 ]]; then @@ -1964,10 +1962,11 @@ do_query_node_defaults() { --menu "What configuration settings should we use for node $CURRENT_NODE?" \ $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \ --ok-button "Select" \ - "1" "Hotspot (half duplex) with courtesy tones" \ - "2" "Hotspot (half duplex) with no courtesy tones" \ - "3" "Repeater or full duplex hotspot" \ - "4" "HUB w/no radio" \ + "1" "Half-duplex node (Hotspot) with telemetry tones" \ + "2" "Half-duplex node (Hotspot) with no telemetry tones" \ + "3" "Full-duplex node (Repeater or Hotspot)" \ + "4" "Full-duplex node, does not repeat audio" \ + "5" "HUB node w/no radio interface" \ "0" "None of the above (show all settings)" \ 3>&1 1>&2 2>&3) if [[ $? -ne 0 ]]; then @@ -1975,19 +1974,23 @@ do_query_node_defaults() { fi case "$ANSWER" in - 1) # Hotspot (half duplex) with courtesy tones + 1) # Half-duplex node (Hotspot) with telemetry tones NEW_INTERFACE_TYPE="SimpleUSB" NEW_DUPLEX=1 ;; - 2) # Hotspot (half duplex) with no courtesy tones + 2) # Half-duplex node (Hotspot) with no telemetry tones NEW_INTERFACE_TYPE="SimpleUSB" NEW_DUPLEX=0 ;; - 3) # Repeater or full duplex hotspot + 3) # Full-duplex node (Repeater or Hotspot) NEW_INTERFACE_TYPE="SimpleUSB" NEW_DUPLEX=2 ;; - 4) # Hub w/no radio + 4) # Full-duplex node, does not repeat audio + NEW_INTERFACE_TYPE="SimpleUSB" + NEW_DUPLEX=3 + ;; + 5) # HUB node w/no radio interface NEW_INTERFACE_TYPE="Pseudo" NEW_DUPLEX=2 ;; @@ -1998,7 +2001,7 @@ do_query_node_defaults() { esac case "$ANSWER" in - 1 | 2 | 3) + 1 | 2 | 3 | 4) do_query_node_interface short if [[ $? -ne 0 ]]; then return 1 @@ -2043,6 +2046,7 @@ do_node_set_defaults() { do_node_set_usrp ;; esac + CURRENT_INTERFACE_TYPE=$NEW_INTERFACE_TYPE fi if [[ -n "$NEW_DUPLEX" ]]; then