Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into M17

Browse source
This commit is contained in:
Jonathan Naylor 2020-11-11 11:37:39 +00:00
parent 18c8b95829 c800a4d369
commit 93f3d6addc
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DMRNetwork.cpp
View file

@ -391,6 +391,9 @@ bool CDMRNetwork::writeConfig()
case HWT_OPENGD77_HS:
software = "MMDVM_OpenGD77_HS";
break;
case HWT_SKYBRIDGE:
software = "MMDVM_SkyBridge";
break;
default:
software = "MMDVM_Unknown";
break;

1
Defines.h
View file

@ -51,6 +51,7 @@ enum HW_TYPE {
HWT_D2RG_MMDVM_HS,
HWT_MMDVM_HS,
HWT_OPENGD77_HS,
HWT_SKYBRIDGE,
HWT_UNKNOWN
};

2
MMDVM.ini
View file

@ -188,7 +188,7 @@ Debug=0
[DMR Network]
Enable=1
Address=44.131.4.1
Address=127.0.0.1
Port=62031
Local=62032
Jitter=360

2
Modem.cpp
View file

@ -1612,6 +1612,8 @@ bool CModem::readVersion()
m_hwType = HWT_MMDVM_HS;
else if (::memcmp(m_buffer + 4U, "OpenGD77_HS", 11U) == 0)
m_hwType = HWT_OPENGD77_HS;
else if (::memcmp(m_buffer + 4U, "SkyBridge", 9U) == 0)
m_hwType = HWT_SKYBRIDGE;
LogInfo("MMDVM protocol version: %u, description: %.*s", m_buffer[3U], m_length - 4U, m_buffer + 4U);
return true;

1
UDPSocket.cpp
View file

@ -28,6 +28,7 @@
#if defined(HAVE_LOG_H)
#include "Log.h"
#else
#define LogMessage(fmt, ...) ::fprintf(stderr, fmt "\n", ## __VA_ARGS__)
#define LogError(fmt, ...) ::fprintf(stderr, fmt "\n", ## __VA_ARGS__)
#define LogInfo(fmt, ...) ::fprintf(stderr, fmt "\n", ## __VA_ARGS__)
#endif