code cleanup;

pull/16/head
Bryan Biedenkapp 4 years ago
parent 97af24c1b1
commit 94e28c2c3a

@ -961,7 +961,8 @@ void TSBK::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
LogError(LOG_P25, "TSBK_OSP_TIME_DATE_ANN (Dump End)"); LogError(LOG_P25, "TSBK_OSP_TIME_DATE_ANN (Dump End)");
#endif #endif
}break; }
break;
default: default:
if (m_mfId == P25_MFG_STANDARD) { if (m_mfId == P25_MFG_STANDARD) {
LogError(LOG_P25, "TSBK::encode(), unknown TSBK LCO value, mfId = $%02X, lco = $%02X", m_mfId, m_lco); LogError(LOG_P25, "TSBK::encode(), unknown TSBK LCO value, mfId = $%02X, lco = $%02X", m_mfId, m_lco);

@ -1834,6 +1834,14 @@ void Trunk::queueRF_TSBK_Ctrl(uint8_t lco)
// transmit SNDCP announcement // transmit SNDCP announcement
m_rfTSBK.setLCO(TSBK_OSP_SNDCP_CH_ANN); m_rfTSBK.setLCO(TSBK_OSP_SNDCP_CH_ANN);
break; break;
case TSBK_OSP_TIME_DATE_ANN:
if (m_debug) {
LogMessage(LOG_RF , P25_TSDU_STR ", TSBK_OSP_TIME_DATE_ANN (Time Date Announce)");
}
m_rfTSBK.setLCO(TSBK_OSP_TIME_DATE_ANN);
m_rfTSBK.setMFId(P25_MFG_STANDARD);
break;
/** Motorola CC data */ /** Motorola CC data */
case TSBK_OSP_MOT_PSH_CCH: case TSBK_OSP_MOT_PSH_CCH:
@ -1866,13 +1874,6 @@ void Trunk::queueRF_TSBK_Ctrl(uint8_t lco)
m_rfTSBK.setLCO(TSBK_OSP_DVM_GIT_HASH); m_rfTSBK.setLCO(TSBK_OSP_DVM_GIT_HASH);
m_rfTSBK.setMFId(P25_MFG_DVM); m_rfTSBK.setMFId(P25_MFG_DVM);
break; break;
case TSBK_OSP_TIME_DATE_ANN:
if ( m_debug ) {
LogMessage(LOG_RF , P25_TSDU_STR ", TSBK_OSP_TIME_DATE_ANN (Time Date Announce)");
}
m_rfTSBK.setLCO( TSBK_OSP_TIME_DATE_ANN );
m_rfTSBK.setMFId( P25_MFG_STANDARD );
break;
} }
m_rfTSBK.setLastBlock(true); // always set last block m_rfTSBK.setLastBlock(true); // always set last block

Loading…
Cancel
Save

Powered by TurnKey Linux.