From 670e4e7becdd93cf94bca4e4d1f30fff1be8e385 Mon Sep 17 00:00:00 2001
From: lwvmobile <59371473+lwvmobile@users.noreply.github.com>
Date: Tue, 22 Feb 2022 08:49:46 -0500
Subject: [PATCH] Little Tweaks

Little Tweaks
---
 include/dsd.h     |  1 +
 src/dsd_file.c    | 10 +++++-----
 src/dsd_main.c    |  8 +++++++-
 src/dsd_ncurses.c |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/dsd.h b/include/dsd.h
index a24cfd0..ed6b271 100644
--- a/include/dsd.h
+++ b/include/dsd.h
@@ -239,6 +239,7 @@ typedef struct
   pa_simple *pulse_digi_dev_out;
   int use_ncurses_terminal;
   int reset_state;
+  int payload;
 
 } dsd_opts;
 
diff --git a/src/dsd_file.c b/src/dsd_file.c
index 9a0dc32..f130475 100644
--- a/src/dsd_file.c
+++ b/src/dsd_file.c
@@ -16,7 +16,7 @@
  */
 
 #include "dsd.h"
-int payload = 0;
+
 void
 saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
 {
@@ -28,7 +28,7 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
   fputc (err, opts->mbe_out_f);
 
   k = 0;
-  if (payload == 1) //make opt variable later on to toggle this
+  if (opts->payload == 1) //make opt variable later on to toggle this
   {
     fprintf(stderr, "\n");
   }
@@ -43,7 +43,7 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
           b = b + imbe_d[k];
           k++;
         }
-        if (payload == 1) //make opt variable later on to toggle this
+        if (opts->payload == 1) //make opt variable later on to toggle this
         {
           fprintf (stderr, "[%2X] ", b);
         }
@@ -64,7 +64,7 @@ saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
   fputc (err, opts->mbe_out_f);
 
   k = 0;
-  if (payload == 1) //make opt variable later on to toggle this
+  if (opts->payload == 1) //make opt variable later on to toggle this
   {
     fprintf(stderr, "\n");
   }
@@ -78,7 +78,7 @@ saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
           b = b + ambe_d[k];
           k++;
         }
-        if (payload == 1) //make opt variable later on to toggle this
+        if (opts->payload == 1) //make opt variable later on to toggle this
         {
           fprintf (stderr, "[%2X] ", b);
         }
diff --git a/src/dsd_main.c b/src/dsd_main.c
index 8f74c25..f7210c1 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -384,6 +384,7 @@ usage ()
   fprintf (stderr,"  -n            Reset P25 Heuristics and initState variables on mixed decoding signal\n");
   fprintf (stderr,"                 Helps when decoding multiple signal types at same time\n");
   fprintf (stderr,"                 (WiP! May Cause Slow Memory Leak - Experimental)\n");
+  fprintf (stderr,"  -Z            Log MBE Payload to console\n");
   fprintf (stderr,"\n");
   fprintf (stderr,"Report bugs to: https://github.com/lwvmobile/dsd-fme/issues \n");
   exit (0);
@@ -622,7 +623,7 @@ main (int argc, char **argv)
   exitflag = 0;
   signal (SIGINT, sigfun);
 
-  while ((c = getopt (argc, argv, "haep:P:qstv:z:i:o:d:c:g:nw:B:C:R:f:m:u:x:A:S:M:G:D:L:V:U:Y:NWrl")) != -1)
+  while ((c = getopt (argc, argv, "haep:P:qstv:z:i:o:d:c:g:nw:B:C:R:f:m:u:x:A:S:M:G:D:L:V:U:Y:NWrlZ")) != -1)
     {
       opterr = 0;
       switch (c)
@@ -721,6 +722,11 @@ main (int argc, char **argv)
           fprintf (stderr,"  - may need to issue 'reset' command in terminal after use\n");
           break;
 
+        case 'Z':
+          opts.payload = 1;
+          fprintf (stderr,"Logging MBE Payload to console\n");
+          break;
+
         case 'z':
           sscanf (optarg, "%d", &opts.scoperate);
           opts.errorbars = 0;
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 65b5dd8..cd2ee61 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -160,7 +160,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
   printw ("------------------------------------------------------------------------------\n");
 
 
-  if ( (lls == 14 || lls == 15) && (time(NULL) - call_matrix[9][5] > 5) ) //honestly have no idea how to do this for pV, just going time based?
+  if ( (lls == 14 || lls == 15) && (time(NULL) - call_matrix[9][5] > 5) && state->carrier == 1) //honestly have no idea how to do this for pV, just going time based? only update on carrier == 1.
   {
     for (short int k = 0; k < 9; k++)
     {