g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nxdn

Browse source
This commit is contained in:
Andy CA6JAU 2018-02-14 12:19:43 -03:00
parent 134646265e 084a26c961
commit cc23ac9708
4 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DMRNetwork.cpp
View file

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

1
Defines.h
View file

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

1
MMDVM.ini
View file

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

2
Modem.cpp
View file

@ -1022,6 +1022,8 @@ bool CModem::readVersion()
m_hwType = HWT_MMDVM_ZUMSPOT; m_hwType = HWT_MMDVM_ZUMSPOT;
else if (::memcmp(m_buffer + 4U, "MMDVM_HS_Hat", 12U) == 0) else if (::memcmp(m_buffer + 4U, "MMDVM_HS_Hat", 12U) == 0)
m_hwType = HWT_MMDVM_HS_HAT; 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) else if (::memcmp(m_buffer + 4U, "MMDVM_HS-", 9U) == 0)
m_hwType = HWT_MMDVM_HS; m_hwType = HWT_MMDVM_HS;