From 5e68580fa650bd0a476a993e99d0ab1de94d72bf Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Thu, 15 Jun 2023 17:35:42 -0400 Subject: [PATCH] DMR - Minor Cosmetic Tweaks; --- src/dmr_bs.c | 13 ------------- src/dmr_csbk.c | 10 ++++++++-- src/dmr_flco.c | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/dmr_bs.c b/src/dmr_bs.c index a35540d..99045fb 100644 --- a/src/dmr_bs.c +++ b/src/dmr_bs.c @@ -363,19 +363,6 @@ void dmrBS (dsd_opts * opts, dsd_state * state) memcpy (m2, ambe_fr2, sizeof(m2)); memcpy (m3, ambe_fr3, sizeof(m3)); - // if ( opts->audio_in_type == 5 && internalslot == 0 && state->dmrburstR != 16 ) //(OSS shim) - // { - // processMbeFrame (opts, state, NULL, ambe_fr, NULL); - // processMbeFrame (opts, state, NULL, ambe_fr2, NULL); - // processMbeFrame (opts, state, NULL, ambe_fr3, NULL); - // } - // if ( opts->audio_in_type == 5 && internalslot == 1 && state->dmrburstL != 16 ) //(OSS shim) - // { - // processMbeFrame (opts, state, NULL, ambe_fr, NULL); - // processMbeFrame (opts, state, NULL, ambe_fr2, NULL); - // processMbeFrame (opts, state, NULL, ambe_fr3, NULL); - // } - processMbeFrame (opts, state, NULL, ambe_fr, NULL); processMbeFrame (opts, state, NULL, ambe_fr2, NULL); processMbeFrame (opts, state, NULL, ambe_fr3, NULL); diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c index 2676abc..ae12800 100644 --- a/src/dmr_csbk.c +++ b/src/dmr_csbk.c @@ -686,7 +686,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 if (gi == 0) target = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[40], 16); source = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[64], 16); int rest = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[60], 4); - fprintf (stderr, "Source: %d - Target: %d - Rest Channel: %d", source, target, rest); + fprintf (stderr, "Source: %d - Target: %d - Rest LSN: %d", source, target, rest); } else fprintf (stderr, "Source: %d - Target: %d ", source, target); @@ -820,7 +820,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 opts->p25_is_tuned = 1; } - fprintf (stderr, " Capacity Plus Channel Status - FL: %d TS: %d RS: %d - Rest Channel %d", fl, ts, res, rest_channel); + fprintf (stderr, " Capacity Plus Channel Status - FL: %d TS: %d RS: %d - Rest LSN: %d", fl, ts, res, rest_channel); if (fl == 0) fprintf (stderr, " - Appended Block"); //have not yet observed a system use this fl value if (fl == 1) fprintf (stderr, " - Final Block"); if (fl == 2) fprintf (stderr, " - Initial Block"); @@ -1018,6 +1018,9 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 //Skip tuning group calls if group calls are disabled -- moved to individual switches in the parsing phase // if (opts->trunk_tune_group_calls == 0) goto SKIPCAP; + //Test allowing a group in the white list to preempt a call in progress and tune to a white listed call + if (opts->trunk_use_allow_list == 1) state->last_vc_sync_time = 0; + //don't tune if vc on the current channel if ( (time(NULL) - state->last_vc_sync_time > 2) ) { @@ -1354,6 +1357,9 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8 //Skip tuning calls if group calls are disabled if (opts->trunk_tune_group_calls == 0) goto SKIPXPT; + //Test allowing a group in the white list to preempt a call in progress and tune to a white listed call + if (opts->trunk_use_allow_list == 1) state->last_vc_sync_time = 0; + //don't tune if vc on the current channel if ( (time(NULL) - state->last_vc_sync_time) > 2 ) //parenthesis error fixed { diff --git a/src/dmr_flco.c b/src/dmr_flco.c index fc5eb27..f684960 100644 --- a/src/dmr_flco.c +++ b/src/dmr_flco.c @@ -494,7 +494,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C if (restchannel != -1) { fprintf (stderr, "%s ", KYEL); - fprintf (stderr, "Cap+ R-Ch %d", restchannel); + fprintf (stderr, "Rest LSN: %d", restchannel); } }