Merge pull request #550 from f1rmb/OPENGD77_HS

Identify OpenGD77 hotspot.
g4klx · Jan 10, 2020 · 95c1bbb · 95c1bbb
2 parents 3fa72d8 + 5686942
commit 95c1bbb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
@@ -601,6 +601,9 @@ bool CDMRNetwork::writeConfig()
 		case HWT_MMDVM_HS:
 			software = "MMDVM_MMDVM_HS";
 			break;
+		case HWT_OPENGD77_HS:
+			software = "MMDVM_OpenGD77_HS";
+			break;
 		default:
 			software = "MMDVM_Unknown";
 			break;

diff --git a/Defines.h b/Defines.h
@@ -46,6 +46,7 @@ enum HW_TYPE {
 	HWT_NANO_DV,
 	HWT_D2RG_MMDVM_HS,
 	HWT_MMDVM_HS,
+	HWT_OPENGD77_HS,
 	HWT_UNKNOWN
 };
 

diff --git a/Modem.cpp b/Modem.cpp
@@ -1398,6 +1398,8 @@ bool CModem::readVersion()
 					m_hwType = HWT_D2RG_MMDVM_HS;
 				else if (::memcmp(m_buffer + 4U, "MMDVM_HS-", 9U) == 0)
 					m_hwType = HWT_MMDVM_HS;
+				else if (::memcmp(m_buffer + 4U, "OpenGD77_HS", 11U) == 0)
+					m_hwType = HWT_OPENGD77_HS;
 
 				LogInfo("MMDVM protocol version: %u, description: %.*s", m_buffer[3U], m_length - 4U, m_buffer + 4U);
 				return true;
@@ -1839,4 +1841,4 @@ CModem* CModem::createModem(const std::string& port, bool duplex, bool rxInvert,
 		return new CNullModem(port, duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug);
 	else
 		return new CModem(port, duplex, rxInvert, txInvert, pttInvert, txDelay, dmrDelay, trace, debug);
-}
+}