MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 16:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into AX25_FM

Browse Source
This commit is contained in:
Jonathan Naylor
2020-08-09 19:40:37 +01:00
parent 82ea772269 c7fbeecc50
commit 97a10c7e30
13 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SerialModem.cpp
View File

@@ -1516,7 +1516,7 @@ bool CSerialModem::writeDMRInfo(unsigned int slotNo, const std::string& src, boo
return m_serial->write(buffer, 47U) != 47;
}
bool CSerialModem::writeYSFInfo(const char* source, const char* dest, const char* type, const char* origin)
bool CSerialModem::writeYSFInfo(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin)
{
assert(m_serial != NULL);
assert(source != NULL);
@@ -1524,10 +1524,10 @@ bool CSerialModem::writeYSFInfo(const char* source, const char* dest, const char
assert(type != NULL);
assert(origin != NULL);
unsigned char buffer[50U];
unsigned char buffer[40U];
buffer[0U] = MMDVM_FRAME_START;
buffer[1U] = 35U;
buffer[1U] = 36U;
buffer[2U] = MMDVM_QSO_INFO;
buffer[3U] = MODE_YSF;
@@ -1539,7 +1539,9 @@ bool CSerialModem::writeYSFInfo(const char* source, const char* dest, const char
::memcpy(buffer + 25U, origin, YSF_CALLSIGN_LENGTH);
return m_serial->write(buffer, 35U) != 35;
buffer[35U] = dgid;
return m_serial->write(buffer, 36U) != 36;
}
bool CSerialModem::writeP25Info(const char* source, bool group, unsigned int dest, const char* type)