mirror of
https://github.com/g4klx/MMDVMHost
synced 2025-12-21 23:45:49 +08:00
Merge branch 'master' into nxdn
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
@@ -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
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user