dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Clean up static location handling.

Browse source
This commit is contained in:
Jonathan Naylor 2018-11-06 07:53:11 +00:00
parent e0d01c64c2
commit f17d7a65a6
3 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
YSFGateway/APRSWriter.cpp
View file

@ -28,7 +28,7 @@
CAPRSWriter::CAPRSWriter(const std::string& callsign, const std::string& rptSuffix, const std::string& password, const std::string& address, unsigned int port, const std::string& suffix) :
m_thread(NULL),
m_enabled(false),
m_idTimer(1000U, 20U * 60U), // 20 minutes
m_idTimer(1000U),
m_callsign(callsign),
m_txFrequency(0U),
m_rxFrequency(0U),
@ -58,17 +58,21 @@ CAPRSWriter::~CAPRSWriter()
{
}
void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, float latitude, float longitude, int height, const std::string& desc)
void CAPRSWriter::setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc)
{
m_txFrequency = txFrequency;
m_rxFrequency = rxFrequency;
m_latitude = latitude;
m_longitude = longitude;
m_height = height;
m_desc = desc;
}
void CAPRSWriter::setMobileGPS(const std::string& address, unsigned int port)
void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height)
{
m_latitude = latitude;
m_longitude = longitude;
m_height = height;
}
void CAPRSWriter::setMobileLocation(const std::string& address, unsigned int port)
{
assert(!address.empty());
assert(port > 0U);
@ -91,6 +95,8 @@ bool CAPRSWriter::open()
// Poll the GPS every minute
m_idTimer.setTimeout(60U);
} else {
m_idTimer.setTimeout(20U * 60U);
}
m_idTimer.start();
@ -341,8 +347,8 @@ void CAPRSWriter::sendIdFrameMobile()
lon, (rawLongitude < 0.0F) ? 'W' : 'E');
if (pBearing != NULL && pVelocity != NULL) {
float rawVelocity = ::atof(pVelocity);
float rawBearing = ::atof(pBearing);
float rawVelocity = ::atof(pVelocity);
::sprintf(output + ::strlen(output), "%03.0f/%03.0f", rawBearing, rawVelocity * 0.539957F);
}

6
YSFGateway/APRSWriter.h
View file

@ -45,9 +45,11 @@ public:
bool open();
void setInfo(unsigned int txFrequency, unsigned int rxFrequency, float latitude, float longitude, int height, const std::string& desc);
void setInfo(unsigned int txFrequency, unsigned int rxFrequency, const std::string& desc);
void setMobileGPS(const std::string& address, unsigned int port);
void setStaticLocation(float latitude, float longitude, int height);
void setMobileLocation(const std::string& address, unsigned int port);
void write(const unsigned char* source, const char* type, unsigned char radio, float latitude, float longitude);

13
YSFGateway/YSFGateway.cpp
View file

@ -439,18 +439,21 @@ void CYSFGateway::createGPS()
unsigned int txFrequency = m_conf.getTxFrequency();
unsigned int rxFrequency = m_conf.getRxFrequency();
float latitude = m_conf.getLatitude();
float longitude = m_conf.getLongitude();
int height = m_conf.getHeight();
m_writer->setInfo(txFrequency, rxFrequency, latitude, longitude, height, desc);
m_writer->setInfo(txFrequency, rxFrequency, desc);
bool enabled = m_conf.getMobileGPSEnabled();
if (enabled) {
std::string address = m_conf.getMobileGPSAddress();
unsigned int port = m_conf.getMobileGPSPort();
m_writer->setMobileGPS(address, port);
m_writer->setMobileLocation(address, port);
} else {
float latitude = m_conf.getLatitude();
float longitude = m_conf.getLongitude();
int height = m_conf.getHeight();
m_writer->setStaticLocation(latitude, longitude, height);
}
bool ret = m_writer->open();