From b7bb59dbba2f57b8052da0223405c040f69357e1 Mon Sep 17 00:00:00 2001
From: lwvmobile <59371473+lwvmobile@users.noreply.github.com>
Date: Mon, 22 Aug 2022 02:34:29 -0400
Subject: [PATCH] Additional Console Print Fixes

Additional Console Print Fixes
--missed a few places where we needed to have info printing
---
 src/dmr_bs.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/dmr_bs.c b/src/dmr_bs.c
index e771112..8a7a85d 100644
--- a/src/dmr_bs.c
+++ b/src/dmr_bs.c
@@ -710,26 +710,40 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   if (opts->inverted_dmr == 0)
   {
     fprintf (stderr,"Sync: +DMR                  |  Frame Sync   | DMRSTEREO | VC1 ");
-    if ( (state->K > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0) ||
-         (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0) )
+    if ( (state->K > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0 && state->dmr_fid  == 0x10) ||
+         (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10) )
     {
       fprintf (stderr, "%s", KYEL);
       fprintf(stderr, " BPK %lld", state->K);
       fprintf (stderr, "%s", KNRM);
-      //state->currentslot = 0; //slot now set from cach data from buffer
+
+    }
+    if ( (state->H > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0 && state->dmr_fid  == 0x68) ||
+         (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68) )
+    {
+      fprintf (stderr, "%s", KYEL);
+      fprintf(stderr, " T10 %010llX", state->H);
+      fprintf (stderr, "%s", KNRM);
     }
     fprintf (stderr, "\n");
   }
   else
   {
     fprintf (stderr,"Sync: -DMR                  |  Frame Sync   | DMRSTEREO | VC1 ");
-    if ( (state->K > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0) ||
-         (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0) )
+    if ( (state->K > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0 && state->dmr_fid  == 0x10) ||
+         (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10) )
     {
       fprintf (stderr, "%s", KYEL);
       fprintf(stderr, " BPK %lld", state->K);
       fprintf (stderr, "%s", KNRM);
-      //state->currentslot = 0; //slot now set from cach data from buffer
+      
+    }
+    if ( (state->H > 0 && state->dmr_so  & 0x40 && state->payload_keyid  == 0 && state->dmr_fid  == 0x68) ||
+         (state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68) )
+    {
+      fprintf (stderr, "%s", KYEL);
+      fprintf(stderr, " T10 %010llX", state->H);
+      fprintf (stderr, "%s", KNRM);
     }
     fprintf (stderr, "\n");
   }