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
5 changed files with 46 additions and 37 deletions

View File

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