Merge branch 'AX25' into AX25_FM

Conf.cpp

@@ -60,7 +60,7 @@ enum SECTION {
 	SECTION_OLED,
 	SECTION_LCDPROC,
 	SECTION_LOCK_FILE,
-	SECTION_MOBILE_GPS,
+	SECTION_GPSD,
 	SECTION_REMOTE_CONTROL
 };
 
@@ -305,9 +305,9 @@ m_lcdprocUTC(false),
 m_lcdprocDimOnIdle(false),
 m_lockFileEnabled(false),
 m_lockFileName(),
-m_mobileGPSEnabled(false),
+m_gpsdEnabled(false),
-m_mobileGPSAddress(),
+m_gpsdAddress(),
-m_mobileGPSPort(0U),
+m_gpsdPort(),
 m_remoteControlEnabled(false),
 m_remoteControlPort(0U)
 {
@@ -395,8 +395,8 @@ bool CConf::read()
 				section = SECTION_LCDPROC;
 			else if (::strncmp(buffer, "[Lock File]", 11U) == 0)
 				section = SECTION_LOCK_FILE;
-			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 Control]", 16U) == 0)
 				section = SECTION_REMOTE_CONTROL;
 			else
@@ -433,12 +433,12 @@ bool CConf::read()
 			else if (::strcmp(key, "Duplex") == 0)
 				m_duplex = ::atoi(value) == 1;
 			else if (::strcmp(key, "ModeHang") == 0)
-				m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = m_nxdnNetworkModeHang = m_pocsagNetworkModeHang = m_fmNetworkModeHang =
+				m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang =
-				m_dstarModeHang        = m_dmrModeHang        = m_fusionModeHang        = m_p25ModeHang        = m_nxdnModeHang = m_fmModeHang = (unsigned int)::atoi(value);
+				m_dstarModeHang        = m_dmrModeHang        = m_fusionModeHang        = m_p25ModeHang        = (unsigned int)::atoi(value);
 			else if (::strcmp(key, "RFModeHang") == 0)
-				m_dstarModeHang = m_dmrModeHang = m_fusionModeHang = m_p25ModeHang = m_nxdnModeHang = m_fmModeHang = (unsigned int)::atoi(value);
+				m_dstarModeHang = m_dmrModeHang = m_fusionModeHang = m_p25ModeHang = (unsigned int)::atoi(value);
 			else if (::strcmp(key, "NetModeHang") == 0)
-				m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = m_nxdnNetworkModeHang = m_pocsagNetworkModeHang = m_fmNetworkModeHang = (unsigned int)::atoi(value);
+				m_dstarNetworkModeHang = m_dmrNetworkModeHang = m_fusionNetworkModeHang = m_p25NetworkModeHang = (unsigned int)::atoi(value);
 			else if (::strcmp(key, "Display") == 0)
 				m_display = value;
 			else if (::strcmp(key, "Daemon") == 0)
@@ -1017,13 +1017,13 @@ bool CConf::read()
 				m_lockFileEnabled = ::atoi(value) == 1;
 			else if (::strcmp(key, "File") == 0)
 				m_lockFileName = 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_CONTROL) {
 			if (::strcmp(key, "Enable") == 0)
 				m_remoteControlEnabled = ::atoi(value) == 1;
@@ -2232,19 +2232,19 @@ std::string CConf::getLockFileName() const
 	return m_lockFileName;
 }
 
-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::getRemoteControlEnabled() const

Conf.h

@@ -331,10 +331,10 @@ public:
   bool         getLockFileEnabled() const;
   std::string  getLockFileName() 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 Control section
   bool         getRemoteControlEnabled() const;
@@ -612,9 +612,9 @@ private:
   bool         m_lockFileEnabled;
   std::string  m_lockFileName;
 
-  bool         m_mobileGPSEnabled;
+  bool         m_gpsdEnabled;
-  std::string  m_mobileGPSAddress;
+  std::string  m_gpsdAddress;
-  unsigned int m_mobileGPSPort;
+  std::string  m_gpsdPort;
 
   bool         m_remoteControlEnabled;
   unsigned int m_remoteControlPort;

GPSD.cpp

