From d44c050ca47ff260ef66e69328b6e1d164502fed Mon Sep 17 00:00:00 2001
From: lwvmobile <59371473+lwvmobile@users.noreply.github.com>
Date: Mon, 28 Feb 2022 16:51:17 -0500
Subject: [PATCH] Tweak Ncurses; Tweak Modulations

Tweak Ncurses:
-update NXDN call log values; fix ran and initial rd value
Tweak Modulations:
-set correct modulation types for P25 and DMR systems
---
 src/dsd_main.c    | 8 +++++++-
 src/dsd_ncurses.c | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/dsd_main.c b/src/dsd_main.c
index 616b8bb..2d3c38f 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -295,6 +295,7 @@ initState (dsd_state * state)
   state->debug_header_critical_errors = 0;
 
   state->nxdn_last_ran = -1;
+  state->nxdn_last_rid = 0;
 
 #ifdef TRACE_DSD
   state->debug_sample_index = 0;
@@ -858,6 +859,10 @@ main (int argc, char **argv)
               opts.frame_nxdn96 = 0;
               opts.frame_dmr = 0;
               opts.frame_provoice = 0;
+              opts.mod_gfsk = 0;
+              opts.mod_c4fm = 1;  //Phase 1 only uses C4FM, right?
+              opts.mod_qpsk = 0;
+              state.rf_mod = 0; //
               fprintf (stderr,"Decoding only P25 Phase 1 frames.\n");
             }
           else if (optarg[0] == 'i')
@@ -908,7 +913,8 @@ main (int argc, char **argv)
               opts.frame_provoice = 0;
               opts.mod_c4fm = 1; //just a test
               opts.mod_qpsk = 0;
-              opts.mod_gfsk = 0; //was 1
+              opts.mod_gfsk = 0; //
+              state.rf_mod = 0;  //
               fprintf (stderr,"Decoding only DMR/MOTOTRBO frames.\n");
             }
           break;
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 98057d7..92e8e39 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -296,7 +296,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     src = state->nxdn_last_rid;
     //rn = state->nxdn_last_ran;
   }
-  if (state->nxdn_last_ran > -1 && state->nxdn_last_rid != rn);
+  if (state->nxdn_last_ran > -1 && state->nxdn_last_ran != rn);
   {
     //src = state->nxdn_last_rid;
     rn = state->nxdn_last_ran;