ua1zbe
/
dsd-fme_18_05_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor Tweaks 

Minor Tweaks
--ncurses will truncate manually entered P2 parameters set if they are larger than expected.
--muting/key tweak
This commit is contained in:
lwvmobile 2022-09-19 17:13:58 -04:00 committed by GitHub
parent cb5c160fbf
commit 57d4c7afbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dmr_process_voice.c
View File

@ -293,7 +293,7 @@ if (state->currentslot == 0)
} }
else state->dmr_encL = 0; else state->dmr_encL = 0;
if (state->K != 0) if (state->K != 0 || state->K1 != 0)
{ {
state->dmr_encL = 0; state->dmr_encL = 0;
} }
@ -356,7 +356,7 @@ if (state->currentslot == 0)
} }
else state->dmr_encR = 0; else state->dmr_encR = 0;
if (state->K != 0) if (state->K != 0 || state->K1 != 0)
{ {
state->dmr_encR = 0; state->dmr_encR = 0;
} }

18
src/dsd_ncurses.c
View File

@ -1235,29 +1235,41 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
//hardset P2 WACN, SYSID, and NAC //hardset P2 WACN, SYSID, and NAC
entry_win = newwin(6, WIDTH+16, starty+10, startx+10); entry_win = newwin(6, WIDTH+16, starty+10, startx+10);
box (entry_win, 0, 0); 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, " "); mvwprintw(entry_win, 3, 3, " ");
echo(); echo();
refresh(); refresh();
wscanw(entry_win, "%X", &state->p2_wacn); wscanw(entry_win, "%X", &state->p2_wacn);
if (state->p2_wacn > 0xFFFFF)
{
state->p2_wacn = 0xFFFFF;
}
noecho(); noecho();
entry_win = newwin(6, WIDTH+16, starty+10, startx+10); entry_win = newwin(6, WIDTH+16, starty+10, startx+10);
box (entry_win, 0, 0); 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, " "); mvwprintw(entry_win, 3, 3, " ");
echo(); echo();
refresh(); refresh();
wscanw(entry_win, "%X", &state->p2_sysid); wscanw(entry_win, "%X", &state->p2_sysid);
if (state->p2_sysid > 0xFFF)
{
state->p2_sysid = 0xFFF;
}
noecho(); noecho();
entry_win = newwin(6, WIDTH+16, starty+10, startx+10); entry_win = newwin(6, WIDTH+16, starty+10, startx+10);
box (entry_win, 0, 0); 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, " "); mvwprintw(entry_win, 3, 3, " ");
echo(); echo();
refresh(); refresh();
wscanw(entry_win, "%X", &state->p2_cc); wscanw(entry_win, "%X", &state->p2_cc);
if (state->p2_cc > 0xFFF)
{
state->p2_cc = 0xFFF;
}
noecho(); noecho();
//need handling to truncate larger than expected values //need handling to truncate larger than expected values