From 170424e44c80076469c48eb8bf43017e5a1a8ffa Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 7 May 2022 18:48:38 -0400 Subject: [PATCH] correct display of timing for FDMA preambles; do not send nulls after a PDU ack; --- host/Host.cpp | 2 +- host/calibrate/HostCal.cpp | 2 +- p25/DataPacket.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/host/Host.cpp b/host/Host.cpp index bf81dc69..9fccb983 100644 --- a/host/Host.cpp +++ b/host/Host.cpp @@ -1670,7 +1670,7 @@ bool Host::createModem() LogInfo(" PTT Invert: %s", pttInvert ? "yes" : "no"); LogInfo(" DC Blocker: %s", dcBlocker ? "yes" : "no"); LogInfo(" COS Lockout: %s", cosLockout ? "yes" : "no"); - LogInfo(" FDMA Preambles: %u (%.1fms)", fdmaPreamble, float(fdmaPreamble) * 0.2083F); + LogInfo(" FDMA Preambles: %u (%.1fms)", fdmaPreamble, float(fdmaPreamble) * 0.2222F); LogInfo(" DMR RX Delay: %u (%.1fms)", dmrRxDelay, float(dmrRxDelay) * 0.0416666F); LogInfo(" P25 Corr. Count: %u (%.1fms)", p25CorrCount, float(p25CorrCount) * 0.667F); LogInfo(" RX DC Offset: %d", rxDCOffset); diff --git a/host/calibrate/HostCal.cpp b/host/calibrate/HostCal.cpp index 5ab2e96c..39684e35 100644 --- a/host/calibrate/HostCal.cpp +++ b/host/calibrate/HostCal.cpp @@ -2473,7 +2473,7 @@ void HostCal::printStatus() break; } } - LogMessage(LOG_CAL, " - FDMA Preambles: %u (%.1fms), DMR Rx Delay: %u (%.1fms), P25 Corr. Count: %u (%.1fms)", m_fdmaPreamble, float(m_fdmaPreamble) * 0.2083F, m_dmrRxDelay, float(m_dmrRxDelay) * 0.0416666F, + LogMessage(LOG_CAL, " - FDMA Preambles: %u (%.1fms), DMR Rx Delay: %u (%.1fms), P25 Corr. Count: %u (%.1fms)", m_fdmaPreamble, float(m_fdmaPreamble) * 0.2222F, m_dmrRxDelay, float(m_dmrRxDelay) * 0.0416666F, m_p25CorrCount, float(m_p25CorrCount) * 0.667F); LogMessage(LOG_CAL, " - Rx Freq: %uHz, Tx Freq: %uHz, Rx Offset: %dHz, Tx Offset: %dHz", m_rxFrequency, m_txFrequency, m_rxTuning, m_txTuning); LogMessage(LOG_CAL, " - Rx Effective Freq: %uHz, Tx Effective Freq: %uHz", m_rxAdjustedFreq, m_txAdjustedFreq); diff --git a/p25/DataPacket.cpp b/p25/DataPacket.cpp index 84293b0c..57bb4acc 100644 --- a/p25/DataPacket.cpp +++ b/p25/DataPacket.cpp @@ -839,6 +839,6 @@ void DataPacket::writeRF_PDU_Ack_Response(uint8_t ackClass, uint8_t ackType, uin rspHeader.encode(block); Utils::setBitRange(block, data, offset, P25_PDU_FEC_LENGTH_BITS); - writeRF_PDU(data, bitLength); + writeRF_PDU(data, bitLength, true); delete[] data; }