DMR Additions

--Easier to use key entry for privacy modes
---Serpen'tera' 10 mode now available
--Slightly improved dmr dibit buffering/inverted dibit buffering
--Tweaks to console and ncurses output regarding FID, SVC, and privacy key values
--fix for RTL optional support (think I have all the ifdef covered now)
--TGT, SRC, FID, SVC, now set on Voice LC Header (not sure why I wasn't before)
--other misc tweaks that I can't recall
This commit is contained in:
lwvmobile
2022-08-21 23:45:00 -04:00
committed by GitHub
parent 7f34ff9340
commit df6d7a6609
11 changed files with 457 additions and 114 deletions

View File

@@ -144,6 +144,16 @@ noCarrier (dsd_opts * opts, dsd_state * state)
state->payload_keyid = 0;
state->payload_keyidR = 0;
state->dmr_fid = 0;
state->dmr_so = 0;
state->dmr_fidR = 0;
state->dmr_soR = 0;
state->HYTL = 0;
state->HYTR = 0;
state->DMRvcL = 0;
state->DMRvcR = 0;
state->payload_miN = 0;
state->p25vc = 0;
state->payload_miP = 0;
@@ -469,6 +479,7 @@ initState (dsd_state * state)
state->K = 0;
state->R = 0;
state->H = 0;
state->dmr_stereo = 0;
state->dmrburstL = 17; //initialize at higher value than possible
@@ -479,6 +490,11 @@ initState (dsd_state * state)
state->dmr_fidR = 0;
state->dmr_ms_mode = 0;
state->HYTL = 0;
state->HYTR = 0;
state->DMRvcL = 0;
state->DMRvcR = 0;
state->p25vc = 0;
state->payload_miP = 0;
@@ -616,6 +632,10 @@ usage ()
printf (" Use if skipping occurs, but may cause wonky audio due to loss of good sync\n");
printf (" -Z Log MBE/Frame Payloads to console\n");
printf ("\n");
printf (" -K <dec> Manually Enter DMRA BP Key (Decimal Value of Key Number)\n");
printf ("\n");
printf (" -H <hex> Manually Enter **tera 10 BP Key (40-Bit/10-Char Hex Value)\n");
printf ("\n");
exit (0);
}
@@ -854,7 +874,7 @@ main (int argc, char **argv)
exitflag = 0;
signal (SIGINT, sigfun);
while ((c = getopt (argc, argv, "haep:P:qstv:z:i:o:d:c:g:nw:B:C:R:f:m:u:x:A:S:M:G:D:L:V:U:Y:K:NQWrlZTF")) != -1)
while ((c = getopt (argc, argv, "haep:P:qstv:z:i:o:d:c:g:nw:B:C:R:f:m:u:x:A:S:M:G:D:L:V:U:Y:K:H:NQWrlZTF")) != -1)
{
opterr = 0;
switch (c)
@@ -933,6 +953,21 @@ main (int argc, char **argv)
}
break;
case 'H':
sscanf (optarg, "%llX", &state.H);
if (state.H > 0xFFFFFFFFFF)
{
state.H = 0xFFFFFFFFFF;
}
opts.dmr_mute_encL = 0;
opts.dmr_mute_encR = 0;
if (state.H == 0)
{
opts.dmr_mute_encL = 1;
opts.dmr_mute_encR = 1;
}
break;
case 'G': //Set rtl device gain
sscanf (optarg, "%d", &opts.rtl_gain_value); //multiple value by ten to make it consitent with the way rtl_fm really works
break;