Add support for GPSD.

YSFGateway/APRSWriter.cpp

@@ -17,8 +17,8 @@
  */
 
 #include "APRSWriter.h"
-
 #include "YSFDefines.h"
+#include "Log.h"
 
 #include <cstdio>
 #include <cassert>
@@ -37,10 +37,13 @@ m_desc(),
 m_suffix(suffix),
 m_aprsAddress(),
 m_aprsPort(port),
-m_aprsSocket(),
+m_aprsSocket()
-m_mobileGPSAddress(),
+#if !defined(_WIN32) && !defined(_WIN64)
-m_mobileGPSPort(0U),
+,m_gpsdEnabled(false),
-m_mobileSocket(NULL)
+m_gpsdAddress(),
+m_gpsdPort(0U),
+m_gpsdData()
+#endif
 {
 	assert(!callsign.empty());
 	assert(!address.empty());
@@ -72,33 +75,38 @@ void CAPRSWriter::setStaticLocation(float latitude, float longitude, int height)
 	m_height    = height;
 }
 
-void CAPRSWriter::setMobileLocation(const std::string& address, unsigned int port)
+void CAPRSWriter::setGPSDLocation(const std::string& address, const std::string& port)
 {
+#if !defined(_WIN32) && !defined(_WIN64)
 	assert(!address.empty());
-	assert(port > 0U);
+	assert(!port.empty());
 
-	m_mobileGPSAddress = CUDPSocket::lookup(address);
+	m_gpsdEnabled = true;
-	m_mobileGPSPort    = port;
+	m_gpsdAddress = address;
-
+	m_gpsdPort    = port;
-	m_mobileSocket = new CUDPSocket;
+#endif
 }
 
 bool CAPRSWriter::open()
 {
-	if (m_mobileSocket != NULL) {
+#if !defined(_WIN32) && !defined(_WIN64)
-		bool ret = m_mobileSocket->open();
+	if (m_gpsdEnabled) {
-		if (!ret) {
+		int ret = ::gps_open(m_gpsdAddress.c_str(), m_gpsdPort.c_str(), &m_gpsdData);
-			delete m_mobileSocket;
+		if (ret != 0) {
-			m_mobileSocket = NULL;
+			LogError("Error when opening access to gpsd - %d - %s", errno, ::gps_errstr(errno));
 			return false;
 		}
 
+		::gps_stream(&m_gpsdData, WATCH_ENABLE | WATCH_JSON, NULL);
+
 		// Poll the GPS every minute
 		m_idTimer.setTimeout(60U);
 	} else {
 		m_idTimer.setTimeout(20U * 60U);
 	}
-
+#else
+	m_idTimer.setTimeout(20U * 60U);
+#endif
 	m_idTimer.start();
 
 	return m_aprsSocket.open();
@@ -169,36 +177,34 @@ void CAPRSWriter::clock(unsigned int ms)
 {
 	m_idTimer.clock(ms);
 
-	if (m_mobileSocket != NULL) {
+#if !defined(_WIN32) && !defined(_WIN64)
+	if (m_gpsdEnabled) {
 		if (m_idTimer.hasExpired()) {
-			pollGPS();
+			sendIdFrameMobile();
 			m_idTimer.start();
 		}
 
-		sendIdFrameMobile();
 	} else {
+#endif
 		if (m_idTimer.hasExpired()) {
 			sendIdFrameFixed();
 			m_idTimer.start();
 		}
+#if !defined(_WIN32) && !defined(_WIN64)
 	}
+#endif
 }
 
 void CAPRSWriter::close()
 {
 	m_aprsSocket.close();
 
-	if (m_mobileSocket != NULL) {
+#if !defined(_WIN32) && !defined(_WIN64)
-		m_mobileSocket->close();
+	if (m_gpsdEnabled) {
-		delete m_mobileSocket;
+		::gps_stream(&m_gpsdData, WATCH_DISABLE, NULL);
+		::gps_close(&m_gpsdData);
 	}
-}
+#endif
-
-bool CAPRSWriter::pollGPS()
-{
-	assert(m_mobileSocket != NULL);
-
-	return m_mobileSocket->write((unsigned char*)"YSFGateway", 10U, m_mobileGPSAddress, m_mobileGPSPort);
 }
 
 void CAPRSWriter::sendIdFrameFixed()
@@ -264,29 +270,25 @@ void CAPRSWriter::sendIdFrameFixed()
 
 void CAPRSWriter::sendIdFrameMobile()
 {
-	// Grab GPS data if it's available
+	if (!m_gpsdEnabled)
-	unsigned char buffer[200U];
-	in_addr address;
-	unsigned int port;
-	int ret = m_mobileSocket->read(buffer, 200U, address, port);
-	if (ret <= 0)
 		return;
 
-	buffer[ret] = '\0';
+	if (!::gps_waiting(&m_gpsdData, 0))
-
-	// Parse the GPS data
-	char* pLatitude  = ::strtok((char*)buffer, ",\n");	// Latitude
-	char* pLongitude = ::strtok(NULL, ",\n");		// Longitude
-	char* pAltitude  = ::strtok(NULL, ",\n");		// Altitude (m)
-	char* pVelocity  = ::strtok(NULL, ",\n");		// Velocity (kms/h)
-	char* pBearing   = ::strtok(NULL, "\n");		// Bearing
-
-	if (pLatitude == NULL || pLongitude == NULL || pAltitude == NULL)
 		return;
 
-	float rawLatitude  = float(::atof(pLatitude));
+	bool latlonSet   = (m_gpsdData.set & LATLON_SET) == LATLON_SET;
-	float rawLongitude = float(::atof(pLongitude));
+	bool altitudeSet = (m_gpsdData.set & ALTITUDE_SET) == ALTITUDE_SET;
-	float rawAltitude  = float(::atof(pAltitude));
+	bool velocitySet = (m_gpsdData.set & SPEED_SET) == SPEED_SET;
+	bool bearingSet  = (m_gpsdData.set & TRACK_SET) == TRACK_SET;
+
+	if (!latlonSet)
+		return;
+
+	float rawLatitude  = float(m_gpsdData.fix.latitude);
+	float rawLongitude = float(m_gpsdData.fix.longitude);
+	float rawAltitude  = float(m_gpsdData.fix.altMSL);
+	float rawVelocity  = float(m_gpsdData.fix.speed);
+	float rawBearing   = float(m_gpsdData.fix.track);
 
 	char desc[200U];
 	if (m_txFrequency != 0U) {
@@ -339,14 +341,14 @@ void CAPRSWriter::sendIdFrameMobile()
 		lat, (rawLatitude < 0.0F)  ? 'S' : 'N',
 		lon, (rawLongitude < 0.0F) ? 'W' : 'E');
 
-	if (pBearing != NULL && pVelocity != NULL) {
+	if (bearingSet && velocitySet)
-		float rawBearing   = float(::atof(pBearing));
-		float rawVelocity  = float(::atof(pVelocity));
-
 		::sprintf(output + ::strlen(output), "%03.0f/%03.0f", rawBearing, rawVelocity * 0.539957F);
-	}
 
-	::sprintf(output + ::strlen(output), "/A=%06.0f%s %s\r\n", float(rawAltitude) * 3.28F, band, desc);
+	if (altitudeSet)
+		::sprintf(output + ::strlen(output), "/A=%06.0f", float(rawAltitude) * 3.28F);
+
+	::sprintf(output + ::strlen(output), "%s %s\r\n", band, desc);
 
 	m_aprsSocket.write((unsigned char*)output, (unsigned int)::strlen(output), m_aprsAddress, m_aprsPort);
 }
+

YSFGateway/APRSWriter.h

@@ -33,6 +33,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <gps.h>
 #else
 #include <winsock.h>
 #endif
@@ -48,7 +49,7 @@ public:
 
 	void setStaticLocation(float latitude, float longitude, int height);
 
-	void setMobileLocation(const std::string& address, unsigned int port);
+	void setGPSDLocation(const std::string& address, const std::string& port);
 
 	void write(const unsigned char* source, const char* type, unsigned char radio, float latitude, float longitude);
 
@@ -57,23 +58,25 @@ public:
 	void close();
 
 private:
-	CTimer       m_idTimer;
+	CTimer            m_idTimer;
-	std::string  m_callsign;
+	std::string       m_callsign;
-	unsigned int m_txFrequency;
+	unsigned int      m_txFrequency;
-	unsigned int m_rxFrequency;
+	unsigned int      m_rxFrequency;
-	float        m_latitude;
+	float             m_latitude;
-	float        m_longitude;
+	float             m_longitude;
-	int          m_height;
+	int               m_height;
-	std::string  m_desc;
+	std::string       m_desc;
-	std::string  m_suffix;
+	std::string       m_suffix;
-	in_addr      m_aprsAddress;
+	in_addr           m_aprsAddress;
-	unsigned int m_aprsPort;
+	unsigned int      m_aprsPort;
-	CUDPSocket   m_aprsSocket;
+	CUDPSocket        m_aprsSocket;
-	in_addr      m_mobileGPSAddress;
+#if !defined(_WIN32) && !defined(_WIN64)
-	unsigned int m_mobileGPSPort;
+	bool              m_gpsdEnabled;
-	CUDPSocket*  m_mobileSocket;
+	std::string       m_gpsdAddress;
+	std::string       m_gpsdPort;
+	struct gps_data_t m_gpsdData;
+#endif
 
-	bool pollGPS();
 	void sendIdFrameFixed();
 	void sendIdFrameMobile();
 };

YSFGateway/Conf.cpp

@@ -35,7 +35,7 @@ enum SECTION {
   SECTION_NETWORK,
   SECTION_YSF_NETWORK,
   SECTION_FCS_NETWORK,
-  SECTION_MOBILE_GPS,
+  SECTION_GPSD,
   SECTION_REMOTE_COMMANDS
 };
 
@@ -87,9 +87,9 @@ m_ysfNetworkYSF2P25Port(0U),
 m_fcsNetworkEnabled(false),
 m_fcsNetworkFile(),
 m_fcsNetworkPort(0U),
-m_mobileGPSEnabled(false),
+m_gpsdEnabled(false),
-m_mobileGPSAddress(),
+m_gpsdAddress(),
-m_mobileGPSPort(0U),
+m_gpsdPort(),
 m_remoteCommandsEnabled(false),
 m_remoteCommandsPort(6073U)
 {
@@ -129,8 +129,8 @@ bool CConf::read()
 		  section = SECTION_YSF_NETWORK;
 	  else if (::strncmp(buffer, "[FCS Network]", 13U) == 0)
 		  section = SECTION_FCS_NETWORK;
-	  else if (::strncmp(buffer, "[Mobile GPS]", 12U) == 0)
+	  else if (::strncmp(buffer, "[GPSD]", 6U) == 0)
-		  section = SECTION_MOBILE_GPS;
+		  section = SECTION_GPSD;
 	  else if (::strncmp(buffer, "[Remote Commands]", 17U) == 0)
 		  section = SECTION_REMOTE_COMMANDS;
 	  else
@@ -249,13 +249,13 @@ bool CConf::read()
 			m_fcsNetworkFile = value;
 		else if (::strcmp(key, "Port") == 0)
 			m_fcsNetworkPort = (unsigned int)::atoi(value);
-	} else if (section == SECTION_MOBILE_GPS) {
+	} else if (section == SECTION_GPSD) {
 		if (::strcmp(key, "Enable") == 0)
-			m_mobileGPSEnabled = ::atoi(value) == 1;
+			m_gpsdEnabled = ::atoi(value) == 1;
 		else if (::strcmp(key, "Address") == 0)
-			m_mobileGPSAddress = value;
+			m_gpsdAddress = value;
 		else if (::strcmp(key, "Port") == 0)
-			m_mobileGPSPort = (unsigned int)::atoi(value);
+			m_gpsdPort = value;
 	} else if (section == SECTION_REMOTE_COMMANDS) {
 		if (::strcmp(key, "Enable") == 0)
 			m_remoteCommandsEnabled = ::atoi(value) == 1;
@@ -500,19 +500,19 @@ unsigned int CConf::getFCSNetworkPort() const
 	return m_fcsNetworkPort;
 }
 
-bool CConf::getMobileGPSEnabled() const
+bool CConf::getGPSDEnabled() const
 {
-	return m_mobileGPSEnabled;
+	return m_gpsdEnabled;
 }
 
-std::string CConf::getMobileGPSAddress() const
+std::string CConf::getGPSDAddress() const
 {
-	return m_mobileGPSAddress;
+	return m_gpsdAddress;
 }
 
-unsigned int CConf::getMobileGPSPort() const
+std::string CConf::getGPSDPort() const
 {
-	return m_mobileGPSPort;
+	return m_gpsdPort;
 }
 
 bool CConf::getRemoteCommandsEnabled() const

YSFGateway/Conf.h

@@ -89,10 +89,10 @@ public:
   std::string  getFCSNetworkFile() const;
   unsigned int getFCSNetworkPort() const;
 
-  // The Mobile GPS section
+  // The GPSD section
-  bool         getMobileGPSEnabled() const;
+  bool         getGPSDEnabled() const;
-  std::string  getMobileGPSAddress() const;
+  std::string  getGPSDAddress() const;
-  unsigned int getMobileGPSPort() const;
+  std::string  getGPSDPort() const;
 
   // The Remote Commands section
   bool         getRemoteCommandsEnabled() const;
@@ -153,9 +153,9 @@ private:
   std::string  m_fcsNetworkFile;
   unsigned int m_fcsNetworkPort;
 
-  bool         m_mobileGPSEnabled;
+  bool         m_gpsdEnabled;
-  std::string  m_mobileGPSAddress;
+  std::string  m_gpsdAddress;
-  unsigned int m_mobileGPSPort;
+  std::string  m_gpsdPort;
 
   bool         m_remoteCommandsEnabled;
   unsigned int m_remoteCommandsPort;

YSFGateway/Makefile

@@ -1,11 +1,11 @@
 CC      = gcc
 CXX     = g++
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
-LIBS    = -lm -lpthread
+LIBS    = -lm -lpthread -lgps
 LDFLAGS = -g
 
 OBJECTS = APRSWriter.o Conf.o CRC.o DTMF.o FCSNetwork.o Golay24128.o GPS.o Log.o StopWatch.o Sync.o Thread.o Timer.o \
-		  UDPSocket.o Utils.o WiresX.o YSFConvolution.o YSFFICH.o YSFGateway.o YSFNetwork.o YSFPayload.o YSFReflectors.o
+	  UDPSocket.o Utils.o WiresX.o YSFConvolution.o YSFFICH.o YSFGateway.o YSFNetwork.o YSFPayload.o YSFReflectors.o
 
 all:		YSFGateway
 

YSFGateway/Makefile.Solaris

@@ -1,20 +0,0 @@
-CC      = gcc
-CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
-LIBS    = -lm -lpthread -lsocket
-LDFLAGS = -g
-
-OBJECTS = APRSWriter.o Conf.o CRC.o DTMF.o FCSNetwork.o Golay24128.o GPS.o Log.o StopWatch.o Sync.o Thread.o Timer.o \
-		  UDPSocket.o Utils.o WiresX.o YSFConvolution.o YSFFICH.o YSFGateway.o YSFNetwork.o YSFPayload.o YSFReflectors.o
-
-all:		YSFGateway
-
-YSFGateway:	$(OBJECTS)
-		$(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o YSFGateway
-
-%.o: %.cpp
-		$(CXX) $(CFLAGS) -c -o $@ $<
-
-clean:
-		$(RM) YSFGateway *.o *.d *.bak *~
- 

YSFGateway/Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200601";
+const char* VERSION = "20200603";
 
 #endif

YSFGateway/YSFGateway.cpp

@@ -466,12 +466,12 @@ void CYSFGateway::createGPS()
 
 	m_writer->setInfo(txFrequency, rxFrequency, desc);
 
-	bool enabled = m_conf.getMobileGPSEnabled();
+	bool enabled = m_conf.getGPSDEnabled();
 	if (enabled) {
-		std::string address = m_conf.getMobileGPSAddress();
+		std::string address = m_conf.getGPSDAddress();
-		unsigned int port   = m_conf.getMobileGPSPort();
+		std::string port    = m_conf.getGPSDPort();
 
-		m_writer->setMobileLocation(address, port);
+		m_writer->setGPSDLocation(address, port);
 	} else {
 		float latitude  = m_conf.getLatitude();
 		float longitude = m_conf.getLongitude();

YSFGateway/YSFGateway.ini

@@ -61,10 +61,10 @@ Enable=1
 Rooms=./FCSRooms.txt
 Port=42001
 
-[Mobile GPS]
+[GPSD]
 Enable=0
 Address=127.0.0.1
-Port=7834
+Port=2947
 
 [Remote Commands]
 Enable=0