Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix incorrect path in Makefile; fix rounding error during IDEN_UP and IDEN_UP_VU Tx offset calculation;

Browse Source
pull/12/head
Bryan Biedenkapp 4 years ago
parent 270208432f
commit bdc9973bc5
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
Makefile
Unescape View File

@ -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

5
p25/lc/TDULC.cpp
Unescape View File

@ -36,6 +36,7 @@ using namespace p25::lc;
using namespace p25;
#include <cstdio>
#include <cmath>
#include <cassert>
#include <cstring>
@ -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

9
p25/lc/TSBK.cpp
Unescape View File

@ -35,6 +35,7 @@ using namespace p25::lc;
using namespace p25;
#include <cstdio>
#include <cmath>
#include <cassert>
#include <cstring>
@ -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

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.