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

Add crude M17 capability checking for V1 MMDVMs.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-07-23 15:00:07 +01:00
parent 8a80d9678c
commit 38227730d0
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Modem.cpp
View File

@@ -2027,9 +2027,11 @@ bool CModem::readVersion()
switch (m_protocolVersion) { switch (m_protocolVersion) {
case 1U: case 1U:
LogInfo("MMDVM protocol version: 1, description: %.*s", m_length - 4U, m_buffer + 4U); LogInfo("MMDVM protocol version: 1, description: %.*s", m_length - 4U, m_buffer + 4U);
m_capabilities1 = CAP1_DSTAR | CAP1_DMR | CAP1_YSF | CAP1_P25 | CAP1_NXDN | CAP1_M17; m_capabilities1 = CAP1_DSTAR | CAP1_DMR | CAP1_YSF | CAP1_P25 | CAP1_NXDN;
m_capabilities2 = CAP2_POCSAG; m_capabilities2 = CAP2_POCSAG;
return true; if (::strstr((char*)(m_buffer + 4U), "v1.6.") != NULL)
m_capabilities1 |= CAP1_M17;
break;
case 2U: case 2U:
LogInfo("MMDVM protocol version: 2, description: %.*s", m_length - 23U, m_buffer + 23U); LogInfo("MMDVM protocol version: 2, description: %.*s", m_length - 23U, m_buffer + 23U);
@@ -2049,34 +2051,35 @@ bool CModem::readVersion()
} }
m_capabilities1 = m_buffer[4U]; m_capabilities1 = m_buffer[4U];
m_capabilities2 = m_buffer[5U]; m_capabilities2 = m_buffer[5U];
char modeText[100U]; break;
::strcpy(modeText, "Modes:");
if (hasDStar())
::strcat(modeText, " D-Star");
if (hasDMR())
::strcat(modeText, " DMR");
if (hasYSF())
::strcat(modeText, " YSF");
if (hasP25())
::strcat(modeText, " P25");
if (hasNXDN())
::strcat(modeText, " NXDN");
if (hasM17())
::strcat(modeText, " M17");
if (hasFM())
::strcat(modeText, " FM");
if (hasPOCSAG())
::strcat(modeText, " POCSAG");
if (hasAX25())
::strcat(modeText, " AX.25");
LogInfo(modeText);
return true;
default: default:
LogError("MMDVM protocol version: %u, unsupported by this version of the MMDVM Host", m_protocolVersion); LogError("MMDVM protocol version: %u, unsupported by this version of the MMDVM Host", m_protocolVersion);
return false; return false;
} }
char modeText[100U];
::strcpy(modeText, "Modes:");
if (hasDStar())
::strcat(modeText, " D-Star");
if (hasDMR())
::strcat(modeText, " DMR");
if (hasYSF())
::strcat(modeText, " YSF");
if (hasP25())
::strcat(modeText, " P25");
if (hasNXDN())
::strcat(modeText, " NXDN");
if (hasM17())
::strcat(modeText, " M17");
if (hasFM())
::strcat(modeText, " FM");
if (hasPOCSAG())
::strcat(modeText, " POCSAG");
if (hasAX25())
::strcat(modeText, " AX.25");
LogInfo(modeText);
return true; return true;
} }
} }

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20220523"; const char* VERSION = "20230723";
#endif #endif