Revert "Revert "Merge branch 'M17_AX25_FM'""

This reverts commit 135fd04e0d.
This commit is contained in:
Jonathan Naylor
2020-12-15 16:02:11 +00:00
parent 135fd04e0d
commit a95389242b
115 changed files with 9598 additions and 4823 deletions

View File

@@ -19,9 +19,7 @@
#include "NullModem.h"
#include "Log.h"
CNullModem::CNullModem(const std::string& port, bool duplex, bool rxInvert, bool txInvert, bool pttInvert, unsigned int txDelay, unsigned int dmrDelay, bool useCOSAsLockout, bool trace, bool debug) :
CModem(port, duplex,rxInvert, txInvert,pttInvert,txDelay, dmrDelay, useCOSAsLockout, trace, debug),
m_hwType(HWT_MMDVM)
CNullModem::CNullModem()
{
}
@@ -29,7 +27,9 @@ CNullModem::~CNullModem()
{
}
bool CNullModem::open(){
bool CNullModem::open()
{
::LogMessage("Opening the MMDVM Null Modem");
return true;
}
}