From 05e4193349df89f90f06cb564320081223dd36d3 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 26 Jan 2019 23:41:06 -0300 Subject: [PATCH] Add Wires-X upper case option (WIP) --- YSF2DMR/Conf.cpp | 12 ++++++++++-- YSF2DMR/Conf.h | 6 ++++-- YSF2DMR/YSF2DMR.ini | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/YSF2DMR/Conf.cpp b/YSF2DMR/Conf.cpp index d788179..7c4d4ef 100644 --- a/YSF2DMR/Conf.cpp +++ b/YSF2DMR/Conf.cpp @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX - * Copyright (C) 2018 by Andy Uribe CA6JAU + * Copyright (C) 2015-2019 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2018 by Manuel Sanchez EA7EE * * This program is free software; you can redistribute it and/or modify @@ -49,6 +49,7 @@ m_localPort(0U), m_enableWiresX(false), m_remoteGateway(false), m_hangTime(1000U), +m_wiresXMakeUpper(true), m_daemon(false), m_rxFrequency(0U), m_txFrequency(0U), @@ -171,6 +172,8 @@ bool CConf::read() m_remoteGateway = ::atoi(value) == 1; else if (::strcmp(key, "HangTime") == 0) m_hangTime = (unsigned int)::atoi(value); + else if (::strcmp(key, "WiresXMakeUpper") == 0) + m_wiresXMakeUpper = ::atoi(value) == 1; else if (::strcmp(key, "Daemon") == 0) m_daemon = ::atoi(value) == 1; } else if (section == SECTION_INFO) { @@ -319,6 +322,11 @@ unsigned int CConf::getHangTime() const return m_hangTime; } +bool CConf::getWiresXMakeUpper() const +{ + return m_wiresXMakeUpper; +} + bool CConf::getDaemon() const { return m_daemon; diff --git a/YSF2DMR/Conf.h b/YSF2DMR/Conf.h index 1e355f8..92e8228 100644 --- a/YSF2DMR/Conf.h +++ b/YSF2DMR/Conf.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX - * Copyright (C) 2018 by Andy Uribe CA6JAU + * Copyright (C) 2015-2019 by Jonathan Naylor G4KLX + * Copyright (C) 2018,2019 by Andy Uribe CA6JAU * Copyright (C) 2018 by Manuel Sanchez EA7EE * * This program is free software; you can redistribute it and/or modify @@ -42,6 +42,7 @@ public: bool getEnableWiresX() const; bool getRemoteGateway() const; unsigned int getHangTime() const; + bool getWiresXMakeUpper() const; bool getDaemon() const; // The Info section @@ -106,6 +107,7 @@ private: bool m_enableWiresX; bool m_remoteGateway; unsigned int m_hangTime; + bool m_wiresXMakeUpper; bool m_daemon; unsigned int m_rxFrequency; diff --git a/YSF2DMR/YSF2DMR.ini b/YSF2DMR/YSF2DMR.ini index c989393..9855351 100644 --- a/YSF2DMR/YSF2DMR.ini +++ b/YSF2DMR/YSF2DMR.ini @@ -20,6 +20,7 @@ LocalPort=42013 EnableWiresX=1 RemoteGateway=0 HangTime=1000 +WiresXMakeUpper=1 Daemon=0 [DMR Network]