From 2883e44a9d0a44f4a858f152d09ff394a4697b31 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 10 Dec 2024 14:06:12 -0500 Subject: [PATCH] Fix P25p1 SCC BCST LCW; --- src/p25_lcw.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/p25_lcw.c b/src/p25_lcw.c index 94dfab4..0e61fc6 100644 --- a/src/p25_lcw.c +++ b/src/p25_lcw.c @@ -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"); } - else if (lc_format == 0x61) - { - fprintf (stderr, " Secondary Control Channel Broadcast"); - } + //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 + // else if (lc_format == 0x61) + // { + // fprintf (stderr, " Secondary Control Channel Broadcast"); + // } else if (lc_format == 0x62) { fprintf (stderr, " Adjacent Site Status Broadcast"); } - else if (lc_format == 0x63) - { - fprintf (stderr, " RFSS Status Broadcast"); - } + // else if (lc_format == 0x63) + // { + // fprintf (stderr, " RFSS Status Broadcast"); + // } 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); 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 else if (lc_format == 0x63)