From 14fcbd9c1ae7e360467242bb2b5341bfc6f342ec Mon Sep 17 00:00:00 2001 From: Chipster Date: Wed, 30 Nov 2022 08:51:06 -0600 Subject: [PATCH 1/4] Enable Debug Log Messages when DMR Roaming Beacons are being sent. --- MMDVMHost.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index fcd0b39..a5ce54a 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1249,6 +1249,7 @@ int CMMDVMHost::run() setMode(MODE_DMR); dmrBeaconIntervalTimer.start(); dmrBeaconDurationTimer.start(); + LogDebug("sending DMR Roaming Beacon (timed mode)"); } } break; @@ -1260,6 +1261,7 @@ int CMMDVMHost::run() if (!m_fixedMode && m_mode == MODE_IDLE) setMode(MODE_DMR); dmrBeaconDurationTimer.start(); + LogDebug("sending DMR Roaming Beacon (network mode)"); } } } From adb67ff6988a809c9d6063dd41e80a75434f76b8 Mon Sep 17 00:00:00 2001 From: Chipster Date: Mon, 5 Dec 2022 08:38:06 -0600 Subject: [PATCH 2/4] Suppress DMR Roaming Beacon debug messages in simplex mode; refinement to PR #753 merge. --- MMDVMHost.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index a5ce54a..6f41f10 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1249,7 +1249,8 @@ int CMMDVMHost::run() setMode(MODE_DMR); dmrBeaconIntervalTimer.start(); dmrBeaconDurationTimer.start(); - LogDebug("sending DMR Roaming Beacon (timed mode)"); + if (m_duplex) + LogDebug("sending DMR Roaming Beacon (timed mode)"); } } break; @@ -1261,7 +1262,8 @@ int CMMDVMHost::run() if (!m_fixedMode && m_mode == MODE_IDLE) setMode(MODE_DMR); dmrBeaconDurationTimer.start(); - LogDebug("sending DMR Roaming Beacon (network mode)"); + if (m_duplex) + LogDebug("sending DMR Roaming Beacon (network mode)"); } } } From ecf21f9573e7c0d53cb539e96cd2154af757111b Mon Sep 17 00:00:00 2001 From: rick51231 Date: Thu, 15 Dec 2022 14:11:40 +0300 Subject: [PATCH 3/4] Emergency call CSBK support. --- DMRCSBK.cpp | 9 +++++++++ DMRCSBK.h | 1 + DMRSlot.cpp | 3 +++ 3 files changed, 13 insertions(+) diff --git a/DMRCSBK.cpp b/DMRCSBK.cpp index 2404ec2..ad02b0b 100644 --- a/DMRCSBK.cpp +++ b/DMRCSBK.cpp @@ -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; diff --git a/DMRCSBK.h b/DMRCSBK.h index 87e3a62..52f16d2 100644 --- a/DMRCSBK.h +++ b/DMRCSBK.h @@ -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 }; diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 577ebc7..825e80b 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -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; From 8370bdb6444835cb66ecea53bf73d963074abb47 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 4 Jan 2023 16:27:54 +0000 Subject: [PATCH 4/4] Rename the Makefile.Pi file to have a more accurate name. --- Makefile.Pi => Makefile.Pi.I2C | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Makefile.Pi => Makefile.Pi.I2C (100%) diff --git a/Makefile.Pi b/Makefile.Pi.I2C similarity index 100% rename from Makefile.Pi rename to Makefile.Pi.I2C