From 57d4c7afbe9695d8a06a0f2d9642f228d90f4006 Mon Sep 17 00:00:00 2001
From: lwvmobile <59371473+lwvmobile@users.noreply.github.com>
Date: Mon, 19 Sep 2022 17:13:58 -0400
Subject: [PATCH] Minor Tweaks

Minor Tweaks
--ncurses will truncate manually entered P2 parameters set if they are larger than expected.
--muting/key tweak
---
 src/dmr_process_voice.c |  4 ++--
 src/dsd_ncurses.c       | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/dmr_process_voice.c b/src/dmr_process_voice.c
index 9f38197..03e6eeb 100644
--- a/src/dmr_process_voice.c
+++ b/src/dmr_process_voice.c
@@ -293,7 +293,7 @@ if (state->currentslot == 0)
       }
       else state->dmr_encL = 0;
 
-      if (state->K != 0)
+      if (state->K != 0 || state->K1 != 0)
 			{
 				state->dmr_encL = 0;
 			}
@@ -356,7 +356,7 @@ if (state->currentslot == 0)
        }
        else state->dmr_encR = 0;
 
-       if (state->K != 0)
+       if (state->K != 0 || state->K1 != 0)
  			 {
  				state->dmr_encR = 0;
  			 }
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index d1fb615..de80ab8 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -1235,29 +1235,41 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
       //hardset P2 WACN, SYSID, and NAC
       entry_win = newwin(6, WIDTH+16, starty+10, startx+10);
       box (entry_win, 0, 0);
-      mvwprintw(entry_win, 2, 2, " Enter Phase 2 WACN");
+      mvwprintw(entry_win, 2, 2, " Enter Phase 2 WACN (HEX)");
       mvwprintw(entry_win, 3, 3, " ");
       echo();
       refresh();
       wscanw(entry_win, "%X", &state->p2_wacn);
+      if (state->p2_wacn > 0xFFFFF)
+      {
+        state->p2_wacn = 0xFFFFF;
+      }
       noecho();
 
       entry_win = newwin(6, WIDTH+16, starty+10, startx+10);
       box (entry_win, 0, 0);
-      mvwprintw(entry_win, 2, 2, " Enter Phase 2 SYSID");
+      mvwprintw(entry_win, 2, 2, " Enter Phase 2 SYSID (HEX)");
       mvwprintw(entry_win, 3, 3, " ");
       echo();
       refresh();
       wscanw(entry_win, "%X", &state->p2_sysid);
+      if (state->p2_sysid > 0xFFF)
+      {
+        state->p2_sysid = 0xFFF;
+      }
       noecho();
 
       entry_win = newwin(6, WIDTH+16, starty+10, startx+10);
       box (entry_win, 0, 0);
-      mvwprintw(entry_win, 2, 2, " Enter Phase 2 NAC/CC");
+      mvwprintw(entry_win, 2, 2, " Enter Phase 2 NAC/CC (HEX)");
       mvwprintw(entry_win, 3, 3, " ");
       echo();
       refresh();
       wscanw(entry_win, "%X", &state->p2_cc);
+      if (state->p2_cc > 0xFFF)
+      {
+        state->p2_cc = 0xFFF;
+      }
       noecho();
 
       //need handling to truncate larger than expected values