From 88f67ec7f50f620914ab0cda7ae4220e83fd0747 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Fri, 14 Jul 2023 15:23:41 -0400 Subject: [PATCH] cleanup more direct frame queue calls; --- src/network/BaseNetwork.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/network/BaseNetwork.cpp b/src/network/BaseNetwork.cpp index c60b0b0b..a8c284e0 100644 --- a/src/network/BaseNetwork.cpp +++ b/src/network/BaseNetwork.cpp @@ -137,9 +137,7 @@ bool BaseNetwork::writeGrantReq(const uint8_t mode, const uint32_t srcId, const buffer[20U] = mode; // DVM Mode State - m_frameQueue->enqueueMessage(buffer, 21U, 0U, m_peerId, - { NET_FUNC_GRANT, NET_SUBFUNC_NOP }, 0U, m_addr, m_addrLen); - return m_frameQueue->flushQueue(); + return writeMaster({ NET_FUNC_GRANT_REQ, NET_SUBFUNC_NOP }, buffer, 21U, 0U, 0U); } /// @@ -162,9 +160,8 @@ bool BaseNetwork::writeActLog(const char* message) ::strcpy(buffer + 11U, message); - m_frameQueue->enqueueMessage((uint8_t*)buffer, (uint32_t)len + 12U, 0U, m_peerId, - { NET_FUNC_TRANSFER, NET_TRANSFER_SUBFUNC_ACTIVITY }, 0U, m_addr, m_addrLen); - return m_frameQueue->flushQueue(); + return writeMaster({ NET_FUNC_TRANSFER, NET_TRANSFER_SUBFUNC_ACTIVITY }, (uint8_t*)buffer, (uint32_t)len + 12U, + 0U, 0U); } /// @@ -187,9 +184,8 @@ bool BaseNetwork::writeDiagLog(const char* message) ::strcpy(buffer + 11U, message); - m_frameQueue->enqueueMessage((uint8_t*)buffer, (uint32_t)len + 12U, 0U, m_peerId, - { NET_FUNC_TRANSFER, NET_TRANSFER_SUBFUNC_DIAG }, 0U, m_addr, m_addrLen); - return m_frameQueue->flushQueue(); + return writeMaster({ NET_FUNC_TRANSFER, NET_TRANSFER_SUBFUNC_DIAG }, (uint8_t*)buffer, (uint32_t)len + 12U, + 0U, 0U); } ///