Better logging of CSBK information.
This commit is contained in:
parent
2298a7b1b3
commit
0c80931d6f
1 changed files with 62 additions and 53 deletions
49
DMRSlot.cpp
49
DMRSlot.cpp
|
@ -237,7 +237,7 @@ void CDMRSlot::writeModem(unsigned char *data)
|
|||
m_rfLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId);
|
||||
|
||||
// Regenerate the data header
|
||||
// dataHeader.get(data + 2U); XXX
|
||||
dataHeader.get(data + 2U);
|
||||
|
||||
// Regenerate the Slot Type
|
||||
slotType.getData(data + 2U);
|
||||
|
@ -270,14 +270,9 @@ void CDMRSlot::writeModem(unsigned char *data)
|
|||
}
|
||||
|
||||
CSBKO csbko = csbk.getCSBKO();
|
||||
switch (csbko) {
|
||||
case CSBKO_BSDWNACT:
|
||||
if (csbko == CSBKO_BSDWNACT)
|
||||
return;
|
||||
|
||||
case CSBKO_UUVREQ:
|
||||
case CSBKO_UUANSRSP:
|
||||
case CSBKO_NACKRSP:
|
||||
case CSBKO_PRECCSBK: {
|
||||
// Regenerate the CSBK data
|
||||
csbk.get(data + 2U);
|
||||
|
||||
|
@ -297,10 +292,19 @@ void CDMRSlot::writeModem(unsigned char *data)
|
|||
|
||||
writeNetworkRF(data, DT_CSBK, FLCO_USER_USER, csbk.getSrcId(), csbk.getDstId());
|
||||
|
||||
LogMessage("DMR Slot %u, received RF CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
}
|
||||
switch (csbko) {
|
||||
case CSBKO_UUVREQ:
|
||||
LogMessage("DMR Slot %u, received RF Unit to Unit Voice Service Request CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
case CSBKO_UUANSRSP:
|
||||
LogMessage("DMR Slot %u, received RF Unit to Unit Voice Service Answer Response CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
case CSBKO_NACKRSP:
|
||||
LogMessage("DMR Slot %u, received RF Negative Acknowledgment Response CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
case CSBKO_PRECCSBK:
|
||||
LogMessage("DMR Slot %u, received RF Preamble CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
|
||||
default:
|
||||
LogWarning("DMR Slot %u, unhandled RF CSBK type - 0x%02X", m_slotNo, csbko);
|
||||
break;
|
||||
|
@ -756,7 +760,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
m_netLC = new CDMRLC(gi ? FLCO_GROUP : FLCO_USER_USER, srcId, dstId);
|
||||
|
||||
// Regenerate the data header
|
||||
// dataHeader.get(data + 2U); XXX
|
||||
dataHeader.get(data + 2U);
|
||||
|
||||
// Regenerate the Slot Type
|
||||
CDMRSlotType slotType;
|
||||
|
@ -907,14 +911,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
}
|
||||
|
||||
CSBKO csbko = csbk.getCSBKO();
|
||||
switch (csbko) {
|
||||
case CSBKO_BSDWNACT:
|
||||
if (csbko == CSBKO_BSDWNACT)
|
||||
return;
|
||||
|
||||
case CSBKO_UUVREQ:
|
||||
case CSBKO_UUANSRSP:
|
||||
case CSBKO_NACKRSP:
|
||||
case CSBKO_PRECCSBK: {
|
||||
// Regenerate the CSBK data
|
||||
csbk.get(data + 2U);
|
||||
|
||||
|
@ -937,10 +936,20 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
writeFile(data);
|
||||
closeFile();
|
||||
#endif
|
||||
LogMessage("DMR Slot %u, received network CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
}
|
||||
break;
|
||||
|
||||
switch (csbko) {
|
||||
case CSBKO_UUVREQ:
|
||||
LogMessage("DMR Slot %u, received network Unit to Unit Voice Service Request CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
case CSBKO_UUANSRSP:
|
||||
LogMessage("DMR Slot %u, received network Unit to Unit Voice Service Answer Response CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
case CSBKO_NACKRSP:
|
||||
LogMessage("DMR Slot %u, received network Negative Acknowledgment Response CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
case CSBKO_PRECCSBK:
|
||||
LogMessage("DMR Slot %u, received network Preamble CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
|
||||
break;
|
||||
default:
|
||||
LogWarning("DMR Slot %u, unhandled network CSBK type - 0x%02X", m_slotNo, csbko);
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue