GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-12 16:57:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

M17 - Fix PKT Decoder PBC to Internal Counter;

Browse Source
This commit is contained in:
lwvmobile
2024-03-12 22:05:17 -04:00
parent 106d717157
commit 18366dd294
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/m17.c
View File

@@ -2855,19 +2855,15 @@ void processM17PKT(dsd_opts * opts, dsd_state * state)
uint8_t counter = (pkt_packed[25] >> 2) & 0x1F;
uint8_t eot = (pkt_packed[25] >> 7) & 1;
//Not sure if it would be better to set state pbc_ct by counter if not EOT?
if (!eot) state->m17_pbc_ct = counter;
else if (eot && state->m17_pbc_ct == 0) {} //pass if single block packet (bugfix super short text messages)
else if (eot && state->m17_pbc_ct != 0) state->m17_pbc_ct++; //increment if eot and counter not zero
//disabled these checks, this fails if 2 blocks are sent, better just to keep track of it by internal counter
// if (!eot) state->m17_pbc_ct = counter;
// else if (eot && state->m17_pbc_ct == 0) {} //pass if single block packet (bugfix super short text messages)
// else if (eot && state->m17_pbc_ct != 0) state->m17_pbc_ct++; //increment if eot and counter not zero
int ptr = state->m17_pbc_ct*25;
int total = ptr + counter - 1;
int end = ptr + 25;
//Not sure if it would be better to set state pbc_ct by counter if not EOT?
// if (!eot) state->m17_pbc_ct = counter;
// else state->m17_pbc_ct++; //increment if eot
//debug counter and eot value
if (!eot) fprintf (stderr, " CNT: %02d; PBC: %02d; EOT: %d;", state->m17_pbc_ct, counter, eot);
else fprintf (stderr, " CNT: %02d; LST: %02d; EOT: %d;", state->m17_pbc_ct, counter, eot);
@@ -2918,7 +2914,7 @@ void processM17PKT(dsd_opts * opts, dsd_state * state)
}
//increment pbc counter last
// state->m17_pbc_ct++; //disabled in lieu of the counter/eot check
if (!eot) state->m17_pbc_ct++;
//ending linebreak
fprintf (stderr, "\n");