dominic
/
YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request #292 from W0CHP/master

Browse Source
master
Jonathan Naylor 2 years ago committed by GitHub
parent 22a0b9ae28 e3dd9f5321
commit b0f3f70f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File

14
DGIdGateway/APRSWriter.cpp
Unescape View File

@ -35,6 +35,7 @@ m_latitude(0.0F),
m_longitude(0.0F), m_longitude(0.0F),
m_height(0), m_height(0),
m_desc(), m_desc(),
m_symbol(),
m_suffix(suffix), m_suffix(suffix),
m_aprsAddr(), m_aprsAddr(),
m_aprsAddrLen(0U), m_aprsAddrLen(0U),
@ -63,11 +64,12 @@ CAPRSWriter::~CAPRSWriter()
{ {
} }
void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc) void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc, const std::string& symbol)
{ {
m_txFrequency = txFrequency; m_txFrequency = txFrequency;
m_rxFrequency = rxFrequency; m_rxFrequency = rxFrequency;
m_desc = desc; m_desc = desc;
m_symbol = symbol;
} }
void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height) void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height)
@ -268,17 +270,21 @@ void CAPRSWriter::sendIdFrameFixed()
::sprintf(lon, "%08.2lf", longitude); ::sprintf(lon, "%08.2lf", longitude);
std::string server = m_callsign; std::string server = m_callsign;
std::string symbol = m_symbol;
size_t pos = server.find_first_of('-'); size_t pos = server.find_first_of('-');
if (pos == std::string::npos) if (pos == std::string::npos)
server.append("-S"); server.append("-S");
else else
server.append("S"); server.append("S");
if (symbol.empty())
symbol.append("D&");
char output[500U]; char output[500U];
::sprintf(output, "%s>APDG03,TCPIP*,qAC,%s:!%s%cD%s%c&/A=%06.0f%s %s\r\n", ::sprintf(output, "%s>APDG03,TCPIP*,qAC,%s:!%s%c%c%s%c%c/A=%06.0f%s %s\r\n",
m_callsign.c_str(), server.c_str(), m_callsign.c_str(), server.c_str(),
lat, (m_latitude < 0.0F) ? 'S' : 'N', lat, (m_latitude < 0.0F) ? 'S' : 'N', symbol[0],
lon, (m_longitude < 0.0F) ? 'W' : 'E', lon, (m_longitude < 0.0F) ? 'W' : 'E', symbol[1],
float(m_height) * 3.28F, band, desc); float(m_height) * 3.28F, band, desc);
if (m_debug) if (m_debug)

3
DGIdGateway/APRSWriter.h
Unescape View File

@ -47,7 +47,7 @@ public:
bool open(); bool open();
void setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc); void setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc, const std::string& symbol);
void setStaticLocation(float latitude, float longitude, int height); void setStaticLocation(float latitude, float longitude, int height);
@ -69,6 +69,7 @@ private:
float m_longitude; float m_longitude;
int m_height; int m_height;
std::string m_desc; std::string m_desc;
std::string m_symbol;
std::string m_suffix; std::string m_suffix;
sockaddr_storage m_aprsAddr; sockaddr_storage m_aprsAddr;
unsigned int m_aprsAddrLen; unsigned int m_aprsAddrLen;

8
DGIdGateway/Conf.cpp
Unescape View File

