Merge pull request #346 from pjao/master

Fix "Unknown (MMDVM)" to appear as "MMDVM_HS (MMDVM)"
g4klx · Nov 20, 2017 · 9923870 · 9923870
2 parents 30aa403 + a0392b1
commit 9923870
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
@@ -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;

diff --git a/Defines.h b/Defines.h
@@ -36,6 +36,7 @@ const unsigned char TAG_EOT    = 0x03U;
 enum HW_TYPE {
 	HWT_MMDVM,
 	HWT_DVMEGA,
+	HWT_MMDVM_HS,
 	HWT_UNKNOWN
 };
 

diff --git a/Modem.cpp b/Modem.cpp
@@ -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;