From 68bbea64d5090e4173ada37894a231f9de888e54 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 12 Dec 2022 08:31:54 -0500 Subject: [PATCH] P25 Yellow PDUs; --- src/p25p1_tsbk.c | 4 ++-- src/p25p2_xcch.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/p25p1_tsbk.c b/src/p25p1_tsbk.c index 3af09b1..6d98923 100644 --- a/src/p25p1_tsbk.c +++ b/src/p25p1_tsbk.c @@ -109,7 +109,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state) //0x49 is telephone grant, 0x46 Unit to Unit Channel Answer Request (seems bogus) if (MFID < 0x2 && protectbit == 0 && err == 0 && ec == 0 && PDU[1] != 0x7B ) { - fprintf (stderr, "%s",KMAG); + fprintf (stderr, "%s",KYEL); process_MAC_VPDU(opts, state, 0, PDU); fprintf (stderr, "%s",KNRM); } @@ -120,7 +120,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state) long int wacn = (tsbk_byte[3] << 12) | (tsbk_byte[4] << 4) | (tsbk_byte[5] >> 4);; int sysid = ((tsbk_byte[5] & 0xF) << 8) | tsbk_byte[6]; int channel = (tsbk_byte[7] << 8) | tsbk_byte[8]; - fprintf (stderr, "%s",KMAG); + fprintf (stderr, "%s",KYEL); fprintf (stderr, "\n Network Status Broadcast TSBK - Abbreviated \n"); fprintf (stderr, " WACN [%05lX] SYSID [%03X] NAC [%03llX]", wacn, sysid, state->p2_cc); state->p25_cc_freq = process_channel_to_freq(opts, state, channel); diff --git a/src/p25p2_xcch.c b/src/p25p2_xcch.c index e85350f..505ad2b 100644 --- a/src/p25p2_xcch.c +++ b/src/p25p2_xcch.c @@ -103,7 +103,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180] fprintf (stderr, "%s", KRED); fprintf (stderr, "CRC16 ERR "); } - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 1, SMAC); fprintf (stderr, "%s", KNRM); } @@ -226,7 +226,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180] if (state->currentslot == 1) state->dmrburstL = 24; else state->dmrburstR = 24; fprintf (stderr, " MAC_IDLE "); - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 1, SMAC); fprintf (stderr, "%s", KNRM); } @@ -235,7 +235,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180] if (state->currentslot == 1) state->dmrburstL = 21; else state->dmrburstR = 21; fprintf (stderr, " MAC_ACTIVE "); - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 1, SMAC); fprintf (stderr, "%s", KNRM); } @@ -244,7 +244,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180] if (state->currentslot == 1) state->dmrburstL = 22; else state->dmrburstR = 22; fprintf (stderr, " MAC_HANGTIME "); - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 1, SMAC); fprintf (stderr, "%s", KNRM); } @@ -315,7 +315,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156] // if (opcode == 0x0) // { // fprintf (stderr, " MAC_SIGNAL "); - // fprintf (stderr, "%s", KMAG); + // fprintf (stderr, "%s", KYEL); // process_MAC_VPDU(opts, state, 0, FMAC); // fprintf (stderr, "%s", KNRM); // } @@ -456,7 +456,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156] } fprintf (stderr, " MAC_IDLE "); - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 0, FMAC); fprintf (stderr, "%s", KNRM); } @@ -465,7 +465,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156] if (state->currentslot == 0) state->dmrburstL = 21; else state->dmrburstR = 21; fprintf (stderr, " MAC_ACTIVE "); - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 0, FMAC); fprintf (stderr, "%s", KNRM); } @@ -474,7 +474,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156] if (state->currentslot == 0) state->dmrburstL = 22; else state->dmrburstR = 22; fprintf (stderr, " MAC_HANGTIME "); - fprintf (stderr, "%s", KMAG); + fprintf (stderr, "%s", KYEL); process_MAC_VPDU(opts, state, 0, FMAC); fprintf (stderr, "%s", KNRM); }