@ -71,6 +71,7 @@ m_aprsAddress(),
m_aprsPort(0U), m_aprsPort(0U),
m_aprsSuffix(), m_aprsSuffix(),
m_aprsDescription(), m_aprsDescription(),
m_aprsSymbol(),
m_ysfNetHosts(), m_ysfNetHosts(),
m_ysfRFHangTime(60U), m_ysfRFHangTime(60U),
m_ysfNetHangTime(60U), m_ysfNetHangTime(60U),
@ -230,6 +231,8 @@ bool CConf::read()
m_aprsSuffix = value; m_aprsSuffix = value;
else if (::strcmp(key, "Description") == 0) else if (::strcmp(key, "Description") == 0)
m_aprsDescription = value; m_aprsDescription = value;
else if (::strcmp(key, "Symbol") == 0)
m_aprsSymbol = value;
} else if (section == SECTION_YSF_NETWORK) { } else if (section == SECTION_YSF_NETWORK) {
if (::strcmp(key, "Hosts") == 0) if (::strcmp(key, "Hosts") == 0)
m_ysfNetHosts = value; m_ysfNetHosts = value;
@ -450,6 +453,11 @@ std::string CConf::getAPRSDescription() const
return m_aprsDescription; return m_aprsDescription;
} }
std::string CConf::getAPRSSymbol() const
{
return m_aprsSymbol;
}
std::string CConf::getYSFNetHosts() const std::string CConf::getYSFNetHosts() const
{ {
return m_ysfNetHosts; return m_ysfNetHosts;

2
DGIdGateway/Conf.h
Unescape View File

@ -84,6 +84,7 @@ public:
unsigned short getAPRSPort() const; unsigned short getAPRSPort() const;
std::string getAPRSSuffix() const; std::string getAPRSSuffix() const;
std::string getAPRSDescription() const; std::string getAPRSDescription() const;
std::string getAPRSSymbol() const;
// The YSF Network section // The YSF Network section
std::string getYSFNetHosts() const; std::string getYSFNetHosts() const;
@ -130,6 +131,7 @@ private:
unsigned short m_aprsPort; unsigned short m_aprsPort;
std::string m_aprsSuffix; std::string m_aprsSuffix;
std::string m_aprsDescription; std::string m_aprsDescription;
std::string m_aprsSymbol;
std::string m_ysfNetHosts; std::string m_ysfNetHosts;
unsigned int m_ysfRFHangTime; unsigned int m_ysfRFHangTime;

3
DGIdGateway/DGIdGateway.cpp
Unescape View File

@ -614,8 +614,9 @@ void CDGIdGateway::createGPS()
unsigned int txFrequency = m_conf.getTxFrequency(); unsigned int txFrequency = m_conf.getTxFrequency();
unsigned int rxFrequency = m_conf.getRxFrequency(); unsigned int rxFrequency = m_conf.getRxFrequency();
std::string desc = m_conf.getAPRSDescription(); std::string desc = m_conf.getAPRSDescription();
std::string symbol = m_conf.getAPRSSymbol();
m_writer->setInfo(txFrequency, rxFrequency, desc); m_writer->setInfo(txFrequency, rxFrequency, desc, symbol);
bool enabled = m_conf.getGPSDEnabled(); bool enabled = m_conf.getGPSDEnabled();
if (enabled) { if (enabled) {

1
DGIdGateway/DGIdGateway.ini
Unescape View File

@ -36,6 +36,7 @@ Address=127.0.0.1
Port=8673 Port=8673
Description=APRS Description Description=APRS Description
Suffix=Y Suffix=Y
# Symbol=/r
[YSF Network] [YSF Network]
Hosts=./YSFHosts.txt Hosts=./YSFHosts.txt

2
DGIdGateway/Version.h
Unescape View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20220603"; const char* VERSION = "20230212";
#endif #endif

14
YSFGateway/APRSWriter.cpp
Unescape View File

@ -35,6 +35,7 @@ m_latitude(0.0F),
m_longitude(0.0F), m_longitude(0.0F),
m_height(0), m_height(0),
m_desc(), m_desc(),
m_symbol(),
m_suffix(suffix), m_suffix(suffix),
m_aprsAddr(), m_aprsAddr(),
m_aprsAddrLen(0U), m_aprsAddrLen(0U),
@ -63,11 +64,12 @@ CAPRSWriter::~CAPRSWriter()
{ {
} }
void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc) void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc, const std::string& symbol)
{ {
m_txFrequency = txFrequency; m_txFrequency = txFrequency;
m_rxFrequency = rxFrequency; m_rxFrequency = rxFrequency;
m_desc = desc; m_desc = desc;
m_symbol = symbol;
} }
void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height) void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height)
@ -268,17 +270,21 @@ void CAPRSWriter::sendIdFrameFixed()
::sprintf(lon, "%08.2lf", longitude); ::sprintf(lon, "%08.2lf", longitude);
std::string server = m_callsign; std::string server = m_callsign;
std::string symbol = m_symbol;
size_t pos = server.find_first_of('-'); size_t pos = server.find_first_of('-');
if (pos == std::string::npos) if (pos == std::string::npos)
server.append("-S"); server.append("-S");
else else
server.append("S"); server.append("S");
if (symbol.empty())
symbol.append("D&");
char output[500U]; char output[500U];
::sprintf(output, "%s>APDG03,TCPIP*,qAC,%s:!%s%cD%s%c&/A=%06.0f%s %s\r\n", ::sprintf(output, "%s>APDG03,TCPIP*,qAC,%s:!%s%c%c%s%c%c/A=%06.0f%s %s\r\n",
m_callsign.c_str(), server.c_str(), m_callsign.c_str(), server.c_str(),
lat, (m_latitude < 0.0F) ? 'S' : 'N', lat, (m_latitude < 0.0F) ? 'S' : 'N', symbol[0],
lon, (m_longitude < 0.0F) ? 'W' : 'E', lon, (m_longitude < 0.0F) ? 'W' : 'E', symbol[1],
float(m_height) * 3.28F, band, desc); float(m_height) * 3.28F, band, desc);
if (m_debug) if (m_debug)

3
YSFGateway/APRSWriter.h
Unescape View File

@ -47,7 +47,7 @@ public:
bool open(); bool open();
void setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc); void setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc, const std::string& symbol);
void setStaticLocation(float latitude, float longitude, int height); void setStaticLocation(float latitude, float longitude, int height);
@ -69,6 +69,7 @@ private:
float m_longitude; float m_longitude;
int m_height; int m_height;
std::string m_desc; std::string m_desc;
std::string m_symbol;
std::string m_suffix; std::string m_suffix;
sockaddr_storage m_aprsAddr; sockaddr_storage m_aprsAddr;
unsigned int m_aprsAddrLen; unsigned int m_aprsAddrLen;

8
YSFGateway/Conf.cpp
Unescape View File

@ -60,6 +60,7 @@ m_longitude(0.0F),
m_height(0), m_height(0),
m_name(), m_name(),
m_description(), m_description(),
m_aprsSymbol(),
m_logDisplayLevel(0U), m_logDisplayLevel(0U),
m_logFileLevel(0U), m_logFileLevel(0U),
m_logFilePath(), m_logFilePath(),
@ -235,6 +236,8 @@ bool CConf::read()
m_aprsSuffix = value; m_aprsSuffix = value;
else if (::strcmp(key, "Description") == 0) else if (::strcmp(key, "Description") == 0)
m_aprsDescription = value; m_aprsDescription = value;
else if (::strcmp(key, "Symbol") == 0)
m_aprsSymbol = value;
} else if (section == SECTION_NETWORK) { } else if (section == SECTION_NETWORK) {
if (::strcmp(key, "Startup") == 0) if (::strcmp(key, "Startup") == 0)
m_networkStartup = value; m_networkStartup = value;
@ -443,6 +446,11 @@ std::string CConf::getAPRSDescription() const
return m_aprsDescription; return m_aprsDescription;
} }
std::string CConf::getAPRSSymbol() const
{
return m_aprsSymbol;
}
std::string CConf::getNetworkStartup() const std::string CConf::getNetworkStartup() const
{ {
return m_networkStartup; return m_networkStartup;

2
YSFGateway/Conf.h
Unescape View File

@ -65,6 +65,7 @@ public:
unsigned short getAPRSPort() const; unsigned short getAPRSPort() const;
std::string getAPRSSuffix() const; std::string getAPRSSuffix() const;
std::string getAPRSDescription() const; std::string getAPRSDescription() const;
std::string getAPRSSymbol() const;
// The Network section // The Network section
std::string getNetworkStartup() const; std::string getNetworkStartup() const;
@ -135,6 +136,7 @@ private:
unsigned short m_aprsPort; unsigned short m_aprsPort;
std::string m_aprsSuffix; std::string m_aprsSuffix;
std::string m_aprsDescription; std::string m_aprsDescription;
std::string m_aprsSymbol;
std::string m_networkStartup; std::string m_networkStartup;
std::string m_networkOptions; std::string m_networkOptions;

2
YSFGateway/Version.h
Unescape View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20211108"; const char* VERSION = "20230212";
#endif #endif

4
YSFGateway/YSFGateway.cpp
Unescape View File

@ -469,8 +469,10 @@ void CYSFGateway::createGPS()
unsigned int txFrequency = m_conf.getTxFrequency(); unsigned int txFrequency = m_conf.getTxFrequency();
unsigned int rxFrequency = m_conf.getRxFrequency(); unsigned int rxFrequency = m_conf.getRxFrequency();
std::string desc = m_conf.getAPRSDescription(); std::string desc = m_conf.getAPRSDescription();
std::string symbol = m_conf.getAPRSSymbol();
m_writer->setInfo(txFrequency, rxFrequency, desc, symbol);
m_writer->setInfo(txFrequency, rxFrequency, desc);
bool enabled = m_conf.getGPSDEnabled(); bool enabled = m_conf.getGPSDEnabled();
if (enabled) { if (enabled) {

1
YSFGateway/YSFGateway.ini
Unescape View File

@ -36,6 +36,7 @@ Address=127.0.0.1
Port=8673 Port=8673
Description=APRS Description Description=APRS Description
Suffix=Y Suffix=Y
# Symbol=/r
[Network] [Network]
# Startup=FCS00120 # Startup=FCS00120

Write Preview
Loading…
Cancel
Save