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

DMR: Fix Color Code Assignment, Display, and Logging;

This commit is contained in:
lwvmobile 2024-04-21 17:49:46 -04:00
parent 0f3dcf47ea
commit bc205cfe00
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dmr_bs.c
View File

@ -392,8 +392,9 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
}
if (opts->inverted_dmr == 0) sprintf (polarity, "%s", "+");
else sprintf (polarity, "%s", "-");
fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC%d ", polarity, light, state->dmr_color_code, vc);
if (state->dmr_color_code != 16)
fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC%d ", polarity, light, state->dmr_color_code, vc);
else fprintf (stderr,"Sync: %sDMR %s| Color Code=XX | VC%d ", polarity, light, vc);
if (internalslot == 0 && vc1 == 6)
{
@ -818,8 +819,9 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
}
if (opts->inverted_dmr == 0) sprintf (polarity, "%s", "+");
else sprintf (polarity, "%s", "-");
fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC1*", polarity, light, state->dmr_color_code);
if (state->dmr_color_code != 16)
fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC1*", polarity, light, state->dmr_color_code);
else fprintf (stderr,"Sync: %sDMR %s| Color Code=XX | VC1*", polarity, light);
dmr_alg_reset (opts, state);

7
src/dmr_dburst.c
View File

@ -207,7 +207,12 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
if (databurst != 0xEB)
{
if (state->dmr_ms_mode == 0) fprintf(stderr, "| Color Code=%02d ", state->dmr_color_code);
if (state->dmr_ms_mode == 0)
{
if (state->dmr_color_code != 16)
fprintf(stderr, "| Color Code=%02d ", state->dmr_color_code);
else fprintf(stderr, "| Color Code=XX ");
}
fprintf(stderr, "|%s", state->fsubtype);
//'DSP' output to file

8
src/dmr_ms.c
View File

@ -571,7 +571,9 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
fprintf (stderr,"Sync: +DMR MS/DM MODE/MONO ");
}
else fprintf (stderr,"Sync: -DMR MS/DM MODE/MONO ");
if (state->dmr_color_code != 16)
fprintf (stderr, "| Color Code=%02d ", state->dmr_color_code);
else fprintf (stderr, "| Color Code=XX ");
fprintf (stderr, "| VC* ");
fprintf (stderr, "\n");
@ -694,7 +696,9 @@ void dmrMSData (dsd_opts * opts, dsd_state * state)
fprintf (stderr,"Sync: +DMR MS/DM MODE/MONO ");
}
else fprintf (stderr,"Sync: -DMR MS/DM MODE/MONO ");
if (state->dmr_color_code != 16)
fprintf (stderr, "| Color Code=%02d ", state->dmr_color_code);
else fprintf (stderr, "| Color Code=XX ");
sprintf(state->slot1light, "%s", "");
sprintf(state->slot2light, "%s", "");

2
src/dsd_main.c
View File

@ -1234,7 +1234,7 @@ initState (dsd_state * state)
state->codec2_1600 = codec2_create(CODEC2_MODE_1600);
#endif
state->dmr_color_code = 15;
state->dmr_color_code = 16;
} //init_state

2
src/dsd_ncurses.c
View File

@ -2044,7 +2044,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
}
//DMR CC
if (state->color_code_ok && state->dmr_color_code != -1 && (lls == 12 || lls == 13 || lls == 10 || lls == 11 || lls == 32 || lls == 33) )
if (state->color_code_ok && state->dmr_color_code != 16 && (lls == 12 || lls == 13 || lls == 10 || lls == 11 || lls == 32 || lls == 33) )
{
dcc = state->dmr_color_code;
}