mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 05:05:38 -05:00
TG Hold: Fix EDACS/NXDN Display and Set; #132
This commit is contained in:
@@ -2519,6 +2519,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
printw ( "[%d] \n", (48000*opts->wav_interpolator)/state->samplesPerSymbol);
|
printw ( "[%d] \n", (48000*opts->wav_interpolator)/state->samplesPerSymbol);
|
||||||
printw ("| Decoding: [%s] ", opts->output_name);
|
printw ("| Decoding: [%s] ", opts->output_name);
|
||||||
if (opts->aggressive_framesync == 0) printw ("CRC/(RAS) ");
|
if (opts->aggressive_framesync == 0) printw ("CRC/(RAS) ");
|
||||||
|
//TG Hold on EDACS, if specified by user
|
||||||
|
if ( (opts->frame_provoice == 1) && (state->tg_hold != 0) )
|
||||||
|
printw ("TG HOLD: %d; ", state->tg_hold);
|
||||||
//debug -- troubleshoot voice tuning after grant on DMR CC, subsequent grant may not tune because tuner isn't available
|
//debug -- troubleshoot voice tuning after grant on DMR CC, subsequent grant may not tune because tuner isn't available
|
||||||
if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1) printw ("Tuner Locked ");
|
if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1) printw ("Tuner Locked ");
|
||||||
if (opts->p25_trunk == 1 && opts->p25_is_tuned == 0) printw ("Tuner Available ");
|
if (opts->p25_trunk == 1 && opts->p25_is_tuned == 0) printw ("Tuner Available ");
|
||||||
@@ -2847,6 +2850,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
else attroff(COLOR_PAIR(4));
|
else attroff(COLOR_PAIR(4));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//TG Hold, if specified by user
|
||||||
|
if (state->tg_hold != 0) printw ("TG HOLD: %d", state->tg_hold);
|
||||||
|
|
||||||
printw("\n");
|
printw("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3580,6 +3586,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
if (state->tg_hold == 0)
|
if (state->tg_hold == 0)
|
||||||
state->tg_hold = state->lasttg;
|
state->tg_hold = state->lasttg;
|
||||||
else state->tg_hold = 0;
|
else state->tg_hold = 0;
|
||||||
|
|
||||||
|
if ( (opts->frame_nxdn48 == 1 || opts->frame_nxdn96 == 1) && (state->tg_hold == 0) )
|
||||||
|
state->tg_hold = state->nxdn_last_tg;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c == 108) //'l' key, hold tg on slot 2 for trunking purposes, or toggle clear
|
if (c == 108) //'l' key, hold tg on slot 2 for trunking purposes, or toggle clear
|
||||||
|
|||||||
Reference in New Issue
Block a user