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

Add more NXDN support

Browse source
This commit is contained in:
Andy CA6JAU 2018-02-13 21:16:46 -03:00
parent 4fdf4254b2
commit 115806c570
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SerialPort.cpp
View file

@ -124,6 +124,8 @@ void CSerialPort::getStatus()
reply[3U] |= 0x04U; reply[3U] |= 0x04U;
if (m_p25Enable) if (m_p25Enable)
reply[3U] |= 0x08U; reply[3U] |= 0x08U;
if (m_nxdnEnable)
reply[3U] |= 0x10U;
reply[4U] = uint8_t(m_modemState); reply[4U] = uint8_t(m_modemState);
@ -168,6 +170,11 @@ void CSerialPort::getStatus()
else else
reply[10U] = 0U; reply[10U] = 0U;
if (m_nxdnEnable)
reply[11U] = nxdnTX.getSpace();
else
reply[11U] = 0U;
writeInt(1U, reply, 11); writeInt(1U, reply, 11);
} }
@ -241,12 +248,14 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
m_dmrEnable = dmrEnable; m_dmrEnable = dmrEnable;
m_ysfEnable = ysfEnable; m_ysfEnable = ysfEnable;
m_p25Enable = p25Enable; m_p25Enable = p25Enable;
m_nxdnEnable = nxdnEnable;
m_duplex = !simplex; m_duplex = !simplex;
dstarTX.setTXDelay(txDelay); dstarTX.setTXDelay(txDelay);
ysfTX.setTXDelay(txDelay); ysfTX.setTXDelay(txDelay);
p25TX.setTXDelay(txDelay); p25TX.setTXDelay(txDelay);
nxdnTX.setTXDelay(txDelay);
dmrDMOTX.setTXDelay(txDelay); dmrDMOTX.setTXDelay(txDelay);
#if defined(DUPLEX) #if defined(DUPLEX)
@ -268,6 +277,8 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
io.ifConf(STATE_YSF, true); io.ifConf(STATE_YSF, true);
else if(m_p25Enable) else if(m_p25Enable)
io.ifConf(STATE_P25, true); io.ifConf(STATE_P25, true);
else if(m_nxdnEnable)
io.ifConf(STATE_NXDN, true);
io.start(); io.start();
io.printConf(); io.printConf();
@ -340,6 +351,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
dstarRX.reset(); dstarRX.reset();
ysfRX.reset(); ysfRX.reset();
p25RX.reset(); p25RX.reset();
nxdnRX.reset();
cwIdTX.reset(); cwIdTX.reset();
break; break;
case STATE_DSTAR: case STATE_DSTAR:
@ -351,6 +363,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
dmrDMORX.reset(); dmrDMORX.reset();
ysfRX.reset(); ysfRX.reset();
p25RX.reset(); p25RX.reset();
nxdnRX.reset();
cwIdTX.reset(); cwIdTX.reset();
break; break;
case STATE_YSF: case STATE_YSF:
@ -362,6 +375,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
dmrDMORX.reset(); dmrDMORX.reset();
dstarRX.reset(); dstarRX.reset();
p25RX.reset(); p25RX.reset();
nxdnRX.reset();
cwIdTX.reset(); cwIdTX.reset();
break; break;
case STATE_P25: case STATE_P25:
@ -373,6 +387,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
dmrDMORX.reset(); dmrDMORX.reset();
dstarRX.reset(); dstarRX.reset();
ysfRX.reset(); ysfRX.reset();
nxdnRX.reset();
cwIdTX.reset(); cwIdTX.reset();
break; break;
case STATE_NXDN: case STATE_NXDN: