Convert TXTwist to TXDelay.

This commit is contained in:
Jonathan Naylor
2020-06-27 22:47:54 +01:00
parent d1a809808b
commit 97f1ebb25f
8 changed files with 24 additions and 23 deletions

View File

@@ -636,13 +636,13 @@ int CMMDVMHost::run()
}
if (m_ax25Enabled) {
int rxTwist = m_conf.getAX25RXTwist();
int txTwist = m_conf.getAX25TXTwist();
bool trace = m_conf.getAX25Trace();
int rxTwist = m_conf.getAX25RXTwist();
unsigned int txDelay = m_conf.getAX25TXDelay();
bool trace = m_conf.getAX25Trace();
LogInfo("AX.25 RF Parameters");
LogInfo(" RXTwist: %d", rxTwist);
LogInfo(" TXTwist: %d", txTwist);
LogInfo(" RX Twist: %d", rxTwist);
LogInfo(" TX Delay: %ums", txDelay);
LogInfo(" Trace: %s", trace ? "yes" : "no");
m_ax25 = new CAX25Control(m_ax25Network, trace);
@@ -1293,7 +1293,7 @@ bool CMMDVMHost::createModem()
int txDCOffset = m_conf.getModemTXDCOffset();
float rfLevel = m_conf.getModemRFLevel();
int rxTwist = m_conf.getAX25RXTwist();
int txTwist = m_conf.getAX25TXTwist();
unsigned int ax25TXDelay = m_conf.getAX25TXDelay();
LogInfo("Modem Parameters");
LogInfo(" Port: %s", port.c_str());
@@ -1335,7 +1335,7 @@ bool CMMDVMHost::createModem()
m_modem->setYSFParams(lowDeviation, ysfTXHang);
m_modem->setP25Params(p25TXHang);
m_modem->setNXDNParams(nxdnTXHang);
m_modem->setAX25Params(rxTwist, txTwist);
m_modem->setAX25Params(rxTwist, ax25TXDelay);
if (m_fmEnabled) {
std::string callsign = m_conf.getFMCallsign();