allow the P25 adj site status message to transmit across the network even if P25 control broadcast is disabled, so long as P25 control is enabled;

pull/1/head
Bryan Biedenkapp 5 years ago
parent 9a4078b6a4
commit bdc2a05eda

@ -949,9 +949,9 @@ int Host::run()
/** P25 */
if (p25 != NULL) {
p25CCIntervalTimer.clock(ms);
if (m_p25CtrlBroadcast) {
// clock and check P25 CC broadcast interval timer
p25CCIntervalTimer.clock(ms);
if ((p25CCIntervalTimer.isRunning() && p25CCIntervalTimer.hasExpired()) || g_fireP25Control) {
if (hasCw) {
g_fireP25Control = false;
@ -994,7 +994,7 @@ int Host::run()
// if the CC is continuous -- we don't clock the CC duration timer (which results in the CC
// broadcast running infinitely until stopped)
if (!m_p25CtrlChannel) {
// clock and check P25 CC broadcast duration timer
// clock and check P25 CC duration timer
p25CCDurationTimer.clock(ms);
if (p25CCDurationTimer.isRunning() && p25CCDurationTimer.hasExpired()) {
p25CCDurationTimer.stop();
@ -1013,6 +1013,16 @@ int Host::run()
}
}
}
else {
// simply use the P25 CC interval timer in a non-broadcast state to transmit adjacent site data over
// the network
if (p25CCIntervalTimer.isRunning() && p25CCIntervalTimer.hasExpired()) {
if ((m_mode == STATE_IDLE || m_mode == STATE_P25) && !m_modem->hasTX()) {
p25->writeAdjSSNetwork();
p25CCIntervalTimer.start();
}
}
}
}
if (g_killed) {

Loading…
Cancel
Save

Powered by TurnKey Linux.