From 753286cdf6eb6cda3bda2283a96071071ca4ddf7 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Sat, 6 Apr 2024 22:16:47 -0400 Subject: [PATCH] EDACS: Add AFS Configuration Display to Ncurses; --- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/dsd_main.c b/src/dsd_main.c index 01a5d69..2328569 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1365,7 +1365,7 @@ usage () printf (" -fh Decode only EDACS Standard/ProVoice*\n"); printf (" -fH Decode only EDACS Standard/ProVoice with ESK 0xA0*\n"); printf (" -fh344 Decode only EDACS Standard/ProVoice and set AFS to 344 or custom 11-bit scheme*\n"); - printf (" -fH434 Decode only EDACS Standard/ProVoice and set AFS to 344 or custom 11-bit scheme with ESK 0xA0*\n"); + printf (" -fH434 Decode only EDACS Standard/ProVoice and set AFS to 344 or custom 11-bit scheme with ESK 0xA0*\n"); printf (" -fe Decode only EDACS EA/ProVoice*\n"); printf (" -fE Decode only EDACS EA/ProVoice with ESK 0xA0*\n"); printf (" -fm Decode only dPMR*\n"); diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 83d9d16..d19a13b 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2578,8 +2578,11 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } printw (" Mode (S);"); - printw(" ESK Mask: %02X", state->esk_mask); - printw (" (A); "); + printw(" ESK: %02X", state->esk_mask); + printw (" (A);"); + + if (state->ea_mode == 0) + printw (" AFS: %d:%d:%d;", state->edacs_a_bits, state->edacs_f_bits, state->edacs_s_bits); attron(COLOR_PAIR(4)); printw ("\n"); @@ -2605,8 +2608,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } printw (" Mode (S);"); - printw(" ESK Mask: %02X", state->esk_mask); + printw(" ESK: %02X", state->esk_mask); printw (" (A) Toggle; "); + + if (state->ea_mode == 0) + printw (" AFS: %d:%d:%d;", state->edacs_a_bits, state->edacs_f_bits, state->edacs_s_bits); + printw ("\n"); } #endif