M17_Project
/
gr-m17
mirror of https://github.com/M17-Project/gr-m17.git
1
0
Fork 0
Code Issues Releases Wiki Activity

correct decoder message display conditions

pull/18/head
Jean-Michel Friedt 2025-02-01 08:42:04 +01:00
parent 76ba939083
commit a89375c442
1 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/m17_decoder_impl.cc
View File

@ -545,7 +545,7 @@ namespace gr
scrambler_sequence_generator (); scrambler_sequence_generator ();
else if (_signed_str == false) //non-signed stream else if (_signed_str == false) //non-signed stream
scrambler_sequence_generator (); scrambler_sequence_generator ();
else memset(scr_bytes, 0, sizeof(scr_bytes)); // zero out stale scrambler bytes so they aren't applied to the sig frames else memset(_scr_bytes, 0, sizeof(_scr_bytes)); // zero out stale scrambler bytes so they aren't applied to the sig frames
for (uint8_t i = 0; i < 16; i++) for (uint8_t i = 0; i < 16; i++)
{ {
@ -554,14 +554,16 @@ namespace gr
} }
//dump data - first byte is empty //dump data - first byte is empty
printf ("FN: %04X PLD: ", fn); //printf ("FN: %04X PLD: ", fn);
for (uint8_t i = 3; i < 19; i++) for (uint8_t i = 3; i < 19; i++)
{ {
printf ("%02X", frame_data[i]); if (_debug_data == true)
printf (" %02X", frame_data[i]);
} }
if (_debug_ctrl == true) if (_debug_ctrl == true)
printf (" e=%1.1f\n", (float) e / 0xFFFF); printf (" e=%1.1f\n", (float) e / 0xFFFF);
if ((_debug_ctrl == true) || (_debug_data==true))
printf ("\n"); printf ("\n");
//send codec2 stream to stdout //send codec2 stream to stdout
@ -587,17 +589,19 @@ namespace gr
//debug - dump LICH //debug - dump LICH
if (lich_chunks_rcvd == 0x3F) //all 6 chunks received? if (lich_chunks_rcvd == 0x3F) //all 6 chunks received?
{
if (_debug_ctrl == true)
{ {
if (_callsign == true) if (_callsign == true)
{ {
decode_callsign_bytes (d_dst, &lsf[0]); decode_callsign_bytes (d_dst, &lsf[0]);
decode_callsign_bytes (d_src, &lsf[6]); decode_callsign_bytes (d_src, &lsf[6]);
if (_debug_ctrl == true)
{
printf ("DST: %-9s ", d_dst); //DST printf ("DST: %-9s ", d_dst); //DST
printf ("SRC: %-9s ", d_src); //SRC printf ("SRC: %-9s ", d_src); //SRC
} }
}
else else
if (_debug_ctrl == true)
{ {
printf ("DST: "); //DST printf ("DST: "); //DST
for (uint8_t i = 0; i < 6; i++) for (uint8_t i = 0; i < 6; i++)
@ -608,7 +612,6 @@ namespace gr
printf ("%02X", lsf[6 + i]); printf ("%02X", lsf[6 + i]);
printf (" "); printf (" ");
} }
}
//TYPE //TYPE
uint16_t type = (uint16_t) lsf[12] * 0x100 + lsf[13]; //big-endian uint16_t type = (uint16_t) lsf[12] * 0x100 + lsf[13]; //big-endian
@ -691,10 +694,12 @@ namespace gr
(_key, _digest, sizeof (_digest), _sig, (_key, _digest, sizeof (_digest), _sig,
_curve)) _curve))
{ {
if (_debug_ctrl == true)
printf ("Signature OK\n"); printf ("Signature OK\n");
} }
else else
{ {
if (_debug_ctrl == true)
printf ("Signature invalid\n"); printf ("Signature invalid\n");
} }
} }
@ -719,18 +724,20 @@ namespace gr
lsf[i] = lsf[i + 1]; lsf[i] = lsf[i + 1];
//dump data //dump data
if (_debug_ctrl == true)
{
if (_callsign == true) if (_callsign == true)
{ {
decode_callsign_bytes (d_dst, &lsf[0]); decode_callsign_bytes (d_dst, &lsf[0]);
decode_callsign_bytes (d_src, &lsf[6]); decode_callsign_bytes (d_src, &lsf[6]);
if (_debug_ctrl == true)
{
printf ("DST: %-9s ", d_dst); //DST printf ("DST: %-9s ", d_dst); //DST
printf ("SRC: %-9s ", d_src); //SRC printf ("SRC: %-9s ", d_src); //SRC
} }
}
else else
{ {
printf ("DST: "); //DST if (_debug_ctrl == true)
{printf ("DST: "); //DST
for (uint8_t i = 0; i < 6; i++) for (uint8_t i = 0; i < 6; i++)
printf ("%02X", lsf[i]); printf ("%02X", lsf[i]);
printf (" "); printf (" ");
@ -741,9 +748,10 @@ namespace gr
printf ("%02X", lsf[6 + i]); printf ("%02X", lsf[6 + i]);
printf (" "); printf (" ");
} }
}
//TYPE //TYPE
printf ("TYPE: "); if (_debug_ctrl == true)
{printf ("TYPE: ");
for (uint8_t i = 0; i < 2; i++) for (uint8_t i = 0; i < 2; i++)
printf ("%02X", lsf[12 + i]); printf ("%02X", lsf[12 + i]);
printf (" "); printf (" ");
@ -753,18 +761,22 @@ namespace gr
for (uint8_t i = 0; i < 14; i++) for (uint8_t i = 0; i < 14; i++)
printf ("%02X", lsf[14 + i]); printf ("%02X", lsf[14 + i]);
printf (" "); printf (" ");
}
//CRC //CRC
//printf("CRC: "); //printf("CRC: ");
//for(uint8_t i=0; i<2; i++) //for(uint8_t i=0; i<2; i++)
//printf("%02X", lsf[28+i]); //printf("%02X", lsf[28+i]);
if (CRC_M17 (lsf, 30)) if (CRC_M17 (lsf, 30))
{if (_debug_ctrl == true)
printf ("LSF_CRC_ERR"); printf ("LSF_CRC_ERR");
else
printf ("LSF_CRC_OK ");
//Viterbi decoder errors
printf (" e=%1.1f\n", (float) e / 0xFFFF);
} }
else
{if (_debug_ctrl == true)
printf ("LSF_CRC_OK ");
}
//Viterbi decoder errors
if (_debug_ctrl == true)
printf (" e=%1.1f\n", (float) e / 0xFFFF);
} }
//job done //job done