From bdc9973bc5f71f6d291c42274c8edb5dc0f85c2a Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 16 Apr 2022 14:15:32 -0400 Subject: [PATCH] fix incorrect path in Makefile; fix rounding error during IDEN_UP and IDEN_UP_VU Tx offset calculation; --- Makefile | 3 ++- p25/lc/TDULC.cpp | 5 +++-- p25/lc/TSBK.cpp | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 68d12e62..4ea7381e 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,8 @@ clean: install: all mkdir -p /opt/dvm/bin || true - install -m 755 $(BIN) /opt/dvm/bin/ + install -m 755 $(HOST_BIN) /opt/dvm/bin/ + install -m 755 $(CMD_BIN) /opt/dvm/bin/ mkdir -p /opt/dvm || true install -m 644 config.example.yml /opt/dvm/config.yml install -m 644 iden_table.dat /opt/dvm/iden_table.dat diff --git a/p25/lc/TDULC.cpp b/p25/lc/TDULC.cpp index a6b08385..807da2ce 100644 --- a/p25/lc/TDULC.cpp +++ b/p25/lc/TDULC.cpp @@ -36,6 +36,7 @@ using namespace p25::lc; using namespace p25; #include +#include #include #include @@ -402,7 +403,7 @@ void TDULC::encodeLC(uint8_t* rs) if ((m_siteIdenEntry.chBandwidthKhz() != 0.0F) && (m_siteIdenEntry.chSpaceKhz() != 0.0F) && (m_siteIdenEntry.txOffsetMhz() != 0U) && (m_siteIdenEntry.baseFrequency() != 0U)) { uint32_t calcSpace = (uint32_t)(m_siteIdenEntry.chSpaceKhz() / 0.125); - uint32_t calcTxOffset = (uint32_t)((abs(m_siteIdenEntry.txOffsetMhz()) / m_siteIdenEntry.chSpaceKhz()) * 1000); + uint32_t calcTxOffset = (uint32_t)((fabs(m_siteIdenEntry.txOffsetMhz()) / m_siteIdenEntry.chSpaceKhz()) * 1000); if (m_siteIdenEntry.txOffsetMhz() > 0.0F) calcTxOffset |= 0x2000U; // this sets a positive offset ... @@ -416,7 +417,7 @@ void TDULC::encodeLC(uint8_t* rs) rsValue = (rsValue << 32) + calcBaseFreq; // Base Frequency } else { - LogError(LOG_P25, "TDULC::encodeLC(), invalid values for LC_IDEN_UP, baseFrequency = %uHz, txOffsetMhz = %uMHz, chBandwidthKhz = %fKHz, chSpaceKhz = %fKHz", + LogError(LOG_P25, "TDULC::encodeLC(), invalid values for LC_IDEN_UP, baseFrequency = %uHz, txOffsetMhz = %fMHz, chBandwidthKhz = %fKHz, chSpaceKhz = %fKHz", m_siteIdenEntry.baseFrequency(), m_siteIdenEntry.txOffsetMhz(), m_siteIdenEntry.chBandwidthKhz(), m_siteIdenEntry.chSpaceKhz()); return; // blatently ignore creating this TSBK diff --git a/p25/lc/TSBK.cpp b/p25/lc/TSBK.cpp index 072bf217..24a0d62a 100644 --- a/p25/lc/TSBK.cpp +++ b/p25/lc/TSBK.cpp @@ -35,6 +35,7 @@ using namespace p25::lc; using namespace p25; #include +#include #include #include @@ -734,7 +735,7 @@ void TSBK::encode(uint8_t * data, bool rawTSBK, bool noTrellis) if ((m_siteIdenEntry.chBandwidthKhz() != 0.0F) && (m_siteIdenEntry.chSpaceKhz() != 0.0F) && (m_siteIdenEntry.txOffsetMhz() != 0.0F) && (m_siteIdenEntry.baseFrequency() != 0U)) { uint32_t calcSpace = (uint32_t)(m_siteIdenEntry.chSpaceKhz() / 0.125); - uint32_t calcTxOffset = (uint32_t)((abs(m_siteIdenEntry.txOffsetMhz()) / m_siteIdenEntry.chSpaceKhz()) * 1000); + uint32_t calcTxOffset = (uint32_t)((fabs(m_siteIdenEntry.txOffsetMhz()) / m_siteIdenEntry.chSpaceKhz()) * 1000); if (m_siteIdenEntry.txOffsetMhz() > 0.0F) calcTxOffset |= 0x2000U; // this sets a positive offset ... @@ -748,7 +749,7 @@ void TSBK::encode(uint8_t * data, bool rawTSBK, bool noTrellis) tsbkValue = (tsbkValue << 32) + calcBaseFreq; // Base Frequency } else { - LogError(LOG_P25, "TSBK::encode(), invalid values for TSBK_OSP_IDEN_UP_VU, baseFrequency = %uHz, txOffsetMhz = %uMHz, chBandwidthKhz = %fKHz, chSpaceKhz = %fKHz", + LogError(LOG_P25, "TSBK::encode(), invalid values for TSBK_OSP_IDEN_UP_VU, baseFrequency = %uHz, txOffsetMhz = %fMHz, chBandwidthKhz = %fKHz, chSpaceKhz = %fKHz", m_siteIdenEntry.baseFrequency(), m_siteIdenEntry.txOffsetMhz(), m_siteIdenEntry.chBandwidthKhz(), m_siteIdenEntry.chSpaceKhz()); return; // blatently ignore creating this TSBK @@ -831,7 +832,7 @@ void TSBK::encode(uint8_t * data, bool rawTSBK, bool noTrellis) } uint32_t calcSpace = (uint32_t)(m_siteIdenEntry.chSpaceKhz() / 0.125); - uint32_t calcTxOffset = (uint32_t)((abs(m_siteIdenEntry.txOffsetMhz()) * 1000000) / 250000); + uint32_t calcTxOffset = (uint32_t)((fabs(m_siteIdenEntry.txOffsetMhz()) * 1000000) / 250000); if (m_siteIdenEntry.txOffsetMhz() > 0.0F) calcTxOffset |= 0x100U; // this sets a positive offset ... @@ -845,7 +846,7 @@ void TSBK::encode(uint8_t * data, bool rawTSBK, bool noTrellis) tsbkValue = (tsbkValue << 32) + calcBaseFreq; // Base Frequency } else { - LogError(LOG_P25, "TSBK::encode(), invalid values for TSBK_OSP_IDEN_UP, baseFrequency = %uHz, txOffsetMhz = %uMHz, chBandwidthKhz = %fKHz, chSpaceKhz = %fKHz", + LogError(LOG_P25, "TSBK::encode(), invalid values for TSBK_OSP_IDEN_UP, baseFrequency = %uHz, txOffsetMhz = %fMHz, chBandwidthKhz = %fKHz, chSpaceKhz = %fKHz", m_siteIdenEntry.baseFrequency(), m_siteIdenEntry.txOffsetMhz(), m_siteIdenEntry.chBandwidthKhz(), m_siteIdenEntry.chSpaceKhz()); return; // blatently ignore creating this TSBK