Remove the level adjustments.

This commit is contained in:
Jonathan Naylor
2016-07-07 17:40:41 +01:00
parent e0a6229d6c
commit 25dddc18f4
6 changed files with 4 additions and 141 deletions

View File

@@ -648,13 +648,6 @@ bool CMMDVMHost::createModem()
unsigned int colorCode = m_conf.getDMRColorCode();
unsigned int rxFrequency = m_conf.getRxFrequency();
unsigned int txFrequency = m_conf.getTxFrequency();
int dstarLevel = m_conf.getModemDStarLevel();
int dmrLevel1 = m_conf.getModemDMRLevel1();
int dmrLevel3 = m_conf.getModemDMRLevel3();
int ysfLevel1 = m_conf.getModemYSFLevel1();
int ysfLevel3 = m_conf.getModemYSFLevel3();
int dmrThreshold = m_conf.getModemDMRThreshold();
int ysfThreshold = m_conf.getModemYSFThreshold();
int oscOffset = m_conf.getModemOscOffset();
LogInfo("Modem Parameters");
@@ -669,26 +662,10 @@ bool CMMDVMHost::createModem()
LogInfo(" RX Frequency: %uHz", rxFrequency);
LogInfo(" TX Frequency: %uHz", txFrequency);
if (dstarLevel != 0)
LogInfo(" D-Star Level: %.1f%%", float(dstarLevel) / 10.0F);
if (dmrLevel1 != 0)
LogInfo(" DMR Level 1: %.1f%%", float(dmrLevel1) / 10.0F);
if (dmrLevel3 != 0)
LogInfo(" DMR Level 3: %.1f%%", float(dmrLevel3) / 10.0F);
if (ysfLevel1 != 0)
LogInfo(" YSF Level 1: %.1f%%", float(ysfLevel1) / 10.0F);
if (ysfLevel3 != 0)
LogInfo(" YSF Level 3: %.1f%%", float(ysfLevel3) / 10.0F);
if (dmrThreshold != 0)
LogInfo(" DMR Threshold: %.1f%%", float(dmrThreshold) / 10.0F);
if (ysfThreshold != 0)
LogInfo(" YSF Threshold: %.1f%%", float(ysfThreshold) / 10.0F);
LogInfo(" Osc. Offset: %dppm", oscOffset);
m_modem = new CModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, rxLevel, txLevel, dmrDelay, oscOffset, debug);
m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled);
m_modem->setModeLevels(dstarLevel, dmrLevel1, dmrLevel3, ysfLevel1, ysfLevel3, dmrThreshold, ysfThreshold);
m_modem->setRFParams(rxFrequency, txFrequency);
m_modem->setDMRParams(colorCode);