From 3d7f04f5237e5c02f7c672b9cb7c45d41f604d60 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Tue, 27 Jun 2023 10:05:52 -0400 Subject: [PATCH] split touch notify from incorrect logic statement; --- src/network/RESTAPI.cpp | 1 + src/p25/packet/Voice.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/network/RESTAPI.cpp b/src/network/RESTAPI.cpp index 47435d47..314589c3 100644 --- a/src/network/RESTAPI.cpp +++ b/src/network/RESTAPI.cpp @@ -32,6 +32,7 @@ #include "dmr/Control.h" #include "p25/Control.h" #include "nxdn/Control.h" +#include "lookups/AffiliationLookup.h" #include "modem/Modem.h" #include "host/Host.h" #include "network/json/json.h" diff --git a/src/p25/packet/Voice.cpp b/src/p25/packet/Voice.cpp index c04fb60c..4485d6ec 100644 --- a/src/p25/packet/Voice.cpp +++ b/src/p25/packet/Voice.cpp @@ -499,6 +499,9 @@ bool Voice::process(uint8_t* data, uint32_t len) if (m_p25->m_control) { m_p25->m_affiliations.touchGrant(m_rfLC.getDstId()); + } + + if (m_p25->m_notifyCC) { m_p25->notifyCC_TouchGrant(m_rfLC.getDstId()); } @@ -811,6 +814,9 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L if (m_p25->m_control) { lc::LC control = lc::LC(*m_dfsiLC.control()); m_p25->m_affiliations.touchGrant(control.getDstId()); + } + + if (m_p25->m_notifyCC) { m_p25->notifyCC_TouchGrant(control.getDstId()); } @@ -876,6 +882,9 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L if (m_p25->m_control) { lc::LC control = lc::LC(*m_dfsiLC.control()); m_p25->m_affiliations.touchGrant(control.getDstId()); + } + + if (m_p25->m_notifyCC) { m_p25->notifyCC_TouchGrant(control.getDstId()); }