Merge branch 'master' into M17_AX25_FM

JimZAH · Nov 9, 2020 · d1942fc · d1942fc
2 parents a57397e + a42e8f7
commit d1942fc
Show file tree

Hide file tree

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

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

diff --git a/Modem.cpp b/Modem.cpp
@@ -21,4 +21,3 @@
 IModem::~IModem()
 {
 }
-
diff --git a/SerialModem.cpp b/SerialModem.cpp
@@ -1843,6 +1843,8 @@ bool CSerialModem::readVersion()
 					m_hwType = HWT_MMDVM_HS;
 				else if (::memcmp(m_buffer + 4U, "OpenGD77_HS", 11U) == 0)
 					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);