Merge branch 'master' into AX25_FM

This commit is contained in:
Jonathan Naylor
2020-08-09 15:09:46 +01:00
19 changed files with 68 additions and 66 deletions

View File

@@ -100,7 +100,7 @@ void CCASTInfo::clearDMRInt(unsigned int slotNo)
{
}
void CCASTInfo::writeFusionInt(const char* source, const char* dest, const char* type, const char* origin)
void CCASTInfo::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin)
{
if (m_modem != NULL)
m_modem->writeYSFInfo(source, dest, type, origin);