diff --git a/Conf.cpp b/Conf.cpp index 3764a61..3641e73 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -111,7 +111,6 @@ m_modemP25TXLevel(50.0F), m_modemNXDNTXLevel(50.0F), m_modemPOCSAGTXLevel(50.0F), m_modemFMTXLevel(50.0F), -m_modemFMRXLevel(50.0F), m_modemRSSIMappingFile(), m_modemTrace(false), m_modemDebug(false), @@ -483,7 +482,7 @@ bool CConf::read() else if (::strcmp(key, "RFLevel") == 0) m_modemRFLevel = float(::atof(value)); else if (::strcmp(key, "RXLevel") == 0) - m_modemFMRXLevel = m_modemRXLevel = float(::atof(value)); + m_modemRXLevel = float(::atof(value)); else if (::strcmp(key, "TXLevel") == 0) m_modemFMTXLevel = m_modemCWIdTXLevel = m_modemDStarTXLevel = m_modemDMRTXLevel = m_modemYSFTXLevel = m_modemP25TXLevel = m_modemNXDNTXLevel = float(::atof(value)); else if (::strcmp(key, "CWIdTXLevel") == 0) @@ -502,8 +501,6 @@ bool CConf::read() m_modemPOCSAGTXLevel = float(::atof(value)); else if (::strcmp(key, "FMTXLevel") == 0) m_modemFMTXLevel = float(::atof(value)); - else if (::strcmp(key, "FMRXLevel") == 0) - m_modemFMRXLevel = float(::atof(value)); else if (::strcmp(key, "RSSIMappingFile") == 0) m_modemRSSIMappingFile = value; else if (::strcmp(key, "Trace") == 0) @@ -1181,11 +1178,6 @@ float CConf::getModemFMTXLevel() const return m_modemFMTXLevel; } -float CConf::getModemFMRXLevel() const -{ - return m_modemFMRXLevel; -} - std::string CConf::getModemRSSIMappingFile () const { return m_modemRSSIMappingFile; diff --git a/Conf.h b/Conf.h index 1fa10b0..7be95d6 100644 --- a/Conf.h +++ b/Conf.h @@ -91,7 +91,6 @@ public: float getModemNXDNTXLevel() const; float getModemPOCSAGTXLevel() const; float getModemFMTXLevel() const; - float getModemFMRXLevel() const; std::string getModemRSSIMappingFile() const; bool getModemTrace() const; bool getModemDebug() const; @@ -362,7 +361,6 @@ private: float m_modemNXDNTXLevel; float m_modemPOCSAGTXLevel; float m_modemFMTXLevel; - float m_modemFMRXLevel; std::string m_modemRSSIMappingFile; bool m_modemTrace; bool m_modemDebug; diff --git a/MMDVM.ini b/MMDVM.ini index 063505f..d2a42ce 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -66,7 +66,6 @@ RFLevel=100 # NXDNTXLevel=50 # POCSAGTXLevel=50 # FMTXLevel=50 -# FMRXLevel=50 RSSIMappingFile=RSSI.dat Trace=0 Debug=0 diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index dc19d45..123f4ee 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1157,7 +1157,6 @@ bool CMMDVMHost::createModem() float nxdnTXLevel = m_conf.getModemNXDNTXLevel(); float pocsagTXLevel = m_conf.getModemPOCSAGTXLevel(); float fmTXLevel = m_conf.getModemFMTXLevel(); - float fmRXLevel = m_conf.getModemFMRXLevel(); bool trace = m_conf.getModemTrace(); bool debug = m_conf.getModemDebug(); unsigned int colorCode = m_conf.getDMRColorCode(); @@ -1196,13 +1195,12 @@ bool CMMDVMHost::createModem() LogInfo(" NXDN TX Level: %.1f%%", nxdnTXLevel); LogInfo(" POCSAG TX Level: %.1f%%", pocsagTXLevel); LogInfo(" FM TX Level: %.1f%%", fmTXLevel); - LogInfo(" FM RX Level: %.1f%%", fmRXLevel); LogInfo(" TX Frequency: %uHz (%uHz)", txFrequency, txFrequency + txOffset); m_modem = CModem::createModem(port, m_duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug); m_modem->setSerialParams(protocol,address); m_modem->setModeParams(m_dstarEnabled, m_dmrEnabled, m_ysfEnabled, m_p25Enabled, m_nxdnEnabled, m_pocsagEnabled, m_fmEnabled); - m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, fmRXLevel); + m_modem->setLevels(rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel); m_modem->setRFParams(rxFrequency, rxOffset, txFrequency, txOffset, txDCOffset, rxDCOffset, rfLevel, pocsagFrequency); m_modem->setDMRParams(colorCode); m_modem->setYSFParams(lowDeviation, txHang); diff --git a/Modem.cpp b/Modem.cpp index f26ca53..5bc6485 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -119,7 +119,6 @@ m_p25TXLevel(0U), m_nxdnTXLevel(0U), m_pocsagTXLevel(0U), m_fmTXLevel(0U), -m_fmRXLevel(0U), m_trace(trace), m_debug(debug), m_rxFrequency(0U), @@ -234,7 +233,7 @@ void CModem::setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, m_fmEnabled = fmEnabled; } -void CModem::setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagTXLevel, float fmTXLevel, float fmRXLevel) +void CModem::setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagTXLevel, float fmTXLevel) { m_rxLevel = rxLevel; m_cwIdTXLevel = cwIdTXLevel; @@ -245,7 +244,6 @@ void CModem::setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, flo m_nxdnTXLevel = nxdnTXLevel; m_pocsagTXLevel = pocsagTXLevel; m_fmTXLevel = fmTXLevel; - m_fmRXLevel = fmRXLevel; } void CModem::setDMRParams(unsigned int colorCode) @@ -1498,7 +1496,7 @@ bool CModem::setConfig() buffer[0U] = MMDVM_FRAME_START; - buffer[1U] = 23U; + buffer[1U] = 22U; buffer[2U] = MMDVM_SET_CONFIG; @@ -1561,12 +1559,11 @@ bool CModem::setConfig() buffer[20U] = (unsigned char)(m_pocsagTXLevel * 2.55F + 0.5F); buffer[21U] = (unsigned char)(m_fmTXLevel * 2.55F + 0.5F); - buffer[22U] = (unsigned char)(m_fmRXLevel * 2.55F + 0.5F); - // CUtils::dump(1U, "Written", buffer, 23U); + // CUtils::dump(1U, "Written", buffer, 22U); - int ret = m_serial->write(buffer, 23U); - if (ret != 23) + int ret = m_serial->write(buffer, 22U); + if (ret != 22) return false; unsigned int count = 0U; diff --git a/Modem.h b/Modem.h index 5db21bd..d879b1c 100644 --- a/Modem.h +++ b/Modem.h @@ -40,7 +40,7 @@ public: virtual void setSerialParams(const std::string& protocol, unsigned int address); virtual void setRFParams(unsigned int rxFrequency, int rxOffset, unsigned int txFrequency, int txOffset, int txDCOffset, int rxDCOffset, float rfLevel, unsigned int pocsagFrequency); virtual void setModeParams(bool dstarEnabled, bool dmrEnabled, bool ysfEnabled, bool p25Enabled, bool nxdnEnabled, bool pocsagEnabled, bool fmEnabled); - virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel, float fmTXLevel, float fmRXLevel); + virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel, float fmTXLevel); virtual void setDMRParams(unsigned int colorCode); virtual void setYSFParams(bool loDev, unsigned int txHang); virtual void setTransparentDataParams(unsigned int sendFrameType); @@ -132,7 +132,6 @@ private: float m_nxdnTXLevel; float m_pocsagTXLevel; float m_fmTXLevel; - float m_fmRXLevel; float m_rfLevel; bool m_trace; bool m_debug; diff --git a/Version.h b/Version.h index ac2d5dc..b5fc453 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20200422"; +const char* VERSION = "20200424"; #endif