From baed7d67e2370eca25641a74da34026546aa86ff Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 29 Jan 2019 12:34:28 +0000 Subject: [PATCH] Tag YSF2xxx reflectors as being Wires-X capable. --- YSFGateway/YSFReflectors.cpp | 18 ++++++++++++------ YSFGateway/YSFReflectors.h | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/YSFGateway/YSFReflectors.cpp b/YSFGateway/YSFReflectors.cpp index cbfd54b..893307c 100644 --- a/YSFGateway/YSFReflectors.cpp +++ b/YSFGateway/YSFReflectors.cpp @@ -139,6 +139,7 @@ bool CYSFReflectors::load() refl->m_port = (unsigned int)::atoi(p5); refl->m_count = std::string(p6); refl->m_type = YT_YSF; + refl->m_wiresX = false; refl->m_name.resize(16U, ' '); refl->m_desc.resize(14U, ' '); @@ -164,6 +165,7 @@ bool CYSFReflectors::load() refl->m_port = m_parrotPort; refl->m_count = "000"; refl->m_type = YT_YSF; + refl->m_wiresX = false; m_newReflectors.push_back(refl); @@ -180,6 +182,7 @@ bool CYSFReflectors::load() refl->m_port = m_YSF2DMRPort; refl->m_count = "000"; refl->m_type = YT_YSF; + refl->m_wiresX = true; m_newReflectors.push_back(refl); @@ -196,6 +199,7 @@ bool CYSFReflectors::load() refl->m_port = m_YSF2NXDNPort; refl->m_count = "000"; refl->m_type = YT_YSF; + refl->m_wiresX = true; m_newReflectors.push_back(refl); @@ -212,6 +216,7 @@ bool CYSFReflectors::load() refl->m_port = m_YSF2P25Port; refl->m_count = "000"; refl->m_type = YT_YSF; + refl->m_wiresX = true; m_newReflectors.push_back(refl); @@ -227,12 +232,13 @@ bool CYSFReflectors::load() std::string desc = it->second; CYSFReflector* refl = new CYSFReflector; - refl->m_id = text; - refl->m_name = name; - refl->m_desc = desc; - refl->m_port = 0U; - refl->m_count = "000"; - refl->m_type = YT_FCS; + refl->m_id = text; + refl->m_name = name; + refl->m_desc = desc; + refl->m_port = 0U; + refl->m_count = "000"; + refl->m_type = YT_FCS; + refl->m_wiresX = false; refl->m_name.resize(16U, ' '); refl->m_desc.resize(14U, ' '); diff --git a/YSFGateway/YSFReflectors.h b/YSFGateway/YSFReflectors.h index b52092b..1bc5c05 100644 --- a/YSFGateway/YSFReflectors.h +++ b/YSFGateway/YSFReflectors.h @@ -39,7 +39,8 @@ public: m_count("000"), m_address(), m_port(0U), - m_type(YT_YSF) + m_type(YT_YSF), + m_wiresX(false) { } @@ -50,6 +51,7 @@ public: in_addr m_address; unsigned int m_port; YSF_TYPE m_type; + bool m_wiresX; }; class CYSFReflectors {