g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-01-01 14:10:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #755 from rick51231/master

Browse source
This commit is contained in:
Jonathan Naylor 2022-12-15 12:17:48 +00:00 committed by GitHub
parent e812e90edf ecf21f9573
commit 0abfa895bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
DMRCSBK.cpp
View file

@ -147,6 +147,15 @@ bool CDMRCSBK::put(const unsigned char* bytes)
m_CBF = 0U;
break;
case CSBKO_CALL_EMERGENCY:
m_GI = true;
m_dstId = m_data[4U] << 16 | m_data[5U] << 8 | m_data[6U];
m_srcId = m_data[7U] << 16 | m_data[8U] << 8 | m_data[9U];
m_dataContent = false;
m_CBF = 0U;
CUtils::dump(1U, "Call Emergency CSBK", m_data, 12U);
break;
default:
m_GI = false;
m_srcId = 0U;

1
DMRCSBK.h
View file

@ -30,6 +30,7 @@ enum CSBKO {
CSBKO_CALL_ALERT_ACK = 0x20,
CSBKO_RADIO_CHECK = 0x24,
CSBKO_NACKRSP = 0x26,
CSBKO_CALL_EMERGENCY = 0x27,
CSBKO_BSDWNACT = 0x38,
CSBKO_PRECCSBK = 0x3D
};

3
DMRSlot.cpp
View file

@ -510,6 +510,9 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
case CSBKO_RADIO_CHECK:
LogMessage("DMR Slot %u, received RF Radio Check %s CSBK from %s to %s%s", m_slotNo, /* TBD */ 1 ? "Req" : "Ack", src.c_str(), gi ? "TG " : "", dst.c_str());
break;
case CSBKO_CALL_EMERGENCY:
LogMessage("DMR Slot %u, received RF Call Emergency CSBK from %s to %s%s", m_slotNo, src.c_str(), gi ? "TG " : "", dst.c_str());
break;
default:
LogWarning("DMR Slot %u, unhandled RF CSBK type - 0x%02X", m_slotNo, csbko);
break;