From a1a086dd00979e3b03fafc770ff77899ed54b78b Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 31 Dec 2021 06:21:22 +0100 Subject: [PATCH] #7 last cleanup --- APRSGPSDIdFrameProvider.cpp | 4 +++- APRSWriter.cpp | 2 +- APRSWriter.h | 2 +- DStarGatewayApp.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/APRSGPSDIdFrameProvider.cpp b/APRSGPSDIdFrameProvider.cpp index 3e67a34..3a02916 100644 --- a/APRSGPSDIdFrameProvider.cpp +++ b/APRSGPSDIdFrameProvider.cpp @@ -16,6 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef USE_DGPS #include #include @@ -207,4 +208,5 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const std::string& gateway, co setTimeout(60U * 5U);//5 Minutes is plenty enough we aint an APRS tracker ! return true; -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/APRSWriter.cpp b/APRSWriter.cpp index 0e3ee0c..12d0272 100644 --- a/APRSWriter.cpp +++ b/APRSWriter.cpp @@ -57,7 +57,7 @@ CAPRSWriter::~CAPRSWriter() m_array.clear(); } -void CAPRSWriter::setPortFixed(const std::string& callsign, const std::string& band, double frequency, double offset, double range, double latitude, double longitude, double agl) +void CAPRSWriter::setPort(const std::string& callsign, const std::string& band, double frequency, double offset, double range, double latitude, double longitude, double agl) { std::string temp = callsign; temp.resize(LONG_CALLSIGN_LENGTH - 1U, ' '); diff --git a/APRSWriter.h b/APRSWriter.h index ab28506..b49adcf 100644 --- a/APRSWriter.h +++ b/APRSWriter.h @@ -45,7 +45,7 @@ class CAPRSWriter { void setIdFrameProvider(CAPRSIdFrameProvider * idFrameProvider) { m_idFrameProvider = idFrameProvider; } - void setPortFixed(const std::string& callsign, const std::string& band, double frequency, double offset, double range, double latitude, double longitude, double agl); + void setPort(const std::string& callsign, const std::string& band, double frequency, double offset, double range, double latitude, double longitude, double agl); void writeHeader(const std::string& callsign, const CHeaderData& header); diff --git a/DStarGatewayApp.cpp b/DStarGatewayApp.cpp index 891816b..c8fd520 100644 --- a/DStarGatewayApp.cpp +++ b/DStarGatewayApp.cpp @@ -182,7 +182,7 @@ bool CDStarGatewayApp::createThread() rptrConfig.band2, rptrConfig.band3); - aprsWriter->setPortFixed(rptrConfig.callsign, rptrConfig.band, rptrConfig.frequency, rptrConfig.offset, rptrConfig.range, rptrConfig.latitude, rptrConfig.longitude, rptrConfig.agl); + aprsWriter->setPort(rptrConfig.callsign, rptrConfig.band, rptrConfig.frequency, rptrConfig.offset, rptrConfig.range, rptrConfig.latitude, rptrConfig.longitude, rptrConfig.agl); if(!ddEnabled) ddEnabled = rptrConfig.band.length() > 1U; }