Merge pull request #346 from pjao/master

Fix "Unknown (MMDVM)" to appear as "MMDVM_HS (MMDVM)"
This commit is contained in:
Jonathan Naylor
2017-11-20 11:00:23 +00:00
committed by GitHub
3 changed files with 6 additions and 0 deletions

View File

@@ -543,6 +543,9 @@ bool CDMRNetwork::writeConfig()
case HWT_DVMEGA:
software = "MMDVM_DVMega";
break;
case HWT_MMDVM_HS:
software = "MMDVM_HS";
break;
default:
software = "MMDVM_Unknown";
break;

View File

@@ -36,6 +36,7 @@ const unsigned char TAG_EOT = 0x03U;
enum HW_TYPE {
HWT_MMDVM,
HWT_DVMEGA,
HWT_MMDVM_HS,
HWT_UNKNOWN
};

View File

@@ -918,6 +918,8 @@ bool CModem::readVersion()
m_hwType = HWT_MMDVM;
else if (::memcmp(m_buffer + 4U, "DVMEGA", 6U) == 0)
m_hwType = HWT_DVMEGA;
else if (::memcmp(m_buffer + 4U, "ZUMspot", 7U) == 0)
m_hwType = HWT_MMDVM_HS;
LogInfo("MMDVM protocol version: %u, description: %.*s", m_buffer[3U], m_length - 4U, m_buffer + 4U);
return true;