MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 16:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Alex Ernst
2023-09-18 13:28:42 +02:00
parent 3a670f84c9
commit a79793ee8a
1 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
DMRSlot.cpp
View File

@@ -531,33 +531,33 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (m_rfState != RS_RF_DATA || m_rfFrames == 0U) if (m_rfState != RS_RF_DATA || m_rfFrames == 0U)
return false; return false;
char title[80U]; char title[80U];
// Regenerate the rate 1/2 payload // Regenerate the rate 1/2 payload
if (dataType == DT_RATE_12_DATA) { if (dataType == DT_RATE_12_DATA) {
CBPTC19696 bptc; CBPTC19696 bptc;
unsigned char payload[12U]; unsigned char payload[12U];
bptc.decode(data + 2U, payload); bptc.decode(data + 2U, payload);
::sprintf(title, "DMR Slot %u, Data 1/2", m_slotNo); ::sprintf(title, "DMR Slot %u, Data 1/2", m_slotNo);
CUtils::dump(1U, title, payload, 12U); CUtils::dump(1U, title, payload, 12U);
bptc.encode(payload, data + 2U); bptc.encode(payload, data + 2U);
} else if (dataType == DT_RATE_34_DATA) { } else if (dataType == DT_RATE_34_DATA) {
CDMRTrellis trellis; CDMRTrellis trellis;
unsigned char payload[18U]; unsigned char payload[18U];
bool ret = trellis.decode(data + 2U, payload); bool ret = trellis.decode(data + 2U, payload);
if (ret) { if (ret) {
::sprintf(title, "DMR Slot %u, Data 3/4", m_slotNo); ::sprintf(title, "DMR Slot %u, Data 3/4", m_slotNo);
CUtils::dump(1U, title, payload, 18U); CUtils::dump(1U, title, payload, 18U);
trellis.encode(payload, data + 2U); trellis.encode(payload, data + 2U);
} else { } else {
LogMessage("DMR Slot %u, unfixable RF rate 3/4 data", m_slotNo); LogMessage("DMR Slot %u, unfixable RF rate 3/4 data", m_slotNo);
CUtils::dump(1U, "Data", data + 2U, DMR_FRAME_LENGTH_BYTES); CUtils::dump(1U, "Data", data + 2U, DMR_FRAME_LENGTH_BYTES);
} }
} }
else else
{ {
::sprintf(title, "DMR Slot %u, Data 1/1", m_slotNo); ::sprintf(title, "DMR Slot %u, Data 1/1", m_slotNo);
CUtils::dump(1U, title, data + 2U, 24U); CUtils::dump(1U, title, data + 2U, 24U);
} }
// Regenerate the Slot Type // Regenerate the Slot Type
slotType.getData(data + 2U); slotType.getData(data + 2U);
@@ -1726,33 +1726,33 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
} }
char title[80U]; char title[80U];
// Regenerate the rate 1/2 payload // Regenerate the rate 1/2 payload
if (dataType == DT_RATE_12_DATA) { if (dataType == DT_RATE_12_DATA) {
CBPTC19696 bptc; CBPTC19696 bptc;
unsigned char payload[12U]; unsigned char payload[12U];
bptc.decode(data + 2U, payload); bptc.decode(data + 2U, payload);
::sprintf(title, "DMR Slot %u, Data 1/2", m_slotNo); ::sprintf(title, "DMR Slot %u, Data 1/2", m_slotNo);
CUtils::dump(1U, title, payload, 12U); CUtils::dump(1U, title, payload, 12U);
bptc.encode(payload, data + 2U); bptc.encode(payload, data + 2U);
} else if (dataType == DT_RATE_34_DATA) { } else if (dataType == DT_RATE_34_DATA) {
CDMRTrellis trellis; CDMRTrellis trellis;
unsigned char payload[18U]; unsigned char payload[18U];
bool ret = trellis.decode(data + 2U, payload); bool ret = trellis.decode(data + 2U, payload);
if (ret) { if (ret) {
::sprintf(title, "DMR Slot %u, Data 3/4", m_slotNo); ::sprintf(title, "DMR Slot %u, Data 3/4", m_slotNo);
CUtils::dump(1U, title, payload, 18U); CUtils::dump(1U, title, payload, 18U);
trellis.encode(payload, data + 2U); trellis.encode(payload, data + 2U);
} else { } else {
LogMessage("DMR Slot %u, unfixable network rate 3/4 data", m_slotNo); LogMessage("DMR Slot %u, unfixable network rate 3/4 data", m_slotNo);
CUtils::dump(1U, "Data", data + 2U, DMR_FRAME_LENGTH_BYTES); CUtils::dump(1U, "Data", data + 2U, DMR_FRAME_LENGTH_BYTES);
} }
} }
else else
{ {
::sprintf(title, "DMR Slot %u, Data 1/1", m_slotNo); ::sprintf(title, "DMR Slot %u, Data 1/1", m_slotNo);
CUtils::dump(1U, title, data + 2U, 24U); CUtils::dump(1U, title, data + 2U, 24U);
} }
// Regenerate the Slot Type // Regenerate the Slot Type