Merge branch 'AX25_FM' into M17_AX25_FM

This commit is contained in:
Jonathan Naylor 2020-11-06 15:06:00 +00:00
commit 55c89a4413
81 changed files with 3695 additions and 2077 deletions

View file

@ -34,6 +34,7 @@ bool m_nxdnEnable = true;
bool m_m17Enable = true;
bool m_pocsagEnable = true;
bool m_fmEnable = true;
bool m_ax25Enable = true;
bool m_duplex = true;
@ -65,6 +66,8 @@ CM17TX m17TX;
CPOCSAGTX pocsagTX;
CFM fm;
CAX25RX ax25RX;
CAX25TX ax25TX;
CCalDStarRX calDStarRX;
CCalDStarTX calDStarTX;
@ -117,6 +120,9 @@ void loop()
if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy()))
pocsagTX.process();
if (m_ax25Enable && (m_modemState == STATE_IDLE || m_modemState == STATE_FM))
ax25TX.process();
if (m_fmEnable && m_modemState == STATE_FM)
fm.process();