mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 13:15:40 -05:00
Change custom NXDN PN95 -* argument to -_ ; #318
Using -* exhibits unusual behavior and may read contents of directory and set any value based on what is in there; Don't use for future CLI arguments; Update Usage;
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
Build Version: AW 2025-204-g0060378
|
Build Version: AW 2025-207-gf8521fd
|
||||||
MBElib Version: 1.3.4
|
MBElib Version: 1.3.4
|
||||||
CODEC2 Support Enabled
|
CODEC2 Support Enabled
|
||||||
|
|
||||||
@@ -23,8 +23,6 @@ Input/Output options:
|
|||||||
rtl:dev:freq:gain:ppm:bw:sq:vol for rtl dongle (see below)
|
rtl:dev:freq:gain:ppm:bw:sq:vol for rtl dongle (see below)
|
||||||
tcp for tcp client SDR++/GNURadio Companion/Other (Port 7355)
|
tcp for tcp client SDR++/GNURadio Companion/Other (Port 7355)
|
||||||
tcp:192.168.7.5:7355 for custom address and port
|
tcp:192.168.7.5:7355 for custom address and port
|
||||||
m17udp for M17 UDP/IP socket bind input (default host 127.0.0.1; default port 17000)
|
|
||||||
m17udp:192.168.7.8:17001 for M17 UDP/IP bind input (Binding Address and Port
|
|
||||||
filename.bin for OP25/FME capture bin files
|
filename.bin for OP25/FME capture bin files
|
||||||
filename.wav for 48K/1 wav files (SDR++, GQRX)
|
filename.wav for 48K/1 wav files (SDR++, GQRX)
|
||||||
filename.wav -s 96000 for 96K/1 wav files (DSDPlus)
|
filename.wav -s 96000 for 96K/1 wav files (DSDPlus)
|
||||||
@@ -37,8 +35,6 @@ Input/Output options:
|
|||||||
null for no audio output
|
null for no audio output
|
||||||
udp for UDP socket blaster output (default host 127.0.0.1; default port 23456)
|
udp for UDP socket blaster output (default host 127.0.0.1; default port 23456)
|
||||||
udp:192.168.7.8:23470 for UDP socket blaster output (Target Address and Port
|
udp:192.168.7.8:23470 for UDP socket blaster output (Target Address and Port
|
||||||
m17udp for M17 UDP/IP socket blaster output (default host 127.0.0.1; default port 17000)
|
|
||||||
m17udp:192.168.7.8:17001 for M17 UDP/IP blaster output (Target Address and Port
|
|
||||||
-d <dir> Create mbe data files, use this directory (TDMA version is experimental)
|
-d <dir> Create mbe data files, use this directory (TDMA version is experimental)
|
||||||
-r <files> Read/Play saved mbe data from file(s)
|
-r <files> Read/Play saved mbe data from file(s)
|
||||||
-g <float> Audio Digital Output Gain (Default: 0 = Auto; )
|
-g <float> Audio Digital Output Gain (Default: 0 = Auto; )
|
||||||
@@ -81,26 +77,6 @@ RTL-SDR options:
|
|||||||
Example: dsd-fme -fs -i rtl -C cap_plus_channel.csv -T
|
Example: dsd-fme -fs -i rtl -C cap_plus_channel.csv -T
|
||||||
Example: dsd-fme -fp -i rtl:0:851.375M:22:-2:24:0:2
|
Example: dsd-fme -fp -i rtl:0:851.375M:22:-2:24:0:2
|
||||||
|
|
||||||
Encoder options:
|
|
||||||
-fZ M17 Stream Voice Encoder
|
|
||||||
Example: dsd-fme -fZ -M M17:9:DSD-FME:LWVMOBILE -i pulse -6 m17signal.wav -8 -N 2> m17encoderlog.txt
|
|
||||||
Run M17 Encoding, listening to pulse audio server, with internal decode/playback and output to 48k/1 wav file
|
|
||||||
|
|
||||||
Example: dsd-fme -fZ -M M17:9:DSD-FME:LWVMOBILE -i tcp -o pulse -8 -N 2> m17encoderlog.txt
|
|
||||||
Run M17 Encoding, listening to default tcp input, without internal decode/playback and output to 48k/1 analog output device
|
|
||||||
|
|
||||||
-fP M17 Packet Encoder
|
|
||||||
Example: dsd-fme -fP -M M17:9:DSD-FME:LWVMOBILE -6 m17pkt.wav -8 -S 'Hello World'
|
|
||||||
|
|
||||||
-fB M17 BERT Encoder
|
|
||||||
Example: dsd-fme -fB -M M17:9:DSD-FME:LWVMOBILE -6 m17bert.wav -8
|
|
||||||
|
|
||||||
-M M17 Encoding User Configuration String: M17:CAN:SRC:DST:INPUT_RATE:VOX (see examples above).
|
|
||||||
CAN 1-15; SRC and DST have to be no more than 9 UPPER base40 characters.
|
|
||||||
BASE40: ' ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/.'
|
|
||||||
Input Rate Default is 48000; Use Multiples of 8000 up to 48000.
|
|
||||||
VOX Enabled on 1; (Default = 0)
|
|
||||||
Values not entered into the M17: string are set to default values.
|
|
||||||
Decoder options:
|
Decoder options:
|
||||||
-fa Auto Detection
|
-fa Auto Detection
|
||||||
-fA Passive Analog Audio Monitor
|
-fA Passive Analog Audio Monitor
|
||||||
@@ -112,7 +88,6 @@ Decoder options:
|
|||||||
-fx Decode only X2-TDMA
|
-fx Decode only X2-TDMA
|
||||||
-fy Decode only YSF
|
-fy Decode only YSF
|
||||||
-fz Decode only M17*
|
-fz Decode only M17*
|
||||||
-fU Decode only M17 UDP/IP Frame***
|
|
||||||
-fi Decode only NXDN48* (6.25 kHz) / IDAS*
|
-fi Decode only NXDN48* (6.25 kHz) / IDAS*
|
||||||
-fn Decode only NXDN96* (12.5 kHz)
|
-fn Decode only NXDN96* (12.5 kHz)
|
||||||
-fp Decode only ProVoice*
|
-fp Decode only ProVoice*
|
||||||
@@ -128,16 +103,14 @@ Decoder options:
|
|||||||
-xx Expect non-inverted X2-TDMA signal
|
-xx Expect non-inverted X2-TDMA signal
|
||||||
-xr Expect inverted DMR signal
|
-xr Expect inverted DMR signal
|
||||||
-xd Expect inverted ICOM dPMR signal
|
-xd Expect inverted ICOM dPMR signal
|
||||||
-xz Expect inverted M17 signal
|
|
||||||
|
|
||||||
* denotes frame types that cannot be auto-detected.
|
* denotes frame types that cannot be auto-detected.
|
||||||
** Phase 2 Single Frequency may require user to manually set WACN/SYSID/CC parameters if MAC_SIGNAL not present.
|
** Phase 2 Single Frequency may require user to manually set WACN/SYSID/CC parameters if MAC_SIGNAL not present.
|
||||||
*** configure UDP Input with -i m17:127.0.0.1:17000
|
|
||||||
|
|
||||||
Advanced Decoder options:
|
Advanced Decoder options:
|
||||||
-X <hex> Manually Set P2 Parameters (WACN, SYSID, CC/NAC)
|
-X <hex> Manually Set P2 Parameters (WACN, SYSID, CC/NAC)
|
||||||
(-X BEE00ABC123)
|
(-X BEE00ABC123)
|
||||||
-* <dec> Manually Set NXDN PN95 Dibit Scrambler Seed (1-511)
|
-_ <dec> Manually Set NXDN PN95 Dibit Scrambler Seed (1-511)
|
||||||
(-* 261)
|
(-* 261)
|
||||||
-D <dec> Manually Set TIII DMR Location Area n bit len (0-10)(10 max)
|
-D <dec> Manually Set TIII DMR Location Area n bit len (0-10)(10 max)
|
||||||
(Value defaults to max n bit value for site model size)
|
(Value defaults to max n bit value for site model size)
|
||||||
@@ -152,7 +125,6 @@ Advanced Decoder options:
|
|||||||
Use this feature to allow MAC_SIGNAL even if CRC errors.
|
Use this feature to allow MAC_SIGNAL even if CRC errors.
|
||||||
-F Relax DMR RAS/CRC CSBK/DATA Pass/Fail
|
-F Relax DMR RAS/CRC CSBK/DATA Pass/Fail
|
||||||
Enabling on some systems could lead to bad channel assignments/site data decoding if bad or marginal signal
|
Enabling on some systems could lead to bad channel assignments/site data decoding if bad or marginal signal
|
||||||
-F Relax M17 LSF/PKT CRC Error Checking
|
|
||||||
|
|
||||||
-b <dec> Manually Enter Basic Privacy Key (Decimal Value of Key Number)
|
-b <dec> Manually Enter Basic Privacy Key (Decimal Value of Key Number)
|
||||||
(NOTE: This used to be the 'K' option!
|
(NOTE: This used to be the 'K' option!
|
||||||
|
|||||||
@@ -1496,7 +1496,7 @@
|
|||||||
printf ("Advanced Decoder options:\n");
|
printf ("Advanced Decoder options:\n");
|
||||||
printf (" -X <hex> Manually Set P2 Parameters (WACN, SYSID, CC/NAC)\n");
|
printf (" -X <hex> Manually Set P2 Parameters (WACN, SYSID, CC/NAC)\n");
|
||||||
printf (" (-X BEE00ABC123)\n");
|
printf (" (-X BEE00ABC123)\n");
|
||||||
printf (" -* <dec> Manually Set NXDN PN95 Dibit Scrambler Seed (1-511)\n");
|
printf (" -_ <dec> Manually Set NXDN PN95 Dibit Scrambler Seed (1-511)\n");
|
||||||
printf (" (-* 261)\n");
|
printf (" (-* 261)\n");
|
||||||
printf (" -D <dec> Manually Set TIII DMR Location Area n bit len (0-10)(10 max)\n");
|
printf (" -D <dec> Manually Set TIII DMR Location Area n bit len (0-10)(10 max)\n");
|
||||||
printf (" (Value defaults to max n bit value for site model size)\n");
|
printf (" (Value defaults to max n bit value for site model size)\n");
|
||||||
@@ -1884,7 +1884,7 @@
|
|||||||
|
|
||||||
exitflag = 0;
|
exitflag = 0;
|
||||||
|
|
||||||
while ((c = getopt (argc, argv, "~yhaepPqs:t:v:z:i:o:d:c:g:n:w:B:C:R:f:m:u:x:A:S:G:D:L:V:U:YK:b:H:X:NQ:WrlZTF@:!:01:2:345:6:^:7:8*:9:Ek:I:J:O+:")) != -1)
|
while ((c = getopt (argc, argv, "~yhaepPqs:t:v:z:i:o:d:c:g:n:w:B:C:R:f:m:u:x:A:S:G:D:L:V:U:YK:b:H:X:NQ:WrlZTF@:!:01:2:345:6:^:7:8_:9:Ek:I:J:O+:")) != -1)
|
||||||
{
|
{
|
||||||
|
|
||||||
switch (c)
|
switch (c)
|
||||||
@@ -1899,7 +1899,8 @@
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
//Free'd up switches include: j, M,
|
//Free'd up switches include: j, M,
|
||||||
//
|
//NOTE: Don't use -*, found it exhibits unusual behavior, was setting
|
||||||
|
//itself to -3 for some reason, may be reading contents of directory
|
||||||
|
|
||||||
//make sure to put a colon : after each if they need an argument
|
//make sure to put a colon : after each if they need an argument
|
||||||
//or remove colon if no argument required
|
//or remove colon if no argument required
|
||||||
@@ -2193,14 +2194,14 @@
|
|||||||
if (state.R > 0x7FFF) state.R = 0x7FFF;
|
if (state.R > 0x7FFF) state.R = 0x7FFF;
|
||||||
//disable keyloader in case user tries to use this and it at the same time
|
//disable keyloader in case user tries to use this and it at the same time
|
||||||
state.keyloader = 0;
|
state.keyloader = 0;
|
||||||
fprintf (stderr, "NXDN Scrambler Key set to: %05lld;", state.R);
|
fprintf (stderr, "NXDN Scrambler Key set to: %05lld; \n", state.R);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case '*':
|
case '_': //was *
|
||||||
sscanf (optarg, "%hu", &state.nxdn_pn95_seed);
|
sscanf (optarg, "%hu", &state.nxdn_pn95_seed);
|
||||||
if (state.nxdn_pn95_seed > 0x1FF) state.nxdn_pn95_seed = 0x1FF;
|
if (state.nxdn_pn95_seed > 0x1FF) state.nxdn_pn95_seed = 0x1FF;
|
||||||
else if (state.nxdn_pn95_seed == 0) state.nxdn_pn95_seed = 228;
|
else if (state.nxdn_pn95_seed == 0) state.nxdn_pn95_seed = 228;
|
||||||
fprintf (stderr, "NXDN PN9 Seed Value set to: %03d;", state.nxdn_pn95_seed);
|
fprintf (stderr, "NXDN PN95 Seed Value set to: %03d; \n", state.nxdn_pn95_seed);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'H':
|
case 'H':
|
||||||
|
|||||||
Reference in New Issue
Block a user