Merge branch 'master' into AX25

2020-06-30 11:40:55 +01:00 · 2020-06-30 11:40:55 +01:00 · e339de8fee
parent 35a283d7b4 df47466aa2
commit e339de8fee
13 changed files with 22 additions and 24 deletions
--- 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
-
--- 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
-
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@ -164,7 +164,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),
@ -1051,7 +1051,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
@ -1131,7 +1131,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;
@ -1454,7 +1454,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();
--- a/MMDVMHost.h
+++ b/MMDVMHost.h
@ -107,7 +107,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;
--- a/MMDVMHost.vcxproj
+++ b/MMDVMHost.vcxproj
@ -186,13 +186,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" />
@ -286,12 +286,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" />
--- 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>
@ -314,6 +311,9 @@
    <ClInclude Include="AX25Defines.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="GPSD.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="BPTC19696.cpp">
@ -556,9 +556,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>
@ -589,5 +586,8 @@
    <ClCompile Include="NXDNKenwoodNetwork.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="GPSD.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
 </Project>
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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