dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Add new ini entry for the optional APRS description.

Browse source
This commit is contained in:
Jonathan Naylor 2017-09-04 10:11:07 +01:00
parent 2f41b0eaab
commit 41015d21d3
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
YSFGateway/Conf.cpp
View file

@ -60,6 +60,7 @@ m_aprsEnabled(false),
m_aprsServer(),
m_aprsPort(0U),
m_aprsPassword(),
m_aprsDescription(),
m_networkEnabled(false),
m_networkPort(0U),
m_networkHosts(),
@ -170,6 +171,8 @@ bool CConf::read()
m_aprsPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "Password") == 0)
m_aprsPassword = value;
else if (::strcmp(key, "Description") == 0)
m_aprsDescription = value;
} else if (section == SECTION_NETWORK) {
if (::strcmp(key, "Enable") == 0)
m_networkEnabled = ::atoi(value) == 1;
@ -314,6 +317,11 @@ std::string CConf::getAPRSPassword() const
return m_aprsPassword;
}
std::string CConf::getAPRSDescription() const
{
return m_aprsDescription;
}
bool CConf::getNetworkEnabled() const
{
return m_networkEnabled;

2
YSFGateway/Conf.h
View file

@ -60,6 +60,7 @@ public:
std::string getAPRSServer() const;
unsigned int getAPRSPort() const;
std::string getAPRSPassword() const;
std::string getAPRSDescription() const;
// The Network section
bool getNetworkEnabled() const;
@ -101,6 +102,7 @@ private:
std::string m_aprsServer;
unsigned int m_aprsPort;
std::string m_aprsPassword;
std::string m_aprsDescription;
bool m_networkEnabled;
unsigned int m_networkPort;

2
YSFGateway/YSFGateway.cpp
View file

@ -501,6 +501,7 @@ void CYSFGateway::createGPS()
std::string hostname = m_conf.getAPRSServer();
unsigned int port = m_conf.getAPRSPort();
std::string password = m_conf.getAPRSPassword();
std::string desc = m_conf.getAPRSDescription();
m_gps = new CGPS(m_callsign, m_suffix, password, hostname, port);
@ -509,7 +510,6 @@ void CYSFGateway::createGPS()
float latitude = m_conf.getLatitude();
float longitude = m_conf.getLongitude();
int height = m_conf.getHeight();
std::string desc = m_conf.getDescription();
m_gps->setInfo(txFrequency, rxFrequency, latitude, longitude, height, desc);

1
YSFGateway/YSFGateway.ini
View file

@ -31,6 +31,7 @@ Enable=0
Server=euro.aprs2.net
Port=14580
Password=9999
Description=APRS Description
[Network]
Enable=1