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

@@ -21,7 +21,7 @@
static bool networkInfoInitialized = false;
static unsigned char passCounter = 0;
CCASTInfo::CCASTInfo(CModem* modem) :
CCASTInfo::CCASTInfo(IModem* modem) :
CDisplay(),
m_modem(modem),
m_ipaddress()
@@ -130,6 +130,16 @@ void CCASTInfo::clearNXDNInt()
{
}
void CCASTInfo::writeM17Int(const char* source, const char* dest, const char* type)
{
if (m_modem != NULL)
m_modem->writeM17Info(source, dest, type);
}
void CCASTInfo::clearM17Int()
{
}
void CCASTInfo::writePOCSAGInt(uint32_t ric, const std::string& message)
{
if (m_modem != NULL)