Merge branch 'nxdn' of github.com:g4klx/MMDVMHost into nxdn

g4klx · Feb 14, 2018 · a5bcf87 · a5bcf87
2 parents 971c9b9 + cc23ac9
commit a5bcf87
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
@@ -561,6 +561,9 @@ bool CDMRNetwork::writeConfig()
 		case HWT_MMDVM_HS_HAT:
 			software = "MMDVM_MMDVM_HS_Hat";
 			break;
+		case HWT_NANO_HOTSPOT:
+			software = "MMDVM_Nano_hotSPOT";
+			break;
 		case HWT_MMDVM_HS:
 			software = "MMDVM_MMDVM_HS";
 			break;

diff --git a/Defines.h b/Defines.h
@@ -39,6 +39,7 @@ enum HW_TYPE {
 	HWT_DVMEGA,
 	HWT_MMDVM_ZUMSPOT,
 	HWT_MMDVM_HS_HAT,
+	HWT_NANO_HOTSPOT,
 	HWT_MMDVM_HS,
 	HWT_UNKNOWN
 };

diff --git a/MMDVM.ini b/MMDVM.ini
@@ -42,6 +42,7 @@ Time=24
 
 [Modem]
 # Port=/dev/ttyACM0
+# Port=/dev/ttyAMA0
 Port=\\.\COM3
 TXInvert=1
 RXInvert=0

diff --git a/Modem.cpp b/Modem.cpp
@@ -1022,6 +1022,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, "Nano_hotSPOT", 12U) == 0)
+					m_hwType = HWT_NANO_HOTSPOT;
 				else if (::memcmp(m_buffer + 4U, "MMDVM_HS-", 9U) == 0)
 					m_hwType = HWT_MMDVM_HS;