From 0172c15b4b3952094565f7d683f000f669e6c11e Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 5 Oct 2022 21:30:19 +0200 Subject: [PATCH 1/3] #27 fix frequency not being reported correctly --- DStarGateway/DStarGatewayApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DStarGateway/DStarGatewayApp.cpp b/DStarGateway/DStarGatewayApp.cpp index 792a6bf..8ce9864 100644 --- a/DStarGateway/DStarGatewayApp.cpp +++ b/DStarGateway/DStarGatewayApp.cpp @@ -263,8 +263,8 @@ bool CDStarGatewayApp::createThread() rptrConfig.reflector, rptrConfig.reflectorAtStartup, rptrConfig.reflectorReconnect, - rptrConfig.frequency, drats.enabled, + rptrConfig.frequency, rptrConfig.offset, rptrConfig.range, rptrConfig.latitude, From 08c7b2816b8c239c5c1894a4798ea4a405736be7 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 5 Oct 2022 21:35:49 +0200 Subject: [PATCH 2/3] #27 fix repeater description not loaded --- DStarGateway/DStarGatewayConfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DStarGateway/DStarGatewayConfig.cpp b/DStarGateway/DStarGatewayConfig.cpp index 2cfd90a..b3321d5 100644 --- a/DStarGateway/DStarGatewayConfig.cpp +++ b/DStarGateway/DStarGatewayConfig.cpp @@ -247,8 +247,8 @@ bool CDStarGatewayConfig::loadRepeaters(const CConfig & cfg) ret = cfg.getValue(section, "latitude", repeater->latitude, -90.0, 90.0, m_gateway.latitude) && ret; ret = cfg.getValue(section, "longitude", repeater->longitude, -180.0, 180.0, m_gateway.longitude) && ret; ret = cfg.getValue(section, "agl", repeater->agl, 0, 1000.0, 0.0) && ret; - ret = cfg.getValue(section, "description1", m_gateway.description1, 0, 1024, "") && ret; - ret = cfg.getValue(section, "description2", m_gateway.description2, 0, 1024, "") && ret; + ret = cfg.getValue(section, "description1", repeater->description1, 0, 1024, "") && ret; + ret = cfg.getValue(section, "description2", repeater->description2, 0, 1024, "") && ret; ret = cfg.getValue(section, "url", m_gateway.url, 0, 1024, "") && ret;; ret = cfg.getValue(section, "band1", repeater->band1, 0, 255, 0) && ret; ret = cfg.getValue(section, "band2", repeater->band2, 0, 255, 0) && ret; From 40819ac01498baab562426a59697d19a061cd8d3 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 5 Oct 2022 22:17:24 +0200 Subject: [PATCH 3/3] #27 descriptions default to gw description, fix url not loaded --- DStarGateway/DStarGatewayConfig.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DStarGateway/DStarGatewayConfig.cpp b/DStarGateway/DStarGatewayConfig.cpp index b3321d5..f50b7fb 100644 --- a/DStarGateway/DStarGatewayConfig.cpp +++ b/DStarGateway/DStarGatewayConfig.cpp @@ -247,9 +247,9 @@ bool CDStarGatewayConfig::loadRepeaters(const CConfig & cfg) ret = cfg.getValue(section, "latitude", repeater->latitude, -90.0, 90.0, m_gateway.latitude) && ret; ret = cfg.getValue(section, "longitude", repeater->longitude, -180.0, 180.0, m_gateway.longitude) && ret; ret = cfg.getValue(section, "agl", repeater->agl, 0, 1000.0, 0.0) && ret; - ret = cfg.getValue(section, "description1", repeater->description1, 0, 1024, "") && ret; - ret = cfg.getValue(section, "description2", repeater->description2, 0, 1024, "") && ret; - ret = cfg.getValue(section, "url", m_gateway.url, 0, 1024, "") && ret;; + ret = cfg.getValue(section, "description1", repeater->description1, 0, 1024, m_gateway.description1) && ret; + ret = cfg.getValue(section, "description2", repeater->description2, 0, 1024, m_gateway.description2) && ret; + ret = cfg.getValue(section, "url", repeater->url, 0, 1024, m_gateway.url) && ret;; ret = cfg.getValue(section, "band1", repeater->band1, 0, 255, 0) && ret; ret = cfg.getValue(section, "band2", repeater->band2, 0, 255, 0) && ret; ret = cfg.getValue(section, "band3", repeater->band3, 0, 255, 0) && ret;