From 3e99e4d6208f02cafa69b0b16827dbd82ff8e187 Mon Sep 17 00:00:00 2001 From: "Ralph A. Schmid" Date: Tue, 13 Feb 2018 13:45:27 +0100 Subject: [PATCH 1/2] Adding a modem port template Adding the line # Port=/dev/ttyAMA0 to MMDVM.ini [Modem] section, to make it easier to try out the correct port setting fore the more and more commonly used STM32 Pi hat boards. --- MMDVM.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/MMDVM.ini b/MMDVM.ini index ea8971045..097637b41 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -38,6 +38,7 @@ Time=24 [Modem] # Port=/dev/ttyACM0 +# Port=/dev/ttyAMA0 Port=\\.\COM3 TXInvert=1 RXInvert=0 From 084a26c961df7901f80dc2020ecae89ee7deee86 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 14 Feb 2018 12:18:34 -0300 Subject: [PATCH 2/2] DMR string identification suport for BI7JTA hotspot --- DMRNetwork.cpp | 3 +++ Defines.h | 1 + Modem.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index f5ff40ae3..2e9194919 100644 --- 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 index a82266ba6..0da6da638 100644 --- a/Defines.h +++ b/Defines.h @@ -38,6 +38,7 @@ enum HW_TYPE { HWT_DVMEGA, HWT_MMDVM_ZUMSPOT, HWT_MMDVM_HS_HAT, + HWT_NANO_HOTSPOT, HWT_MMDVM_HS, HWT_UNKNOWN }; diff --git a/Modem.cpp b/Modem.cpp index c6bab002f..09684472b 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -923,6 +923,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;