Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #365 from juribeparada/master

Browse source 
Fix setFrequency() length for DVMega
This commit is contained in:
Jonathan Naylor 2018-01-02 13:58:46 +00:00 committed by GitHub
commit 8423f3f653
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Modem.cpp
View file

@ -1044,10 +1044,18 @@ bool CModem::setConfig()
bool CModem::setFrequency() bool CModem::setFrequency()
{ {
unsigned char buffer[16U]; unsigned char buffer[16U];
unsigned char len;
if (m_hwType == HWT_DVMEGA)
len = 12U;
else {
buffer[12U] = (unsigned char)(m_rfLevel * 2.55F + 0.5F);
len = 13U;
}
buffer[0U] = MMDVM_FRAME_START; buffer[0U] = MMDVM_FRAME_START;
buffer[1U] = 13U; buffer[1U] = len;
buffer[2U] = MMDVM_SET_FREQ; buffer[2U] = MMDVM_SET_FREQ;
@ -1062,13 +1070,11 @@ bool CModem::setFrequency()
buffer[9U] = (m_txFrequency >> 8) & 0xFFU; buffer[9U] = (m_txFrequency >> 8) & 0xFFU;
buffer[10U] = (m_txFrequency >> 16) & 0xFFU; buffer[10U] = (m_txFrequency >> 16) & 0xFFU;
buffer[11U] = (m_txFrequency >> 24) & 0xFFU; buffer[11U] = (m_txFrequency >> 24) & 0xFFU;
buffer[12U] = (unsigned char)(m_rfLevel * 2.55F + 0.5F);
// CUtils::dump(1U, "Written", buffer, 13U); // CUtils::dump(1U, "Written", buffer, len);
int ret = m_serial.write(buffer, 13U); int ret = m_serial.write(buffer, len);
if (ret != 13) if (ret != len)
return false; return false;
unsigned int count = 0U; unsigned int count = 0U;