MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ignore M17 packet data, for now.

Browse Source
This commit is contained in:
Jonathan Naylor
2021-03-29 19:36:55 +01:00
parent 389bd3b928
commit 8dc54ed21f
14 changed files with 106 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DMRSlot.cpp
View File

@@ -255,7 +255,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
// Convert the Data Sync to be from the BS or MS as needed
CSync::addDMRDataSync(data + 2U, m_duplex);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
m_rfTimeoutTimer.start();
@@ -315,7 +315,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
bptc.decode(data + 2U, payload);
bptc.encode(payload, data + 2U);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
if (m_duplex)
@@ -404,7 +404,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
// Convert the Data Sync to be from the BS or MS as needed
CSync::addDMRDataSync(data + 2U, m_duplex);
data[0U] = m_rfFrames == 0U ? TAG_EOT : TAG_DATA;
data[0U] = m_rfFrames == 0U ? TAG_EOT : TAG_DATA1;
data[1U] = 0x00U;
if (m_duplex)
@@ -472,7 +472,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
// Convert the Data Sync to be from the BS or MS as needed
CSync::addDMRDataSync(data + 2U, m_duplex);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
if (m_duplex)
@@ -545,7 +545,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
m_rfFrames--;
data[0U] = m_rfFrames == 0U ? TAG_EOT : TAG_DATA;
data[0U] = m_rfFrames == 0U ? TAG_EOT : TAG_DATA1;
data[1U] = 0x00U;
if (m_duplex)
@@ -586,7 +586,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
m_display->writeDMRRSSI(m_slotNo, m_rssi);
if (!m_rfTimeout) {
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
if (m_duplex)
@@ -752,7 +752,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
emb.getData(data + 2U);
if (!m_rfTimeout) {
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
writeNetworkRF(data, DT_VOICE, errors);
@@ -828,7 +828,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
slotType.setDataType(DT_VOICE_LC_HEADER);
slotType.getData(start + 2U);
start[0U] = TAG_DATA;
start[0U] = TAG_DATA1;
start[1U] = 0x00U;
m_rfTimeoutTimer.start();
@@ -880,7 +880,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
m_rfBits += 141U;
m_rfFrames++;
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
if (m_duplex)
@@ -1088,7 +1088,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// Convert the Data Sync to be from the BS or MS as needed
CSync::addDMRDataSync(data + 2U, m_duplex);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
m_lastFrameValid = false;
@@ -1177,7 +1177,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
slotType.setDataType(DT_VOICE_LC_HEADER);
slotType.getData(start + 2U);
start[0U] = TAG_DATA;
start[0U] = TAG_DATA1;
start[1U] = 0x00U;
if (m_duplex) {
@@ -1224,7 +1224,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
bptc.decode(data + 2U, payload);
bptc.encode(payload, data + 2U);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
writeQueueNet(data);
@@ -1304,7 +1304,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// Convert the Data Sync to be from the BS or MS as needed
CSync::addDMRDataSync(data + 2U, m_duplex);
data[0U] = m_netFrames == 0U ? TAG_EOT : TAG_DATA;
data[0U] = m_netFrames == 0U ? TAG_EOT : TAG_DATA1;
data[1U] = 0x00U;
// Put a small delay into starting transmission
@@ -1374,7 +1374,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
slotType.setDataType(DT_VOICE_LC_HEADER);
slotType.getData(start + 2U);
start[0U] = TAG_DATA;
start[0U] = TAG_DATA1;
start[1U] = 0x00U;
if (m_duplex) {
@@ -1417,7 +1417,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netErrs += m_fec.regenerateDMR(data + 2U);
m_netBits += 141U;
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
// Convert the Audio Sync to be from the BS or MS as needed
@@ -1572,7 +1572,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
emb.setLCSS(lcss);
emb.getData(data + 2U);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
// Initialise the lost packet data
@@ -1633,7 +1633,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// Convert the Data Sync to be from the BS or MS as needed
CSync::addDMRDataSync(data + 2U, m_duplex);
data[0U] = TAG_DATA;
data[0U] = TAG_DATA1;
data[1U] = 0x00U;
if (csbko == CSBKO_PRECCSBK && csbk.getDataContent()) {
@@ -1732,7 +1732,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netFrames--;
data[0U] = m_netFrames == 0U ? TAG_EOT : TAG_DATA;
data[0U] = m_netFrames == 0U ? TAG_EOT : TAG_DATA1;
data[1U] = 0x00U;
#if defined(DUMP_DMR)