diff --git a/overlay/opt/emcomm-tools/conf/radios.d/bg2fx-fx4cr.json b/overlay/opt/emcomm-tools/conf/radios.d/bg2fx-fx4cr.json index 15a587c..e1d75ae 100644 --- a/overlay/opt/emcomm-tools/conf/radios.d/bg2fx-fx4cr.json +++ b/overlay/opt/emcomm-tools/conf/radios.d/bg2fx-fx4cr.json @@ -5,20 +5,24 @@ "rigctrl": { "id": "2031", "baud": "115200", - "ptt": "RTS", + "ptt": "RIG", + "conf": "data_bits=8,serial_handshake=None,stop_bits=1,rts_state=OFF", "pttOnly": "false" }, "notes": [ - "THESE NOTES ARE A WORK IN PROGRESS", "Short press [PWR], then rotate AF knob until POW = 5.0", "Toggle [SSB] button until both USB and DIG appear", "Short press [M. V] until VFOA is displayed", + "Long press [MENU], rotate AF to BLUETOOTH, rotate TUNE and set to 0", "Set radio volume to 50", - "Set mic gain to ?", - "Set alsamixer PCM to ?", - "Set alsamixer Mic to 50", + "Set mic gain to 50", + "Set alsamixer PCM to 21", + "Set alsamixer Mic to 55", "Set alsamixer AFC to mm" ], "fieldNotes": [ + "Tested with FX-4CR firmware version: 1.7.3 (2025/09/01)", + "You must force the RTS control line to low for audio output to work with the PTT", + "This is handled with rts_state=OFF using the --set-conf argument of rigctld" ] } diff --git a/overlay/opt/emcomm-tools/sbin/wrapper-rigctld.sh b/overlay/opt/emcomm-tools/sbin/wrapper-rigctld.sh index 1c1b9ab..534dd99 100755 --- a/overlay/opt/emcomm-tools/sbin/wrapper-rigctld.sh +++ b/overlay/opt/emcomm-tools/sbin/wrapper-rigctld.sh @@ -2,13 +2,16 @@ # # Author : Gaston Gonzalez # Date : 9 October 2024 -# Updated : 31 May 2025 +# Updated : 26 September 2025 # Purpose : Wrapper startup/shutdown script around systemd/rigctld ET_HOME=/opt/emcomm-tools ACTIVE_RADIO="${ET_HOME}/conf/radios.d/active-radio.json" CAT_DEVICE=/dev/et-cat +# Additional configuration to pass to rigctld +SET_CONF="" + do_full_auto() { et-log "Found ET_DEVICE='${ET_DEVICE}'" @@ -95,8 +98,14 @@ start() { exit 0 fi + # Handle optional configuration settings + CONF=$(jq -e -r '.rigctrl.conf' "${ET_HOME}/conf/radios.d/active-radio.json") + if [[ $? -eq 0 ]]; then + SET_CONF="--set-conf=${CONF}" + fi + # Generate command - CMD="rigctld -m ${ID} -r ${CAT_DEVICE} -s ${BAUD} -P ${PTT} " + CMD="rigctld -m ${ID} -r ${CAT_DEVICE} -s ${BAUD} -P ${PTT} ${SET_CONF}" et-log "Starting rigctld with: ${CMD}" $CMD }