g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 22:45:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

COnvert to handling new style YSF data from the modem.

Browse source
This commit is contained in:
Jonathan Naylor 2016-04-12 21:33:16 +01:00
parent 8eb564ba37
commit 8f836716b8
3 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
YSFControl.cpp
View file

@ -79,9 +79,13 @@ bool CYSFControl::writeModem(unsigned char *data)
if (type == TAG_LOST)
return false;
bool valid = (data[1U] & YSF_CKSUM_OK) == YSF_CKSUM_OK;
bool valid = m_fich.decode(data + 2U);
if (valid && m_state == RS_RF_LISTENING) {
unsigned char fi = m_fich.getFI();
if (fi == YSF_FI_TERMINATOR)
return false;
if (type == TAG_DATA && valid && m_state == RS_RF_LISTENING) {
m_frames = 0U;
m_timeoutTimer.start();
m_payload.reset();
@ -94,12 +98,10 @@ bool CYSFControl::writeModem(unsigned char *data)
if (m_state != RS_RF_AUDIO)
return false;
if (type == TAG_EOT) {
unsigned char fi = m_fich.getFI();
if (valid && fi == YSF_FI_TERMINATOR) {
CSync::addYSFSync(data + 2U);
m_fich.decode(data + 2U);
unsigned char fi = m_fich.getFI();
unsigned char fn = m_fich.getFN();
unsigned char dt = m_fich.getDT();
@ -140,10 +142,6 @@ bool CYSFControl::writeModem(unsigned char *data)
CSync::addYSFSync(data + 2U);
if (valid) {
bool ret = m_fich.decode(data + 2U);
assert(ret);
unsigned char fi = m_fich.getFI();
unsigned char cm = m_fich.getCM();
unsigned char fn = m_fich.getFN();
unsigned char dt = m_fich.getDT();