From be8c29da3e62e6fb4a1b49132aa70936f7fc34f2 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Mon, 29 Jun 2020 11:50:33 +0100
Subject: [PATCH 1/2] Fix Windows compilation.

---
 MMDVMHost.vcxproj         |  4 ++--
 MMDVMHost.vcxproj.filters | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj
index 44b50f2..b17f851 100644
--- a/MMDVMHost.vcxproj
+++ b/MMDVMHost.vcxproj
@@ -183,13 +183,13 @@
     <ClInclude Include="DStarSlowData.h" />
     <ClInclude Include="Golay2087.h" />
     <ClInclude Include="Golay24128.h" />
+    <ClInclude Include="GPSD.h" />
     <ClInclude Include="Hamming.h" />
     <ClInclude Include="DMRLookup.h" />
     <ClInclude Include="I2CController.h" />
     <ClInclude Include="LCDproc.h" />
     <ClInclude Include="Log.h" />
     <ClInclude Include="MMDVMHost.h" />
-    <ClInclude Include="MobileGPS.h" />
     <ClInclude Include="Modem.h" />
     <ClInclude Include="ModemSerialPort.h" />
     <ClInclude Include="Mutex.h" />
@@ -281,12 +281,12 @@
     <ClCompile Include="DStarSlowData.cpp" />
     <ClCompile Include="Golay2087.cpp" />
     <ClCompile Include="Golay24128.cpp" />
+    <ClCompile Include="GPSD.cpp" />
     <ClCompile Include="Hamming.cpp" />
     <ClCompile Include="I2CController.cpp" />
     <ClCompile Include="LCDproc.cpp" />
     <ClCompile Include="Log.cpp" />
     <ClCompile Include="MMDVMHost.cpp" />
-    <ClCompile Include="MobileGPS.cpp" />
     <ClCompile Include="Modem.cpp" />
     <ClCompile Include="ModemSerialPort.cpp" />
     <ClCompile Include="Mutex.cpp" />
diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters
index 01fcd3f..7168194 100644
--- a/MMDVMHost.vcxproj.filters
+++ b/MMDVMHost.vcxproj.filters
@@ -278,9 +278,6 @@
     <ClInclude Include="I2CController.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MobileGPS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="NullModem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -305,6 +302,9 @@
     <ClInclude Include="NXDNKenwoodNetwork.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GPSD.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BPTC19696.cpp">
@@ -547,9 +547,6 @@
     <ClCompile Include="I2CController.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MobileGPS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="NullModem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -574,5 +571,8 @@
     <ClCompile Include="NXDNKenwoodNetwork.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GPSD.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

From df47466aa2881ff3774f4660727c39227c97bc6c Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 30 Jun 2020 11:38:25 +0100
Subject: [PATCH 2/2] Use USE_GPSD instead of USE_GPS.

---
 GPSD.cpp             | 3 +--
 GPSD.h               | 3 +--
 MMDVMHost.cpp        | 8 ++++----
 MMDVMHost.h          | 2 +-
 Makefile             | 2 +-
 Makefile.Pi          | 2 +-
 Makefile.Pi.Adafruit | 2 +-
 Makefile.Pi.HD44780  | 2 +-
 Makefile.Pi.OLED     | 2 +-
 Makefile.Pi.PCF8574  | 2 +-
 Version.h            | 2 +-
 11 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/GPSD.cpp b/GPSD.cpp
index aec42f0..c06321a 100644
--- a/GPSD.cpp
+++ b/GPSD.cpp
@@ -18,7 +18,7 @@
 
 #include "GPSD.h"
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 
 #include <cstdio>
 #include <cassert>
@@ -101,4 +101,3 @@ void CGPSD::sendReport()
 }
 
 #endif
-
diff --git a/GPSD.h b/GPSD.h
index d8838db..cef93b5 100644
--- a/GPSD.h
+++ b/GPSD.h
@@ -19,7 +19,7 @@
 #ifndef	GPSD_H
 #define	GPSD_H
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 
 #include "DMRNetwork.h"
 #include "Timer.h"
@@ -52,4 +52,3 @@ private:
 #endif
 
 #endif
-
diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
index b736a42..b5a8aef 100644
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@@ -161,7 +161,7 @@ m_id(0U),
 m_cwCallsign(),
 m_lockFileEnabled(false),
 m_lockFileName(),
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 m_gpsd(NULL),
 #endif
 m_remoteControl(NULL),
@@ -1006,7 +1006,7 @@ int CMMDVMHost::run()
 		if (m_pocsagNetwork != NULL)
 			m_pocsagNetwork->clock(ms);
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 		if (m_gpsd != NULL)
 			m_gpsd->clock(ms);
 #endif
@@ -1086,7 +1086,7 @@ int CMMDVMHost::run()
 	m_display->close();
 	delete m_display;
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 	if (m_gpsd != NULL) {
 		m_gpsd->close();
 		delete m_gpsd;
@@ -1398,7 +1398,7 @@ bool CMMDVMHost::createDMRNetwork()
 		return false;
 	}
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 	bool gpsdEnabled = m_conf.getGPSDEnabled();
 	if (gpsdEnabled) {
 		std::string gpsdAddress = m_conf.getGPSDAddress();
diff --git a/MMDVMHost.h b/MMDVMHost.h
index 4e2b039..3d77653 100644
--- a/MMDVMHost.h
+++ b/MMDVMHost.h
@@ -102,7 +102,7 @@ private:
   std::string     m_cwCallsign;
   bool            m_lockFileEnabled;
   std::string     m_lockFileName;
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
   CGPSD*          m_gpsd;
 #endif
   CRemoteControl* m_remoteControl;
diff --git a/Makefile b/Makefile
index 029f36e..1ad3c8a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
 LIBS    = -lpthread
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread
 #LIBS    = -lpthread -lgps
 
 LDFLAGS = -g
diff --git a/Makefile.Pi b/Makefile.Pi
index 24650a3..53e457e 100644
--- a/Makefile.Pi
+++ b/Makefile.Pi
@@ -7,7 +7,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 
 # 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
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
index c273ce5..0a8fa85 100644
--- a/Makefile.Pi.Adafruit
+++ b/Makefile.Pi.Adafruit
@@ -8,7 +8,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/l
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 
 # 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
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
index eccc3cc..5417946 100644
--- a/Makefile.Pi.HD44780
+++ b/Makefile.Pi.HD44780
@@ -8,7 +8,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 
 # 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
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DHD44780 -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
index 513e3f1..9949cf2 100644
--- a/Makefile.Pi.OLED
+++ b/Makefile.Pi.OLED
@@ -8,7 +8,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include
 LIBS    = -lArduiPi_OLED -lwiringPi -lpthread
 
 # 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
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DOLED -I/usr/local/include
 #LIBS    = -lArduiPi_OLED -lwiringPi -lpthread -lgps
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574
index ad46379..aa84cc8 100644
--- a/Makefile.Pi.PCF8574
+++ b/Makefile.Pi.PCF8574
@@ -9,7 +9,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/lo
 LIBS    = -lwiringPi -lwiringPiDev -lpthread
 
 # 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
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Version.h b/Version.h
index 68d6440..bb444d2 100644
--- a/Version.h
+++ b/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200629";
+const char* VERSION = "20200630";
 
 #endif