diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 01fe954..f43f78c 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -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; diff --git a/Defines.h b/Defines.h index 81973ff..b2896a0 100644 --- a/Defines.h +++ b/Defines.h @@ -51,6 +51,7 @@ enum HW_TYPE { HWT_D2RG_MMDVM_HS, HWT_MMDVM_HS, HWT_OPENGD77_HS, + HWT_SKYBRIDGE, HWT_UNKNOWN }; diff --git a/MMDVM.ini b/MMDVM.ini index 3fb7a23..3db0ac4 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -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 diff --git a/Modem.cpp b/Modem.cpp index 2451c9b..9c298de 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -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; diff --git a/UDPSocket.cpp b/UDPSocket.cpp index 510c8a2..ad8a0eb 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -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