@@ -0,0 +1,104 @@
+/*
+ *   Copyright (C) 2018,2020 by Jonathan Naylor G4KLX
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "GPSD.h"
+
+#if defined(USE_GPS)
+
+#include <cstdio>
+#include <cassert>
+#include <cstring>
+#include <cmath>
+
+CGPSD::CGPSD(const std::string& address, const std::string& port, CDMRNetwork* network) :
+m_gpsdAddress(address),
+m_gpsdPort(port),
+m_network(network),
+m_gpsdData(),
+m_idTimer(1000U, 60U)
+{
+	assert(!address.empty());
+	assert(!port.empty());
+	assert(network != NULL);
+}
+
+CGPSD::~CGPSD()
+{
+}
+
+bool CGPSD::open()
+{
+	int ret = ::gps_open(m_gpsdAddress.c_str(), m_gpsdPort.c_str(), &m_gpsdData);
+	if (ret != 0) {
+		LogError("Error when opening access to gpsd - %d - %s", errno, ::gps_errstr(errno));
+		return false;
+	}
+
+	::gps_stream(&m_gpsdData, WATCH_ENABLE | WATCH_JSON, NULL);
+
+	LogMessage("Connected to GPSD");
+
+	m_idTimer.start();
+
+	return true;
+}
+
+void CGPSD::clock(unsigned int ms)
+{
+	m_idTimer.clock(ms);
+
+	if (m_idTimer.hasExpired()) {
+		sendReport();
+		m_idTimer.start();
+	}
+}
+
+void CGPSD::close()
+{
+	::gps_stream(&m_gpsdData, WATCH_DISABLE, NULL);
+	::gps_close(&m_gpsdData);
+}
+
+void CGPSD::sendReport()
+{
+	if (!::gps_waiting(&m_gpsdData, 0))
+		return;
+
+#if GPSD_API_MAJOR_VERSION >= 7
+	if (::gps_read(&m_gpsdData, NULL, 0) <= 0)
+		return;
+#else
+	if (::gps_read(&m_gpsdData) <= 0)
+		return;
+#endif
+
+	if (m_gpsdData.status != STATUS_FIX)
+		return;
+
+	bool latlonSet = (m_gpsdData.set & LATLON_SET) == LATLON_SET;
+	if (!latlonSet)
+		return;
+
+	float latitude  = float(m_gpsdData.fix.latitude);
+	float longitude = float(m_gpsdData.fix.longitude);
+
+	m_network->writeHomePosition(latitude, longitude);
+}
+
+#endif
+

GPSD.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2018 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2018,2020 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -16,32 +16,22 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef	MobileGPS_H
+#ifndef	GPSD_H
-#define	MobileGPS_H
+#define	GPSD_H
+
+#if defined(USE_GPS)
 
 #include "DMRNetwork.h"
-#include "UDPSocket.h"
 #include "Timer.h"
 
 #include <string>
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#include <gps.h>
-#include <netdb.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#else
-#include <winsock.h>
-#endif
 
-class CMobileGPS {
+class CGPSD {
 public:
-	CMobileGPS(const std::string& address, unsigned int port, CDMRNetwork* network);
+	CGPSD(const std::string& address, const std::string& port, CDMRNetwork* network);
-	~CMobileGPS();
+	~CGPSD();
 
 	bool open();
 
@@ -50,14 +40,16 @@ public:
 	void close();
 
 private:
-	CTimer       m_idTimer;
+	std::string       m_gpsdAddress;
-	in_addr      m_address;
+	std::string       m_gpsdPort;
-	unsigned int m_port;
+	CDMRNetwork*      m_network;
-	CUDPSocket   m_socket;
+	struct gps_data_t m_gpsdData;
-	CDMRNetwork* m_network;
+	CTimer            m_idTimer;
 
-	bool pollGPS();
 	void sendReport();
 };
 
 #endif
+
+#endif
+

MMDVM.ini

@@ -313,10 +313,10 @@ UTC=0
 Enable=0
 File=/tmp/MMDVM_Active.lck
 
-[Mobile GPS]
+[GPSD]
 Enable=0
 Address=127.0.0.1
-Port=7834
+Port=2947
 
 [Remote Control]
 Enable=0

MMDVMHost.cpp

@@ -168,7 +168,9 @@ m_id(0U),
 m_cwCallsign(),
 m_lockFileEnabled(false),
 m_lockFileName(),
-m_mobileGPS(NULL),
+#if defined(USE_GPS)
+m_gpsd(NULL),
+#endif
 m_remoteControl(NULL),
 m_fixedMode(false)
 {
@@ -1100,8 +1102,10 @@ int CMMDVMHost::run()
 		if (m_fmNetwork != NULL)
 			m_fmNetwork->clock(ms);
 
-		if (m_mobileGPS != NULL)
+#if defined(USE_GPS)
-			m_mobileGPS->clock(ms);
+		if (m_gpsd != NULL)
+			m_gpsd->clock(ms);
+#endif
 
 		m_cwIdTimer.clock(ms);
 		if (m_cwIdTimer.isRunning() && m_cwIdTimer.hasExpired()) {
@@ -1178,10 +1182,12 @@ int CMMDVMHost::run()
 	m_display->close();
 	delete m_display;
 
-	if (m_mobileGPS != NULL) {
+#if defined(USE_GPS)
-		m_mobileGPS->close();
+	if (m_gpsd != NULL) {
-		delete m_mobileGPS;
+		m_gpsd->close();
+		delete m_gpsd;
 	}
+#endif
 
 	if (m_ump != NULL) {
 		m_ump->close();
@@ -1520,23 +1526,25 @@ bool CMMDVMHost::createDMRNetwork()
 		return false;
 	}
 
-	bool mobileGPSEnabled = m_conf.getMobileGPSEnabled();
+#if defined(USE_GPS)
-	if (mobileGPSEnabled) {
+	bool gpsdEnabled = m_conf.getGPSDEnabled();
-		std::string mobileGPSAddress = m_conf.getMobileGPSAddress();
+	if (gpsdEnabled) {
-		unsigned int mobileGPSPort   = m_conf.getMobileGPSPort();
+		std::string gpsdAddress = m_conf.getGPSDAddress();
+		std::string gpsdPort    = m_conf.getGPSDPort();
 
-		LogInfo("Mobile GPS Parameters");
+		LogInfo("GPSD Parameters");
-		LogInfo("    Address: %s", mobileGPSAddress.c_str());
+		LogInfo("    Address: %s", gpsdAddress.c_str());
-		LogInfo("    Port: %u", mobileGPSPort);
+		LogInfo("    Port: %s", gpsdPort.c_str());
 
-		m_mobileGPS = new CMobileGPS(address, port, m_dmrNetwork);
+		m_gpsd = new CGPSD(gpsdAddress, gpsdPort, m_dmrNetwork);
 
-		ret = m_mobileGPS->open();
+		ret = m_gpsd->open();
 		if (!ret) {
-			delete m_mobileGPS;
+			delete m_gpsd;
-			m_mobileGPS = NULL;
+			m_gpsd = NULL;
 		}
 	}
+#endif
 
 	m_dmrNetwork->enable(true);
 

MMDVMHost.h

@@ -37,12 +37,12 @@
 #include "DMRNetwork.h"
 #include "FMNetwork.h"
 #include "DMRLookup.h"
-#include "MobileGPS.h"
 #include "FMControl.h"
 #include "Display.h"
 #include "Timer.h"
 #include "Modem.h"
 #include "Conf.h"
+#include "GPSD.h"
 #include "UMP.h"
 
 #include <string>
@@ -113,7 +113,9 @@ private:
   std::string     m_cwCallsign;
   bool            m_lockFileEnabled;
   std::string     m_lockFileName;
-  CMobileGPS*     m_mobileGPS;
+#if defined(USE_GPS)
+  CGPSD*          m_gpsd;
+#endif
   CRemoteControl* m_remoteControl;
   bool            m_fixedMode;
 

Makefile

@@ -2,14 +2,21 @@
 
 CC      = cc
 CXX     = c++
+
+# Use the following CFLAGS and LIBS if you don't want to use gpsd.
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
 LIBS    = -lpthread -lutil
+
+# Use the following CFLAGS and LIBS if you do want to use gpsd.
+#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread
+#LIBS    = -lpthread -lutil -lgps -lutil
+
 LDFLAGS = -g
 
 OBJECTS = AX25Control.o AX25Network.o \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o Hamming.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o \
+		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o GPSD.o Hamming.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o Modem.o \
 		ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o \
 		NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o \
 		P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o \

Makefile.Pi

@@ -2,14 +2,20 @@
 
 CC      = gcc
 CXX     = g++
+# Use the following CFLAGS and LIBS if you don't want to use gpsd.
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
-LIBS    = -lwiringPi -lwiringPiDev -lpthread
+LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
+
+# Use the following CFLAGS and LIBS if you do want to use gpsd.
+#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
+#LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
+
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = AX25Control.o AX25Network.o \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o Hamming.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o \
+		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o GPSD.o Hamming.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o Modem.o \
 		ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o \
 		NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o \
 		P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o \

Makefile.Pi.Adafruit

@@ -3,14 +3,20 @@
 
 CC      = gcc
 CXX     = g++
+# Use the following CFLAGS and LIBS if you don't want to use gpsd.
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
-LIBS    = -lwiringPi -lwiringPiDev -lpthread
+LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
+
+# Use the following CFLAGS and LIBS if you do want to use gpsd.
+#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
+#LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
+
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = AX25Control.o AX25Network.o \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o \
+		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o GPSD.o Hamming.o HD44780.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o Modem.o \
 		ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o \
 		NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o \
 		P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o \

Makefile.Pi.HD44780

@@ -2,14 +2,21 @@
 
 CC      = gcc
 CXX     = g++
+
+# Use the following CFLAGS and LIBS if you don't want to use gpsd.
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -I/usr/local/include
-LIBS    = -lwiringPi -lwiringPiDev -lpthread
+LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
+
+# Use the following CFLAGS and LIBS if you do want to use gpsd.
+#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DHD44780 -I/usr/local/include
+#LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
+
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = AX25Control.o AX25Network.o \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o IIDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o \
+		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o GPSD.o Hamming.o HD44780.o I2CController.o IIDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o Modem.o \
 		ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o \
 		NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o \
 		P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o \

Makefile.Pi.OLED

@@ -2,14 +2,21 @@
 
 CC      = gcc
 CXX     = g++
+
+# Use the following CFLAGS and LIBS if you don't want to use gpsd.
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include
-LIBS    = -lArduiPi_OLED -lwiringPi -lpthread
+LIBS    = -lArduiPi_OLED -lwiringPi -lpthread -lutil
+
+# Use the following CFLAGS and LIBS if you do want to use gpsd.
+#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DOLED -I/usr/local/include
+#LIBS    = -lArduiPi_OLED -lwiringPi -lpthread -lgps -lutil
+
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = AX25Control.o AX25Network.o \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o Hamming.o I2CController.o IIRDirectForm1Filter.o OLED.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o \
+		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o GPSD.o Hamming.o I2CController.o IIRDirectForm1Filter.o OLED.o LCDproc.o Log.o MMDVMHost.o Modem.o \
 		ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o \
 		NXDNLayer3.o NXDNIcomNetwork.o NXDNKenwoodNetwork.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o \
 		P25Network.o P25NID.o P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o \

Makefile.Pi.PCF8574

@@ -3,14 +3,21 @@
 
 CC      = gcc
 CXX     = g++
+
+# Use the following CFLAGS and LIBS if you don't want to use gpsd.
 CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
-LIBS    = -lwiringPi -lwiringPiDev -lpthread
+LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
+
+# Use the following CFLAGS and LIBS if you do want to use gpsd.
+#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
+#LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
+
 LDFLAGS = -g -L/usr/local/lib
 
 OBJECTS = AX25Control.o AX25Network.o \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o \
+		DStarSlowData.o FMControl.o FMNetwork.o Golay2087.o Golay24128.o GPSD.o Hamming.o HD44780.o I2CController.o IIRDirectForm1Filter.o LCDproc.o Log.o MMDVMHost.o Modem.o \
 		ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNIcomNetwork.o \
 		NXDNKenwoodNetwork.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o \
 		P25Trellis.o P25Utils.o PseudoTTYController.o POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o \

MobileGPS.cpp

@@ -1,101 +0,0 @@
-/*
- *   Copyright (C) 2018 by Jonathan Naylor G4KLX
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "MobileGPS.h"
-
-#include <cstdio>
-#include <cassert>
-#include <cstring>
-#include <cmath>
-
-CMobileGPS::CMobileGPS(const std::string& address, unsigned int port, CDMRNetwork* network) :
-m_idTimer(1000U, 60U),
-m_address(),
-m_port(port),
-m_socket(),
-m_network(network)
-{
-	assert(!address.empty());
-	assert(port > 0U);
-	assert(network != NULL);
-
-	m_address = CUDPSocket::lookup(address);
-}
-
-CMobileGPS::~CMobileGPS()
-{
-}
-
-bool CMobileGPS::open()
-{
-	bool ret = m_socket.open();
-	if (!ret)
-		return false;
-
-	m_idTimer.start();
-
-	return true;
-}
-
-void CMobileGPS::clock(unsigned int ms)
-{
-	m_idTimer.clock(ms);
-
-	if (m_idTimer.hasExpired()) {
-		pollGPS();
-		m_idTimer.start();
-	}
-
-	sendReport();
-}
-
-void CMobileGPS::close()
-{
-	m_socket.close();
-}
-
-bool CMobileGPS::pollGPS()
-{
-	return m_socket.write((unsigned char*)"MMDVMHost", 9U, m_address, m_port);
-}
-
-void CMobileGPS::sendReport()
-{
-	// Grab GPS data if it's available
-	unsigned char buffer[200U];
-	in_addr address;
-	unsigned int port;
-	int ret = m_socket.read(buffer, 200U, address, port);
-	if (ret <= 0)
-		return;
-
-	buffer[ret] = '\0';
-
-	// Parse the GPS data
-	char* pLatitude  = ::strtok((char*)buffer, ",\n");	// Latitude
-	char* pLongitude = ::strtok(NULL, ",\n");		// Longitude
-
-	if (pLatitude == NULL || pLongitude == NULL)
-		return;
-
-	float latitude  = float(::atof(pLatitude));
-	float longitude = float(::atof(pLongitude));
-
-	m_network->writeHomePosition(latitude, longitude);
-}
-

Version.h

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