From 68aa6b018ebb672913ecfb20eb16005a6643d507 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 22 Mar 2024 02:19:38 -0400 Subject: [PATCH] EDACS: Update Docs to Reflect Changes; --- examples/Example_Usage.md | 15 +++++++++++---- examples/trunking.sh | 18 +++++++++++++++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/examples/Example_Usage.md b/examples/Example_Usage.md index e68f868..66ab869 100644 --- a/examples/Example_Usage.md +++ b/examples/Example_Usage.md @@ -8,7 +8,11 @@ -fa Legacy Auto (not recommended) -fi NXDN48 -fn NXDN96 --fp EDACS/Provoice +-fp Provoice +-fh EDACS Standard / Network +-fH EDACS Standard / Network with ESK +-fe EDACS Extended Addresssing +-fE EDACS Extended Addressing with ESK -fm dPMR, also may need to use -xd if inverted dPMR. -f1 P25P1 -f2 P25P2 (may need to specify wacn/sys/nac manually if traffic channel) @@ -100,11 +104,11 @@ and in a second terminal tab, same folder, run EDACS Trunking (w/ channel map import) ---EDACS/PV Trunking using RIGCTL and TCP Direct Link Audio inside of SDR++ (Tested and Working on EDACS/EDACS-EA with Provoice, Analog Voice Monitoring and Per Call is Experimental) +--EDACS/PV Trunking using RIGCTL and TCP Direct Link Audio inside of SDR++ (see switches above for STD/NET, EA, and ESK modes) -`dsd-fme -i tcp -fp -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans` +`dsd-fme -i tcp -fE -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans` ---NXDN48 Trunking (standard band plan) with SDR++ (untested for frequency accuracy) +--NXDN48 Trunking (Direct Frequency Assignment) with SDR++ (untested for frequency accuracy) `dsd-fme -fi -i tcp -T -U 4532 -N 2> log.ans` @@ -202,6 +206,9 @@ l - Hold TG in Slot 2 on TDMA Systems, or clear current hold C - Drop Call and Return to CC during trunking operation L - Manual Cycle Forward Channel Tuned when RIGCTL or using RTL input and channel csv loaded +S - Toggle Between EDACS Standard/Network and Extended Addressing Mode +A - Toggle EDACS ESK Mask + ``` ## Sending Audio to a Icecast 2 Server via FFmpeg (Windows) diff --git a/examples/trunking.sh b/examples/trunking.sh index cb8152e..7053097 100644 --- a/examples/trunking.sh +++ b/examples/trunking.sh @@ -17,9 +17,21 @@ dsd-fme -fs -i tcp -U 4532 -T -C dmr_t3_chan.csv -G group.csv -N 2> log.ans #dsd-fme -fs -i rtl:0:450M:44:-2:8 -T -C connect_plus_chan.csv -G group.csv -N 2> log.ans -#EDACS/EDACS-EA Digital Only -#dsd-fme -fp -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans -#dsd-fme -fp -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans +#EDACS Standard Network Analog and Digital +#dsd-fme -fh -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans +#dsd-fme -fh -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans + +#EDACS Standard Network Analog and Digital (with ESK) +#dsd-fme -fH -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans +#dsd-fme -fH -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans + +#EDACS Extended Address Analog and Digital +#dsd-fme -fe -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans +#dsd-fme -fe -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans + +#EDACS Extended Address Analog and Digital (with ESK) +#dsd-fme -fE -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans +#dsd-fme -fE -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans #NXDN48 Type-C or Type-D Trunking with Channel Map #dsd-fme -fi -i tcp -T -U 4532 -C nxdn_channel_map.csv -N 2> log.ans