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

Fix RSSI and BER data.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-05-11 20:23:41 +01:00
parent ce69be754a
commit ab0f0d5806
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DMRNetwork.cpp
View File

@@ -131,12 +131,18 @@ bool CDMRNetwork::read(CDMRData& data)
unsigned int streamId; unsigned int streamId;
::memcpy(&streamId, m_buffer + 16U, 4U); ::memcpy(&streamId, m_buffer + 16U, 4U);
unsigned char ber = m_buffer[53U];
unsigned char rssi = m_buffer[54U];
data.setSeqNo(seqNo); data.setSeqNo(seqNo);
data.setSlotNo(slotNo); data.setSlotNo(slotNo);
data.setSrcId(srcId); data.setSrcId(srcId);
data.setDstId(dstId); data.setDstId(dstId);
data.setFLCO(flco); data.setFLCO(flco);
data.setStreamId(streamId); data.setStreamId(streamId);
data.setBER(ber);
data.setRSSI(rssi);
bool dataSync = (m_buffer[15U] & 0x20U) == 0x20U; bool dataSync = (m_buffer[15U] & 0x20U) == 0x20U;
bool voiceSync = (m_buffer[15U] & 0x10U) == 0x10U; bool voiceSync = (m_buffer[15U] & 0x10U) == 0x10U;

6
MMDVMNetwork.cpp
View File

@@ -117,12 +117,18 @@ bool CMMDVMNetwork::read(CDMRData& data)
unsigned int streamId; unsigned int streamId;
::memcpy(&streamId, m_buffer + 16U, 4U); ::memcpy(&streamId, m_buffer + 16U, 4U);
unsigned char ber = m_buffer[53U];
unsigned char rssi = m_buffer[54U];
data.setSeqNo(seqNo); data.setSeqNo(seqNo);
data.setSlotNo(slotNo); data.setSlotNo(slotNo);
data.setSrcId(srcId); data.setSrcId(srcId);
data.setDstId(dstId); data.setDstId(dstId);
data.setFLCO(flco); data.setFLCO(flco);
data.setStreamId(streamId); data.setStreamId(streamId);
data.setBER(ber);
data.setRSSI(rssi);
bool dataSync = (m_buffer[15U] & 0x20U) == 0x20U; bool dataSync = (m_buffer[15U] & 0x20U) == 0x20U;
bool voiceSync = (m_buffer[15U] & 0x10U) == 0x10U; bool voiceSync = (m_buffer[15U] & 0x10U) == 0x10U;