Fix P25p1 SCC BCST LCW;

This commit is contained in:
lwvmobile
2024-12-10 14:06:12 -05:00
parent 20747db2cc
commit 2883e44a9d

View File

@@ -213,20 +213,22 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
fprintf (stderr, " System Service Broadcast"); fprintf (stderr, " System Service Broadcast");
} }
else if (lc_format == 0x61) //this PDU does not have an associated MFID, often seen on kiwi and matches its TSBK counterpart
{ //its possible some of the other ones here don't as well, need to re-check all of them
fprintf (stderr, " Secondary Control Channel Broadcast"); // else if (lc_format == 0x61)
} // {
// fprintf (stderr, " Secondary Control Channel Broadcast");
// }
else if (lc_format == 0x62) else if (lc_format == 0x62)
{ {
fprintf (stderr, " Adjacent Site Status Broadcast"); fprintf (stderr, " Adjacent Site Status Broadcast");
} }
else if (lc_format == 0x63) // else if (lc_format == 0x63)
{ // {
fprintf (stderr, " RFSS Status Broadcast"); // fprintf (stderr, " RFSS Status Broadcast");
} // }
else if (lc_format == 0x64) else if (lc_format == 0x64)
{ {
@@ -397,6 +399,10 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
uint32_t base = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 32); uint32_t base = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 32);
fprintf (stderr, " Channel Identifier Update VU; Iden: %X; Base: %d;", iden, base*5); fprintf (stderr, " Channel Identifier Update VU; Iden: %X; Base: %d;", iden, base*5);
} }
//This lc_format doesn't use the MFID field
else if (lc_format == 0x61)
fprintf (stderr, " Secondary Control Channel Broadcast");
//This lc_format doesn't use the MFID field //This lc_format doesn't use the MFID field
else if (lc_format == 0x63) else if (lc_format == 0x63)