MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use USE_GPSD instead of USE_GPS.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-06-30 11:38:25 +01:00
parent be8c29da3e
commit df47466aa2
11 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
GPSD.cpp
View File

@@ -18,7 +18,7 @@
#include "GPSD.h" #include "GPSD.h"
#if defined(USE_GPS) #if defined(USE_GPSD)
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
@@ -101,4 +101,3 @@ void CGPSD::sendReport()
} }
#endif #endif

3
GPSD.h
View File

@@ -19,7 +19,7 @@
#ifndef GPSD_H #ifndef GPSD_H
#define GPSD_H #define GPSD_H
#if defined(USE_GPS) #if defined(USE_GPSD)
#include "DMRNetwork.h" #include "DMRNetwork.h"
#include "Timer.h" #include "Timer.h"
@@ -52,4 +52,3 @@ private:
#endif #endif
#endif #endif

8
MMDVMHost.cpp
View File

@@ -161,7 +161,7 @@ m_id(0U),
m_cwCallsign(), m_cwCallsign(),
m_lockFileEnabled(false), m_lockFileEnabled(false),
m_lockFileName(), m_lockFileName(),
#if defined(USE_GPS) #if defined(USE_GPSD)
m_gpsd(NULL), m_gpsd(NULL),
#endif #endif
m_remoteControl(NULL), m_remoteControl(NULL),
@@ -1006,7 +1006,7 @@ int CMMDVMHost::run()
if (m_pocsagNetwork != NULL) if (m_pocsagNetwork != NULL)
m_pocsagNetwork->clock(ms); m_pocsagNetwork->clock(ms);
#if defined(USE_GPS) #if defined(USE_GPSD)
if (m_gpsd != NULL) if (m_gpsd != NULL)
m_gpsd->clock(ms); m_gpsd->clock(ms);
#endif #endif
@@ -1086,7 +1086,7 @@ int CMMDVMHost::run()
m_display->close(); m_display->close();
delete m_display; delete m_display;
#if defined(USE_GPS) #if defined(USE_GPSD)
if (m_gpsd != NULL) { if (m_gpsd != NULL) {
m_gpsd->close(); m_gpsd->close();
delete m_gpsd; delete m_gpsd;
@@ -1398,7 +1398,7 @@ bool CMMDVMHost::createDMRNetwork()
return false; return false;
} }
#if defined(USE_GPS) #if defined(USE_GPSD)
bool gpsdEnabled = m_conf.getGPSDEnabled(); bool gpsdEnabled = m_conf.getGPSDEnabled();
if (gpsdEnabled) { if (gpsdEnabled) {
std::string gpsdAddress = m_conf.getGPSDAddress(); std::string gpsdAddress = m_conf.getGPSDAddress();

2
MMDVMHost.h
View File

@@ -102,7 +102,7 @@ private:
std::string m_cwCallsign; std::string m_cwCallsign;
bool m_lockFileEnabled; bool m_lockFileEnabled;
std::string m_lockFileName; std::string m_lockFileName;
#if defined(USE_GPS) #if defined(USE_GPSD)
CGPSD* m_gpsd; CGPSD* m_gpsd;
#endif #endif
CRemoteControl* m_remoteControl; CRemoteControl* m_remoteControl;

2
Makefile
View File

@@ -8,7 +8,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread
LIBS = -lpthread LIBS = -lpthread
# Use the following CFLAGS and LIBS if you do want to use gpsd. # 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 #LIBS = -lpthread -lgps
LDFLAGS = -g LDFLAGS = -g

2
Makefile.Pi
View File

@@ -7,7 +7,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
LIBS = -lwiringPi -lwiringPiDev -lpthread LIBS = -lwiringPi -lwiringPiDev -lpthread
# Use the following CFLAGS and LIBS if you do want to use gpsd. # 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 #LIBS = -lwiringPi -lwiringPiDev -lpthread -lgps
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib

2
Makefile.Pi.Adafruit
View File

@@ -8,7 +8,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/l
LIBS = -lwiringPi -lwiringPiDev -lpthread LIBS = -lwiringPi -lwiringPiDev -lpthread
# Use the following CFLAGS and LIBS if you do want to use gpsd. # 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 #LIBS = -lwiringPi -lwiringPiDev -lpthread -lgps
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib

2
Makefile.Pi.HD44780
View File

@@ -8,7 +8,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -I/usr/local/include
LIBS = -lwiringPi -lwiringPiDev -lpthread LIBS = -lwiringPi -lwiringPiDev -lpthread
# Use the following CFLAGS and LIBS if you do want to use gpsd. # 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 #LIBS = -lwiringPi -lwiringPiDev -lpthread -lgps
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib

2
Makefile.Pi.OLED
View File

@@ -8,7 +8,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DOLED -I/usr/local/include
LIBS = -lArduiPi_OLED -lwiringPi -lpthread LIBS = -lArduiPi_OLED -lwiringPi -lpthread
# Use the following CFLAGS and LIBS if you do want to use gpsd. # 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 #LIBS = -lArduiPi_OLED -lwiringPi -lpthread -lgps
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib

2
Makefile.Pi.PCF8574
View File

@@ -9,7 +9,7 @@ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/lo
LIBS = -lwiringPi -lwiringPiDev -lpthread LIBS = -lwiringPi -lwiringPiDev -lpthread
# Use the following CFLAGS and LIBS if you do want to use gpsd. # 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 #LIBS = -lwiringPi -lwiringPiDev -lpthread -lgps
LDFLAGS = -g -L/usr/local/lib LDFLAGS = -g -L/usr/local/lib

2
Version.h
View File

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