From 2e2e8bf957060a515084e522660fe9bda0b3a47a Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 21 Oct 2024 19:45:27 -0400 Subject: [PATCH] fix all instances of (uint32_t) for calcTxOffset; --- src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp | 2 +- src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp | 2 +- src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp | 2 +- src/host/setup/HostSetup.cpp | 2 +- src/monitor/NodeStatusWnd.h | 2 +- src/sysview/NodeStatusWnd.h | 2 +- src/sysview/PeerListWnd.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp b/src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp index db4c1d89..51c35dac 100644 --- a/src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp +++ b/src/common/dmr/lc/csbk/CSBK_BROADCAST.cpp @@ -110,7 +110,7 @@ void CSBK_BROADCAST::encode(uint8_t* data) const uint32_t multiple = 100000; // calculate Rx frequency - uint32_t rxFrequency = (uint32_t)((m_siteIdenEntry.baseFrequency() + ((calcSpace * 125) * m_logicalCh1)) + (uint32_t)calcTxOffset); + uint32_t rxFrequency = (uint32_t)((m_siteIdenEntry.baseFrequency() + ((calcSpace * 125) * m_logicalCh1)) + (int32_t)calcTxOffset); // generate frequency in mhz uint32_t rxFreqMhz = rxFrequency + multiple / 2; diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp index 72acbb3b..63050218 100644 --- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp @@ -55,7 +55,7 @@ void OSP_SNDCP_CH_ANN::encode(uint8_t* data, bool rawTSBK, bool noTrellis) float calcTxOffset = m_siteIdenEntry.txOffsetMhz() * 1000000.0; uint32_t txFrequency = (uint32_t)((m_siteIdenEntry.baseFrequency() + ((calcSpace * 125) * m_siteData.channelNo()))); - uint32_t rxFrequency = (uint32_t)(txFrequency + (uint32_t)calcTxOffset); + uint32_t rxFrequency = (uint32_t)(txFrequency + (int32_t)calcTxOffset); uint32_t rootFreq = rxFrequency - m_siteIdenEntry.baseFrequency(); uint32_t rxChNo = rootFreq / (m_siteIdenEntry.chSpaceKhz() * 1000); diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp index 71c25ade..fe0f13ca 100644 --- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.cpp @@ -53,7 +53,7 @@ void OSP_SNDCP_CH_GNT::encode(uint8_t* data, bool rawTSBK, bool noTrellis) float calcTxOffset = m_siteIdenEntry.txOffsetMhz() * 1000000.0; uint32_t txFrequency = (uint32_t)((m_siteIdenEntry.baseFrequency() + ((calcSpace * 125) * m_dataChannelNo))); - uint32_t rxFrequency = (uint32_t)(txFrequency + (uint32_t)calcTxOffset); + uint32_t rxFrequency = (uint32_t)(txFrequency + (int32_t)calcTxOffset); uint32_t rootFreq = rxFrequency - m_siteIdenEntry.baseFrequency(); uint32_t rxChNo = rootFreq / (m_siteIdenEntry.chSpaceKhz() * 1000); diff --git a/src/host/setup/HostSetup.cpp b/src/host/setup/HostSetup.cpp index 1099e51f..28112b1d 100644 --- a/src/host/setup/HostSetup.cpp +++ b/src/host/setup/HostSetup.cpp @@ -633,7 +633,7 @@ bool HostSetup::calculateRxTxFreq(bool consoleDisplay) uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125); float calcTxOffset = entry.txOffsetMhz() * 1000000.0; - m_rxFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo)) + (uint32_t)calcTxOffset); + m_rxFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo)) + (int32_t)calcTxOffset); m_txFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo))); } else { diff --git a/src/monitor/NodeStatusWnd.h b/src/monitor/NodeStatusWnd.h index 9f7aeaa7..6bbc3dc0 100644 --- a/src/monitor/NodeStatusWnd.h +++ b/src/monitor/NodeStatusWnd.h @@ -330,7 +330,7 @@ private: uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125); float calcTxOffset = entry.txOffsetMhz() * 1000000.0; - uint32_t rxFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo)) + (uint32_t)calcTxOffset); + uint32_t rxFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo)) + (int32_t)calcTxOffset); uint32_t txFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo))); std::stringstream ss; diff --git a/src/sysview/NodeStatusWnd.h b/src/sysview/NodeStatusWnd.h index 2db81920..a09da828 100644 --- a/src/sysview/NodeStatusWnd.h +++ b/src/sysview/NodeStatusWnd.h @@ -91,7 +91,7 @@ public: uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125); float calcTxOffset = entry.txOffsetMhz() * 1000000.0; - uint32_t rxFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * channelNo)) + (uint32_t)calcTxOffset); + uint32_t rxFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * channelNo)) + (int32_t)calcTxOffset); uint32_t txFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * channelNo))); std::stringstream ss; diff --git a/src/sysview/PeerListWnd.h b/src/sysview/PeerListWnd.h index 3eda99c4..f60eba20 100644 --- a/src/sysview/PeerListWnd.h +++ b/src/sysview/PeerListWnd.h @@ -172,7 +172,7 @@ public: uint32_t calcSpace = (uint32_t)(idenEntry.chSpaceKhz() / 0.125); float calcTxOffset = idenEntry.txOffsetMhz() * 1000000.0; - uint32_t rxFrequency = (uint32_t)((idenEntry.baseFrequency() + ((calcSpace * 125) * chNo)) + (uint32_t)calcTxOffset); + uint32_t rxFrequency = (uint32_t)((idenEntry.baseFrequency() + ((calcSpace * 125) * chNo)) + (int32_t)calcTxOffset); uint32_t txFrequency = (uint32_t)((idenEntry.baseFrequency() + ((calcSpace * 125) * chNo))); txOss << std::fixed << std::setprecision(5) << (double)(txFrequency / 1000000.0);