#7 last cleanup

F4FXL · Dec 31, 2021 · a1a086d · a1a086d
1 parent 43f79ad
commit a1a086d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/APRSGPSDIdFrameProvider.cpp b/APRSGPSDIdFrameProvider.cpp
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifdef USE_DGPS
 #include <cmath>
 #include <boost/algorithm/string.hpp>
 
@@ -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;
-}
+}
+#endif
diff --git 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
@@ -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
@@ -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;
  }