XPT Trunking Tweak;
This commit is contained in:
parent
8af6d2e185
commit
8d9cbb3720
|
|
@ -1089,13 +1089,40 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
||||||
//assign to cc freq to follow during no sync
|
//assign to cc freq to follow during no sync
|
||||||
//current theory is that user should set channel 0 as the 'home repeater' frequency
|
//current theory is that user should set channel 0 as the 'home repeater' frequency
|
||||||
//this can change if this is ever tested by anybody properly
|
//this can change if this is ever tested by anybody properly
|
||||||
if (state->trunk_chan_map[0] != 0)
|
long int ccfreq = 0;
|
||||||
|
|
||||||
|
//if using rigctl we can set an unknown or updated cc frequency
|
||||||
|
//by polling rigctl for the current frequency
|
||||||
|
if (opts->use_rigctl == 1 ) //&& state->p25_cc_freq == 0 //&& opts->p25_is_tuned == 0
|
||||||
{
|
{
|
||||||
state->p25_cc_freq = state->trunk_chan_map[0];
|
ccfreq = GetCurrentFreq (opts->rigctl_sockfd);
|
||||||
//set to always tuned
|
// if (ccfreq != 0) state->p25_cc_freq = ccfreq;
|
||||||
opts->p25_is_tuned = 1;
|
if (ccfreq != 0)
|
||||||
|
{
|
||||||
|
state->p25_cc_freq = ccfreq;
|
||||||
|
opts->p25_is_tuned = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//if using rtl input, we can ask for the current frequency tuned
|
||||||
|
if (opts->audio_in_type == 3 ) //&& state->p25_cc_freq == 0 //&& opts->p25_is_tuned == 0
|
||||||
|
{
|
||||||
|
ccfreq = (long int)opts->rtlsdr_center_freq;
|
||||||
|
if (ccfreq != 0)
|
||||||
|
{
|
||||||
|
state->p25_cc_freq = ccfreq;
|
||||||
|
opts->p25_is_tuned = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// if (state->trunk_chan_map[0] != 0)
|
||||||
|
// {
|
||||||
|
// state->p25_cc_freq = state->trunk_chan_map[0];
|
||||||
|
// //set to always tuned
|
||||||
|
// opts->p25_is_tuned = 1;
|
||||||
|
// }
|
||||||
|
|
||||||
//Skip tuning calls if group calls are disabled
|
//Skip tuning calls if group calls are disabled
|
||||||
if (opts->trunk_tune_group_calls == 0) goto SKIPXPT;
|
if (opts->trunk_tune_group_calls == 0) goto SKIPXPT;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue