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

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