mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-17 11:17:22 -05:00
DMR - Tweak to P_CLEAR Return to CC; Tuner Status;
This commit is contained in:
@@ -486,10 +486,10 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
{
|
{
|
||||||
dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
|
dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
|
||||||
//reset some strings
|
//reset some strings
|
||||||
sprintf (state->call_string[0], "%s", " "); //21 spaces
|
sprintf (state->call_string[state->currentslot], "%s", " "); //21 spaces
|
||||||
sprintf (state->call_string[1], "%s", " "); //21 spaces
|
sprintf (state->active_channel[state->currentslot], "%s", "");
|
||||||
sprintf (state->active_channel[0], "%s", "");
|
state->last_vc_sync_time = 0;
|
||||||
sprintf (state->active_channel[1], "%s", "");
|
state->last_cc_sync_time = time(NULL);
|
||||||
opts->p25_is_tuned = 0;
|
opts->p25_is_tuned = 0;
|
||||||
state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
|
state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
|
||||||
if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
|
if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
|
||||||
@@ -502,10 +502,10 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
#ifdef USE_RTLSDR
|
#ifdef USE_RTLSDR
|
||||||
dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
|
dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
|
||||||
//reset some strings
|
//reset some strings
|
||||||
sprintf (state->call_string[0], "%s", " "); //21 spaces
|
sprintf (state->call_string[state->currentslot], "%s", " "); //21 spaces
|
||||||
sprintf (state->call_string[1], "%s", " "); //21 spaces
|
sprintf (state->active_channel[state->currentslot], "%s", "");
|
||||||
sprintf (state->active_channel[0], "%s", "");
|
state->last_cc_sync_time = time(NULL);
|
||||||
sprintf (state->active_channel[1], "%s", "");
|
state->last_vc_sync_time = 0;
|
||||||
opts->p25_is_tuned = 0;
|
opts->p25_is_tuned = 0;
|
||||||
state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
|
state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
|
||||||
rtl_dev_tune (opts, state->p25_cc_freq);
|
rtl_dev_tune (opts, state->p25_cc_freq);
|
||||||
|
|||||||
@@ -2516,6 +2516,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) ");
|
||||||
|
//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 == 0) printw ("Tuner Available ");
|
||||||
printw ("\n");
|
printw ("\n");
|
||||||
printw ("| In Level: [%02d%%] \n", level);
|
printw ("| In Level: [%02d%%] \n", level);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user