MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-23 06:45:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Symbol= option to [APRS] stanza in config, to allow user to define APRS symbol. Backward-compat., and will default to the standard D& symbol (diamond with "D" overlay) if Symbol= is not defined.

Browse Source
This commit is contained in:
Chipster
2023-02-12 19:27:45 -06:00
parent 71b42aad36
commit 508692a554
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APRSWriter.cpp
View File

@@ -35,6 +35,7 @@ m_latitude(0.0F),
m_longitude(0.0F),
m_height(0),
m_desc(),
m_symbol(),
m_aprsAddr(),
m_aprsLen(0U),
m_aprsSocket()
@@ -56,11 +57,13 @@ 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_rxFrequency = rxFrequency;
m_desc = desc;
m_symbol = symbol;
}
void CAPRSWriter::setLocation(float latitude, float longitude, int height)
@@ -149,17 +152,21 @@ void CAPRSWriter::sendIdFrame()
::sprintf(lon, "%08.2lf", longitude);
std::string server = m_callsign;
std::string symbol = m_symbol;
size_t pos = server.find_first_of('-');
if (pos == std::string::npos)
server.append("-S");
else
server.append("S");
if (symbol.empty())
symbol.append("D&");
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(),
lat, (m_latitude < 0.0F) ? 'S' : 'N',
lon, (m_longitude < 0.0F) ? 'W' : 'E',
lat, (m_latitude < 0.0F) ? 'S' : 'N', symbol[0],
lon, (m_longitude < 0.0F) ? 'W' : 'E', symbol[1],
float(m_height) * 3.28F, band, desc);
if (m_debug)