Merge branch 'master' into AX25_FM

This commit is contained in:
Jonathan Naylor 2020-08-31 16:09:44 +01:00
commit cb3ed795d0
3 changed files with 30 additions and 16 deletions

View file

@ -109,7 +109,7 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
#define HW_TYPE "MMDVM"
#endif
#define DESCRIPTION "20200731 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM/AX.25)"
#define DESCRIPTION "20200831 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM/AX.25)"
#if defined(GITVERSION)
#define concat(h, a, b, c) h " " a " " b " GitID #" c ""
@ -625,9 +625,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
cwIdTX.reset();
m_modemState = modemState;
io.setMode();
io.setMode(modemState);
}
void CSerialPort::start()