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

MSData Bug Fix; Disable DMR Data Superframe Debug;

This commit is contained in:
lwvmobile 2022-10-20 11:38:50 -04:00
parent 8f6796d6f6
commit 3086b7852e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dmr_data.c
View File

@ -87,6 +87,13 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
state->currentslot = cachdata[1];
//minor bugfix for MSData when MSData has accumulated data blocks
//(i.e. data header and 1/2 rate data), force all data into slot 0
if (state->dmr_ms_mode == 1)
{
state->currentslot = 0;
}
if (state->currentslot == 0 && state->dmr_ms_mode == 0)
{
state->slot1light[0] = '[';

6
src/dmr_sync.c
View File

@ -301,7 +301,7 @@ void Process34Data(dsd_opts * opts, dsd_state * state, unsigned char tdibits[98]
fprintf (stderr,"%s", KNRM); //change back to normal
}
//Full Super Frame - Debug Output
if (opts->payload == 1 && state->data_block_counter[state->currentslot] == state->data_header_blocks[state->currentslot])
if (opts->payload == 2 && state->data_block_counter[state->currentslot] == state->data_header_blocks[state->currentslot])
{
fprintf (stderr, "%s",KGRN);
fprintf (stderr, "\n Rate 3/4 Superframe - Slot [%d]\n ",slot+1);
@ -772,7 +772,7 @@ void Process1Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_t
}
//Full Super Frame - Debug Output
if (opts->payload == 1 && state->data_block_counter[state->currentslot] == state->data_header_blocks[state->currentslot])
if (opts->payload == 2 && state->data_block_counter[state->currentslot] == state->data_header_blocks[state->currentslot])
{
fprintf (stderr, "%s",KGRN);
fprintf (stderr, "\n Rate 1 Superframe - Slot [%d]\n ",slot+1);
@ -1457,7 +1457,7 @@ void Process12Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_
fprintf (stderr,"%s", KNRM);
}
//Full Super Frame - Debug Output
if (opts->payload == 1 && state->data_block_counter[state->currentslot] == state->data_header_blocks[state->currentslot])
if (opts->payload == 2 && state->data_block_counter[state->currentslot] == state->data_header_blocks[state->currentslot])
{
fprintf (stderr, "%s",KGRN);
fprintf (stderr, "\n Rate 1/2 Superframe - Slot [%d]\n ",slot+1);