Merge branch 'master' into M17_AX25_FM

This commit is contained in:
Jonathan Naylor
2020-11-09 12:05:18 +00:00
4 changed files with 6 additions and 1 deletions

View File

@@ -391,6 +391,9 @@ bool CDMRNetwork::writeConfig()
case HWT_OPENGD77_HS: case HWT_OPENGD77_HS:
software = "MMDVM_OpenGD77_HS"; software = "MMDVM_OpenGD77_HS";
break; break;
case HWT_SKYBRIDGE:
software = "MMDVM_SkyBridge";
break;
default: default:
software = "MMDVM_Unknown"; software = "MMDVM_Unknown";
break; break;

View File

@@ -51,6 +51,7 @@ enum HW_TYPE {
HWT_D2RG_MMDVM_HS, HWT_D2RG_MMDVM_HS,
HWT_MMDVM_HS, HWT_MMDVM_HS,
HWT_OPENGD77_HS, HWT_OPENGD77_HS,
HWT_SKYBRIDGE,
HWT_UNKNOWN HWT_UNKNOWN
}; };

View File

@@ -21,4 +21,3 @@
IModem::~IModem() IModem::~IModem()
{ {
} }

View File

@@ -1843,6 +1843,8 @@ bool CSerialModem::readVersion()
m_hwType = HWT_MMDVM_HS; m_hwType = HWT_MMDVM_HS;
else if (::memcmp(m_buffer + 4U, "OpenGD77_HS", 11U) == 0) else if (::memcmp(m_buffer + 4U, "OpenGD77_HS", 11U) == 0)
m_hwType = HWT_OPENGD77_HS; m_hwType = HWT_OPENGD77_HS;
else if (::memcmp(m_buffer + 4U, "SkyBridge", 9U) == 0)
m_hwType = HWT_SKYBRIDGE;
LogInfo("MMDVM protocol version: %u, description: %.*s", m_buffer[3U], m_length - 4U, m_buffer + 4U); LogInfo("MMDVM protocol version: %u, description: %.*s", m_buffer[3U], m_length - 4U, m_buffer + 4U);