juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2025-12-06 07:12:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for NAK error using MMDVMCal with simplex firmware

Browse source
This commit is contained in:
Andy CA6JAU 2018-02-24 17:21:00 -03:00
parent cf557ad690
commit d1047a4020
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SerialPort.cpp
View file

@ -207,13 +207,6 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
bool ysfLoDev = (data[0U] & 0x08U) == 0x08U;
bool simplex = (data[0U] & 0x80U) == 0x80U;
#if !defined(DUPLEX)
if (!simplex) {
DEBUG1("Full duplex not supported with this firmware");
return 6U;
}
#endif
m_debug = (data[0U] & 0x10U) == 0x10U;
bool dstarEnable = (data[1U] & 0x01U) == 0x01U;
@ -266,7 +259,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
m_dmrEnable = dmrEnable;
m_ysfEnable = ysfEnable;
m_p25Enable = p25Enable;
m_nxdnEnable = nxdnEnable;
m_nxdnEnable = nxdnEnable;
if (modemState == STATE_DMRCAL || modemState == STATE_DMRDMO1K || modemState == STATE_RSSICAL) {
m_dmrEnable = true;
@ -278,12 +271,19 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
io.ifConf(STATE_DMR, true);
}
else {
m_modemState = modemState;
m_modemState = modemState;
m_calState = STATE_IDLE;
}
m_duplex = !simplex;
#if !defined(DUPLEX)
if (m_duplex && m_calState == STATE_IDLE && modemState != STATE_DSTARCAL) {
DEBUG1("Full duplex not supported with this firmware");
return 6U;
}
#endif
dstarTX.setTXDelay(txDelay);
ysfTX.setTXDelay(txDelay);
p25TX.setTXDelay(txDelay);