From 25dddc18f4001db663713f722138cef933d2241f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 7 Jul 2016 17:40:41 +0100 Subject: [PATCH] Remove the level adjustments. --- Conf.cpp | 56 --------------------------------------------------- Conf.h | 14 ------------- MMDVM.ini | 8 -------- MMDVMHost.cpp | 23 --------------------- Modem.cpp | 36 ++++----------------------------- Modem.h | 8 -------- 6 files changed, 4 insertions(+), 141 deletions(-) diff --git a/Conf.cpp b/Conf.cpp index a26eafc..8a67ea2 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -78,13 +78,6 @@ m_modemTXDelay(100U), m_modemDMRDelay(0U), m_modemRXLevel(100U), m_modemTXLevel(100U), -m_modemDStarLevel(0), -m_modemDMRLevel1(0), -m_modemDMRLevel3(0), -m_modemYSFLevel1(0), -m_modemYSFLevel3(0), -m_modemDMRThreshold(0), -m_modemYSFThreshold(0), m_modemOscOffset(0), m_modemDebug(false), m_dstarEnabled(true), @@ -279,20 +272,6 @@ bool CConf::read() m_modemRXLevel = (unsigned int)::atoi(value); else if (::strcmp(key, "TXLevel") == 0) m_modemTXLevel = (unsigned int)::atoi(value); - else if (::strcmp(key, "DStarLevel") == 0) - m_modemDStarLevel = ::atoi(value); - else if (::strcmp(key, "DMRLevel1") == 0) - m_modemDMRLevel1 = ::atoi(value); - else if (::strcmp(key, "DMRLevel3") == 0) - m_modemDMRLevel3 = ::atoi(value); - else if (::strcmp(key, "YSFLevel1") == 0) - m_modemYSFLevel1 = ::atoi(value); - else if (::strcmp(key, "YSFLevel3") == 0) - m_modemYSFLevel3 = ::atoi(value); - else if (::strcmp(key, "DMRThreshold") == 0) - m_modemDMRThreshold = ::atoi(value); - else if (::strcmp(key, "YSFThreshold") == 0) - m_modemYSFThreshold = ::atoi(value); else if (::strcmp(key, "OscOffset") == 0) m_modemOscOffset = ::atoi(value); else if (::strcmp(key, "Debug") == 0) @@ -638,41 +617,6 @@ unsigned int CConf::getModemTXLevel() const return m_modemTXLevel; } -int CConf::getModemDStarLevel() const -{ - return m_modemDStarLevel; -} - -int CConf::getModemDMRLevel1() const -{ - return m_modemDMRLevel1; -} - -int CConf::getModemDMRLevel3() const -{ - return m_modemDMRLevel3; -} - -int CConf::getModemYSFLevel1() const -{ - return m_modemYSFLevel1; -} - -int CConf::getModemYSFLevel3() const -{ - return m_modemYSFLevel3; -} - -int CConf::getModemDMRThreshold() const -{ - return m_modemDMRThreshold; -} - -int CConf::getModemYSFThreshold() const -{ - return m_modemYSFThreshold; -} - int CConf::getModemOscOffset() const { return m_modemOscOffset; diff --git a/Conf.h b/Conf.h index cdeb98d..08b6621 100644 --- a/Conf.h +++ b/Conf.h @@ -69,13 +69,6 @@ public: unsigned int getModemDMRDelay() const; unsigned int getModemRXLevel() const; unsigned int getModemTXLevel() const; - int getModemDStarLevel() const; - int getModemDMRLevel1() const; - int getModemDMRLevel3() const; - int getModemYSFLevel1() const; - int getModemYSFLevel3() const; - int getModemDMRThreshold() const; - int getModemYSFThreshold() const; int getModemOscOffset() const; bool getModemDebug() const; @@ -193,13 +186,6 @@ private: unsigned int m_modemDMRDelay; unsigned int m_modemRXLevel; unsigned int m_modemTXLevel; - int m_modemDStarLevel; - int m_modemDMRLevel1; - int m_modemDMRLevel3; - int m_modemYSFLevel1; - int m_modemYSFLevel3; - int m_modemDMRThreshold; - int m_modemYSFThreshold; int m_modemOscOffset; bool m_modemDebug; diff --git a/MMDVM.ini b/MMDVM.ini index 594956a..494a87b 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -40,13 +40,6 @@ TXDelay=100 DMRDelay=0 RXLevel=50 TXLevel=50 -DStarLevel=0 -DMRLevel1=0 -DMRLevel3=0 -YSFLevel1=0 -YSFLevel3=0 -DMRThreshold=0 -YSFThreshold=0 OscOffset=0 Debug=0 @@ -71,7 +64,6 @@ TXHang=4 #DstIdWhiteListSlot1= #DstIdWhiteListSlot2= - [System Fusion] Enable=1 diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index c638821..1988e99 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -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); diff --git a/Modem.cpp b/Modem.cpp index 0b9971e..e66aa9f 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -87,13 +87,6 @@ m_txDelay(txDelay), m_dmrDelay(dmrDelay), m_rxLevel(rxLevel), m_txLevel(txLevel), -m_dstarLevel(0), -m_dmrLevel1(0), -m_dmrLevel3(0), -m_ysfLevel1(0), -m_ysfLevel3(0), -m_dmrThreshold(0), -m_ysfThreshold(0), m_oscOffset(oscOffset), m_debug(debug), m_rxFrequency(0U), @@ -140,17 +133,6 @@ void CModem::setRFParams(unsigned int rxFrequency, unsigned int txFrequency) m_txFrequency = txFrequency; } -void CModem::setModeLevels(int dstarLevel, int dmrLevel1, int dmrLevel3, int ysfLevel1, int ysfLevel3, int dmrThreshold, int ysfThreshold) -{ - m_dstarLevel = dstarLevel; - m_dmrLevel1 = dmrLevel1; - m_dmrLevel3 = dmrLevel3; - m_ysfLevel1 = ysfLevel1; - m_ysfLevel3 = ysfLevel3; - m_dmrThreshold = dmrThreshold; - m_ysfThreshold = ysfThreshold; -} - void CModem::setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled) { m_dstarEnabled = dstarEnabled; @@ -761,13 +743,11 @@ bool CModem::readStatus() bool CModem::setConfig() { - unsigned int length = m_duplex ? 19U : 12U; - unsigned char buffer[20U]; buffer[0U] = MMDVM_FRAME_START; - buffer[1U] = length; + buffer[1U] = 12U; buffer[2U] = MMDVM_SET_CONFIG; @@ -800,18 +780,10 @@ bool CModem::setConfig() buffer[11U] = (unsigned char)(m_oscOffset + 128); - buffer[12U] = (unsigned char)(m_dstarLevel + 128); - buffer[13U] = (unsigned char)(m_dmrLevel1 + 128); - buffer[14U] = (unsigned char)(m_dmrLevel3 + 128); - buffer[15U] = (unsigned char)(m_ysfLevel1 + 128); - buffer[16U] = (unsigned char)(m_ysfLevel3 + 128); - buffer[17U] = (unsigned char)(m_dmrThreshold + 128); - buffer[18U] = (unsigned char)(m_ysfThreshold + 128); + // CUtils::dump(1U, "Written", buffer, 12U); - // CUtils::dump(1U, "Written", buffer, length); - - int ret = m_serial.write(buffer, length); - if (ret != int(length)) + int ret = m_serial.write(buffer, 12U); + if (ret != 12) return false; unsigned int count = 0U; diff --git a/Modem.h b/Modem.h index 07300a8..df34620 100644 --- a/Modem.h +++ b/Modem.h @@ -37,7 +37,6 @@ public: ~CModem(); void setRFParams(unsigned int rxFrequency, unsigned int txFrequency); - void setModeLevels(int dstarLevel, int dmrLevel1, int dmrLevel3, int ysfLevel1, int ysfLevel3, int dmrThreshold, int ysfThreshold); void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled); void setDMRParams(unsigned int colorCode); @@ -86,13 +85,6 @@ private: unsigned int m_dmrDelay; unsigned int m_rxLevel; unsigned int m_txLevel; - int m_dstarLevel; - int m_dmrLevel1; - int m_dmrLevel3; - int m_ysfLevel1; - int m_ysfLevel3; - int m_dmrThreshold; - int m_ysfThreshold; int m_oscOffset; bool m_debug; unsigned int m_rxFrequency;