From 72654cf02a46a510e4e3d934c40ad4f0995322fd Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 31 Oct 2020 22:08:38 +0000 Subject: [PATCH 1/3] Fix missing Log.h handling in UDPSocket.cpp --- UDPSocket.cpp | 1 + 1 file changed, 1 insertion(+) 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 From 54413e08912cc72fd04c289ecf60899653fea808 Mon Sep 17 00:00:00 2001 From: "Jorge (George)" Date: Fri, 6 Nov 2020 10:52:34 +0000 Subject: [PATCH 2/3] Update MMDVM.ini Change address of DMR Network stanza --- MMDVM.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MMDVM.ini b/MMDVM.ini index 026cf94..5bd4c52 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -181,7 +181,7 @@ Debug=0 [DMR Network] Enable=1 -Address=44.131.4.1 +Address=127.0.0.1 Port=62031 Local=62032 Jitter=360 From a42e8f74c1616c6ad76e8afd23a3292bce518551 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sun, 8 Nov 2020 18:46:19 -0300 Subject: [PATCH 3/3] Add ID for SkyBridge HS board --- DMRNetwork.cpp | 3 +++ Defines.h | 1 + Modem.cpp | 2 ++ 3 files changed, 6 insertions(+) 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 18c103e..8c57721 100644 --- a/Defines.h +++ b/Defines.h @@ -50,6 +50,7 @@ enum HW_TYPE { HWT_D2RG_MMDVM_HS, HWT_MMDVM_HS, HWT_OPENGD77_HS, + HWT_SKYBRIDGE, HWT_UNKNOWN }; diff --git a/Modem.cpp b/Modem.cpp index 52a497d..75aca14 100644 --- a/Modem.cpp +++ b/Modem.cpp @@ -1481,6 +1481,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;