From f8b9d47c6d4196524d2eee34fd04fe7904bda5b9 Mon Sep 17 00:00:00 2001
From: lwvmobile <59371473+lwvmobile@users.noreply.github.com>
Date: Fri, 6 May 2022 11:48:37 -0400
Subject: [PATCH] Minor Framesync Print with DMR

Minor Framesync Print with DMR
--Minor Framesync Print Fix for DMR
---
 src/dmr_bs.c         |  3 ++-
 src/dsd_frame_sync.c | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dmr_bs.c b/src/dmr_bs.c
index 33dc1d1..fff2fae 100644
--- a/src/dmr_bs.c
+++ b/src/dmr_bs.c
@@ -456,7 +456,8 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
 
   }
 
-  fprintf (stderr,"\n%s ", getTime());
+  //fprintf (stderr,"\n%s ", getTime());
+  fprintf (stderr,"%s ", getTime());
   fprintf (stderr,"Sync: +DMR                  |  Frame Sync   | DMRSTEREO | VC1 FS \n");
   processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
   dmrBS (opts, state); //bootstrap into full TDMA frame for BS mode
diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c
index be29dc5..546580b 100644
--- a/src/dsd_frame_sync.c
+++ b/src/dsd_frame_sync.c
@@ -839,7 +839,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                 sprintf(state->ftype, "DMR ");
                 if (opts->errorbars == 1)
                 {
-                  //printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
+                  printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
                 }
                 if (state->lastsynctype != 11)
                 {
@@ -867,7 +867,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                 sprintf(state->ftype, "DMR ");
                 if (opts->errorbars == 1)
                 {
-                  //printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
+                  printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
                 }
                 state->lastsynctype = 10;
                 if ( opts->monitor_input_audio == 1)
@@ -880,9 +880,9 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               {
                 // inverted voice frame
                 sprintf(state->ftype, "DMR ");
-                if (opts->errorbars == 1)
+                if (opts->errorbars == 1 && opts->dmr_stereo == 0)
                 {
-                  //printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
+                  printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
                 }
                 if (state->lastsynctype != 11)
                 {
@@ -891,7 +891,6 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                 state->lastsynctype = 11;
                 if ( opts->monitor_input_audio == 1)
                 {
-
                   pa_simple_flush(opts->pulse_raw_dev_out, NULL);
                 }
                 return (11);
@@ -909,7 +908,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               {
                 // voice frame
                 sprintf(state->ftype, "DMR ");
-                if (opts->errorbars == 1)
+                if (opts->errorbars == 1 && opts->dmr_stereo == 0)
                 {
                   printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
                 }
@@ -929,7 +928,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               {
                 // inverted data frame
                 sprintf(state->ftype, "DMR ");
-                if (opts->errorbars == 1)
+                if (opts->errorbars == 1 && opts->dmr_stereo == 0)
                 {
                   printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
                 }
@@ -949,7 +948,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               state->min = ((state->min) + lmin) / 2;
               state->currentslot = 0;
               state->directmode = 1;  //Direct mode
-              if (opts->inverted_dmr == 0)
+              if (opts->inverted_dmr == 0 && opts->dmr_stereo == 0)
               {
                 // voice frame
                 sprintf(state->ftype, "DMR ");
@@ -972,7 +971,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               {
                 // inverted data frame
                 sprintf(state->ftype, "DMR ");
-                if (opts->errorbars == 1)
+                if (opts->errorbars == 1 && opts->dmr_stereo == 0)
                 {
                   printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
                 }
@@ -992,7 +991,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               {
                 // voice frame
                 sprintf(state->ftype, "DMR ");
-                if (opts->errorbars == 1)
+                if (opts->errorbars == 1 && opts->dmr_stereo == 0)
                 {
                   printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
                 }
@@ -1011,7 +1010,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
               {
                 // inverted data frame
                 sprintf(state->ftype, "DMR ");
-                if (opts->errorbars == 1)
+                if (opts->errorbars == 1 && opts->dmr_stereo == 0)
                 {
                   printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
                 }