From c02d7c0ba03e54569c0eb766b9f1fba7cb3ef11d Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Mon, 26 Dec 2022 08:44:13 -0500
Subject: [PATCH] DMR Trunking VC/CC Sync Time Tweaks;

---
 src/dmr_bs.c   | 25 ++++++++++++++++++++-----
 src/dmr_flco.c |  7 +++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/dmr_bs.c b/src/dmr_bs.c
index f613d1b..7fa0ec3 100644
--- a/src/dmr_bs.c
+++ b/src/dmr_bs.c
@@ -364,8 +364,12 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
     if (internalslot == 0) vc1++;
     if (internalslot == 1) vc2++;
 
-    //update voice sync time for trunking purposes (particularly Con+)
-    state->last_vc_sync_time = time(NULL);
+    //update cc amd vc sync time for trunking purposes (particularly Con+)
+    if (opts->p25_is_tuned == 1)
+    {
+      state->last_vc_sync_time = time(NULL);
+      state->last_cc_sync_time = time(NULL);
+    } 
 
     //reset err checks
     cach_err = 1;
@@ -452,6 +456,7 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   char sync[25];
   uint8_t tact_okay = 0;
   uint8_t cach_err = 0;
+  uint8_t sync_okay = 1;
 
 
   char cachdata[25]; 
@@ -570,7 +575,14 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   }
   sync[24] = 0;
 
-  if ( strcmp (sync, DMR_BS_VOICE_SYNC) != 0) goto END;
+  if ( strcmp (sync, DMR_BS_VOICE_SYNC) != 0)
+  {
+    if (opts->aggressive_framesync == 1)
+    {
+      sync_okay = 0;
+      goto END;
+    } 
+  }
 
   //Continue Second AMBE Frame, 18 after Sync or EmbeddedSignalling
   for(i = 0; i < 18; i++)
@@ -645,15 +657,18 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   cach_err = dmr_cach (opts, state, cachdata);
   fprintf (stderr, "\n");
 
+  //update voice sync time for trunking purposes (particularly Con+)
+  if (opts->p25_is_tuned == 1) state->last_vc_sync_time = time(NULL);
+
   dmrBS (opts, state); //bootstrap into full TDMA frame for BS mode
   END:
   //if we have a tact err, then produce sync pattern/err message
-  if (tact_okay != 1)
+  if (tact_okay != 1 || sync_okay != 1)
   {
     fprintf (stderr,"%s ", getTime());
     fprintf (stderr,"Sync:  DMR                  ");
     fprintf (stderr, "%s", KRED);
-    fprintf (stderr, "| VOICE CACH/EMB ERR");
+    fprintf (stderr, "| VOICE CACH/SYNC ERR");
     fprintf (stderr, "%s", KNRM);
     //run LFSR if either slot had an active MI in it.
     if (state->payload_algid >= 0x21)
diff --git a/src/dmr_flco.c b/src/dmr_flco.c
index bdeb596..9c9642a 100644
--- a/src/dmr_flco.c
+++ b/src/dmr_flco.c
@@ -98,6 +98,13 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
         state->lasttgR = target;
         state->lastsrcR = source;
       }
+
+      //update cc amd vc sync time for trunking purposes (particularly Con+)
+      if (opts->p25_is_tuned == 1)
+      {
+        state->last_vc_sync_time = time(NULL);
+        state->last_cc_sync_time = time(NULL);
+      } 
       
     }