fix all instances of (uint32_t) for calcTxOffset;

pull/73/head
Bryan Biedenkapp 1 year ago
parent e41fec1253
commit 2e2e8bf957

@ -110,7 +110,7 @@ void CSBK_BROADCAST::encode(uint8_t* data)
const uint32_t multiple = 100000; const uint32_t multiple = 100000;
// calculate Rx frequency // 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 // generate frequency in mhz
uint32_t rxFreqMhz = rxFrequency + multiple / 2; uint32_t rxFreqMhz = rxFrequency + multiple / 2;

@ -55,7 +55,7 @@ void OSP_SNDCP_CH_ANN::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
float calcTxOffset = m_siteIdenEntry.txOffsetMhz() * 1000000.0; float calcTxOffset = m_siteIdenEntry.txOffsetMhz() * 1000000.0;
uint32_t txFrequency = (uint32_t)((m_siteIdenEntry.baseFrequency() + ((calcSpace * 125) * m_siteData.channelNo()))); 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 rootFreq = rxFrequency - m_siteIdenEntry.baseFrequency();
uint32_t rxChNo = rootFreq / (m_siteIdenEntry.chSpaceKhz() * 1000); uint32_t rxChNo = rootFreq / (m_siteIdenEntry.chSpaceKhz() * 1000);

@ -53,7 +53,7 @@ void OSP_SNDCP_CH_GNT::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
float calcTxOffset = m_siteIdenEntry.txOffsetMhz() * 1000000.0; float calcTxOffset = m_siteIdenEntry.txOffsetMhz() * 1000000.0;
uint32_t txFrequency = (uint32_t)((m_siteIdenEntry.baseFrequency() + ((calcSpace * 125) * m_dataChannelNo))); 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 rootFreq = rxFrequency - m_siteIdenEntry.baseFrequency();
uint32_t rxChNo = rootFreq / (m_siteIdenEntry.chSpaceKhz() * 1000); uint32_t rxChNo = rootFreq / (m_siteIdenEntry.chSpaceKhz() * 1000);

@ -633,7 +633,7 @@ bool HostSetup::calculateRxTxFreq(bool consoleDisplay)
uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125); uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125);
float calcTxOffset = entry.txOffsetMhz() * 1000000.0; 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))); m_txFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo)));
} }
else { else {

@ -330,7 +330,7 @@ private:
uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125); uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125);
float calcTxOffset = entry.txOffsetMhz() * 1000000.0; 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))); uint32_t txFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * m_channelNo)));
std::stringstream ss; std::stringstream ss;

@ -91,7 +91,7 @@ public:
uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125); uint32_t calcSpace = (uint32_t)(entry.chSpaceKhz() / 0.125);
float calcTxOffset = entry.txOffsetMhz() * 1000000.0; 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))); uint32_t txFrequency = (uint32_t)((entry.baseFrequency() + ((calcSpace * 125) * channelNo)));
std::stringstream ss; std::stringstream ss;

@ -172,7 +172,7 @@ public:
uint32_t calcSpace = (uint32_t)(idenEntry.chSpaceKhz() / 0.125); uint32_t calcSpace = (uint32_t)(idenEntry.chSpaceKhz() / 0.125);
float calcTxOffset = idenEntry.txOffsetMhz() * 1000000.0; 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))); uint32_t txFrequency = (uint32_t)((idenEntry.baseFrequency() + ((calcSpace * 125) * chNo)));
txOss << std::fixed << std::setprecision(5) << (double)(txFrequency / 1000000.0); txOss << std::fixed << std::setprecision(5) << (double)(txFrequency / 1000000.0);

Loading…
Cancel
Save

Powered by TurnKey Linux.