Merge branch 'master' into icom

DMRNetwork.cpp

@@ -541,6 +541,9 @@ bool CDMRNetwork::writeConfig()
 		case HWT_MMDVM_HS:
 			software = "MMDVM_MMDVM_HS";
 			break;
+		case HWT_MMDVM_HS_DUAL_HAT:
+			software = "MMDVM_MMDVM_HS_Dual_Hat";
+			break;
 		default:
 			software = "MMDVM_Unknown";
 			break;
@@ -561,6 +564,9 @@ bool CDMRNetwork::writeConfig()
 		case HWT_MMDVM_HS_HAT:
 			software = "MMDVM_MMDVM_HS_Hat";
 			break;
+		case HWT_MMDVM_HS_DUAL_HAT:
+			software = "MMDVM_MMDVM_HS_Dual_Hat";
+			break;
 		case HWT_NANO_HOTSPOT:
 			software = "MMDVM_Nano_hotSPOT";
 			break;

Defines.h

@@ -39,6 +39,7 @@ enum HW_TYPE {
 	HWT_DVMEGA,
 	HWT_MMDVM_ZUMSPOT,
 	HWT_MMDVM_HS_HAT,
+	HWT_MMDVM_HS_DUAL_HAT,
 	HWT_NANO_HOTSPOT,
 	HWT_MMDVM_HS,
 	HWT_UNKNOWN

Modem.cpp

@@ -1084,6 +1084,8 @@ bool CModem::readVersion()
 					m_hwType = HWT_MMDVM_ZUMSPOT;
 				else if (::memcmp(m_buffer + 4U, "MMDVM_HS_Hat", 12U) == 0)
 					m_hwType = HWT_MMDVM_HS_HAT;
+				else if (::memcmp(m_buffer + 4U, "MMDVM_HS_Dual_Hat", 17U) == 0)
+					m_hwType = HWT_MMDVM_HS_DUAL_HAT;
 				else if (::memcmp(m_buffer + 4U, "Nano_hotSPOT", 12U) == 0)
 					m_hwType = HWT_NANO_HOTSPOT;
 				else if (::memcmp(m_buffer + 4U, "MMDVM_HS-", 9U) == 0)