mirror of
https://github.com/oe7drt/YSFClients.git
synced 2026-04-09 00:03:57 +00:00
Add APRS Symbol option (based on my PR https://github.com/g4klx/DMRGateway/pull/122)
This commit is contained in:
parent
471d031a08
commit
e3dd9f5321
7 changed files with 26 additions and 7 deletions
|
|
@ -35,6 +35,7 @@ m_latitude(0.0F),
|
|||
m_longitude(0.0F),
|
||||
m_height(0),
|
||||
m_desc(),
|
||||
m_symbol(),
|
||||
m_suffix(suffix),
|
||||
m_aprsAddr(),
|
||||
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_rxFrequency = rxFrequency;
|
||||
m_desc = desc;
|
||||
m_symbol = symbol;
|
||||
}
|
||||
|
||||
void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height)
|
||||
|
|
@ -268,17 +270,21 @@ void CAPRSWriter::sendIdFrameFixed()
|
|||
::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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue