ua1zbe
/
dsd-fme_18_05_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '20271c6df57dacbaed3f2255a8230f44f58bd3ae' 

Apparently when 1.6.0 was release it was not properly merged. This re-add the disable p25 encryption muting flag.

Conflicts:
	README
	dsd.h
	dsd_main.c
	dsd_symbol.c
	p25p1_ldu1.c
	p25p1_ldu2.c
This commit is contained in:
Jared Szechy 2013-12-19 09:57:23 -05:00
parent 16110bd251 20271c6df5
commit e3dde6f7f9
5 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -495,10 +495,12 @@ rate and serial port device if necessary.
-fp Decode only ProVoice* -fp Decode only ProVoice*
-fr Decode only DMR/MOTOTRBO -fr Decode only DMR/MOTOTRBO
-fx Decode only X2-TDMA -fx Decode only X2-TDMA
-l Disable Filters (not recommended)
-ma Auto-select modulation optimizations (default) -ma Auto-select modulation optimizations (default)
-mc Use only C4FM modulation optimizations -mc Use only C4FM modulation optimizations
-mg Use only GFSK modulation optimizations -mg Use only GFSK modulation optimizations
-mq Use only QPSK modulation optimizations -mq Use only QPSK modulation optimizations
-pu Unmute Encrypted P25
-u <num> Unvoiced speech quality (default=3) -u <num> Unvoiced speech quality (default=3)
-xx Expect non-inverted X2-TDMA signal -xx Expect non-inverted X2-TDMA signal
-xr Expect inverted DMR/MOTOTRBO signal -xr Expect inverted DMR/MOTOTRBO signal

1
dsd.h
View File

@ -100,6 +100,7 @@ typedef struct
int playfiles; int playfiles;
int delay; int delay;
int use_cosine_filter; int use_cosine_filter;
int unmute_encrypted_p25;
} dsd_opts; } dsd_opts;
typedef struct typedef struct

6
dsd_main.c
View File

@ -129,6 +129,7 @@ initOpts (dsd_opts * opts)
opts->playfiles = 0; opts->playfiles = 0;
opts->delay = 0; opts->delay = 0;
opts->use_cosine_filter = 1; opts->use_cosine_filter = 1;
opts->unmute_encrypted_p25 = 0;
} }
void void
@ -269,6 +270,7 @@ usage ()
printf (" -mc Use only C4FM modulation optimizations\n"); printf (" -mc Use only C4FM modulation optimizations\n");
printf (" -mg Use only GFSK modulation optimizations\n"); printf (" -mg Use only GFSK modulation optimizations\n");
printf (" -mq Use only QPSK modulation optimizations\n"); printf (" -mq Use only QPSK modulation optimizations\n");
printf (" -pu Unmute Encrypted P25\n");
printf (" -u <num> Unvoiced speech quality (default=3)\n"); printf (" -u <num> Unvoiced speech quality (default=3)\n");
printf (" -xx Expect non-inverted X2-TDMA signal\n"); printf (" -xx Expect non-inverted X2-TDMA signal\n");
printf (" -xr Expect inverted DMR/MOTOTRBO signal\n"); printf (" -xr Expect inverted DMR/MOTOTRBO signal\n");
@ -376,6 +378,10 @@ main (int argc, char **argv)
{ {
opts.p25tg = 1; opts.p25tg = 1;
} }
else if (optarg[0] == 'u')
{
opts.unmute_encrypted_p25 = 1;
}
break; break;
case 'q': case 'q':
opts.errorbars = 0; opts.errorbars = 0;

2
p25p1_ldu1.c
View File

@ -77,7 +77,7 @@ processLDU1 (dsd_opts * opts, dsd_state * state)
y++; y++;
z++; z++;
} }
if (state->p25kid == 0) if (state->p25kid == 0 || opts->unmute_encrypted_p25 == 1)
{ {
processMbeFrame (opts, state, imbe_fr, NULL, NULL); processMbeFrame (opts, state, imbe_fr, NULL, NULL);
} }

2
p25p1_ldu2.c
View File

@ -80,7 +80,7 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
y++; y++;
z++; z++;
} }
if (state->p25kid == 0) if (state->p25kid == 0 || opts->unmute_encrypted_p25 == 1)
{ {
processMbeFrame (opts, state, imbe_fr, NULL, NULL); processMbeFrame (opts, state, imbe_fr, NULL, NULL);
} }