mirror of
https://github.com/g4klx/MMDVMHost
synced 2025-12-21 15:09:23 +08:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
13
DMRSlot.cpp
13
DMRSlot.cpp
@@ -13,6 +13,7 @@
|
||||
|
||||
#include "DMRSlotType.h"
|
||||
#include "DMRShortLC.h"
|
||||
#include "DMRTrellis.h"
|
||||
#include "DMRFullLC.h"
|
||||
#include "BPTC19696.h"
|
||||
#include "DMRSlot.h"
|
||||
@@ -409,6 +410,12 @@ void CDMRSlot::writeModem(unsigned char *data)
|
||||
unsigned char payload[12U];
|
||||
bptc.decode(data + 2U, payload);
|
||||
bptc.encode(payload, data + 2U);
|
||||
} else if (dataType == DT_RATE_34_DATA) {
|
||||
LogDebug("DMR Slot %u, received RF rate 3/4 data", m_slotNo);
|
||||
CDMRTrellis trellis;
|
||||
unsigned char payload[18U];
|
||||
trellis.decode(data + 2U, payload);
|
||||
// trellis.encode(payload, data + 2U);
|
||||
}
|
||||
|
||||
// Regenerate the Slot Type
|
||||
@@ -1278,6 +1285,12 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
||||
unsigned char payload[12U];
|
||||
bptc.decode(data + 2U, payload);
|
||||
bptc.encode(payload, data + 2U);
|
||||
} else if (dataType == DT_RATE_34_DATA) {
|
||||
LogDebug("DMR Slot %u, received network rate 3/4 data", m_slotNo);
|
||||
CDMRTrellis trellis;
|
||||
unsigned char payload[18U];
|
||||
trellis.decode(data + 2U, payload);
|
||||
// trellis.encode(payload, data + 2U);
|
||||
}
|
||||
|
||||
// Regenerate the Slot Type
|
||||
|
||||
Reference in New Issue
Block a user