Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into AX25

Browse source
This commit is contained in:
Jonathan Naylor 2020-06-30 11:40:55 +01:00
commit e339de8fee
13 changed files with 22 additions and 24 deletions
Show stats 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

@ -164,7 +164,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),
@ -1051,7 +1051,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
@ -1131,7 +1131,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;
@ -1454,7 +1454,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

@ -107,7 +107,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;

4
MMDVMHost.vcxproj
View file

@ -186,13 +186,13 @@
<ClInclude Include="DStarSlowData.h" /> <ClInclude Include="DStarSlowData.h" />
<ClInclude Include="Golay2087.h" /> <ClInclude Include="Golay2087.h" />
<ClInclude Include="Golay24128.h" /> <ClInclude Include="Golay24128.h" />
<ClInclude Include="GPSD.h" />
<ClInclude Include="Hamming.h" /> <ClInclude Include="Hamming.h" />
<ClInclude Include="DMRLookup.h" /> <ClInclude Include="DMRLookup.h" />
<ClInclude Include="I2CController.h" /> <ClInclude Include="I2CController.h" />
<ClInclude Include="LCDproc.h" /> <ClInclude Include="LCDproc.h" />
<ClInclude Include="Log.h" /> <ClInclude Include="Log.h" />
<ClInclude Include="MMDVMHost.h" /> <ClInclude Include="MMDVMHost.h" />
<ClInclude Include="MobileGPS.h" />
<ClInclude Include="Modem.h" /> <ClInclude Include="Modem.h" />
<ClInclude Include="ModemSerialPort.h" /> <ClInclude Include="ModemSerialPort.h" />
<ClInclude Include="Mutex.h" /> <ClInclude Include="Mutex.h" />
@ -286,12 +286,12 @@
<ClCompile Include="DStarSlowData.cpp" /> <ClCompile Include="DStarSlowData.cpp" />
<ClCompile Include="Golay2087.cpp" /> <ClCompile Include="Golay2087.cpp" />
<ClCompile Include="Golay24128.cpp" /> <ClCompile Include="Golay24128.cpp" />
<ClCompile Include="GPSD.cpp" />
<ClCompile Include="Hamming.cpp" /> <ClCompile Include="Hamming.cpp" />
<ClCompile Include="I2CController.cpp" /> <ClCompile Include="I2CController.cpp" />
<ClCompile Include="LCDproc.cpp" /> <ClCompile Include="LCDproc.cpp" />
<ClCompile Include="Log.cpp" /> <ClCompile Include="Log.cpp" />
<ClCompile Include="MMDVMHost.cpp" /> <ClCompile Include="MMDVMHost.cpp" />
<ClCompile Include="MobileGPS.cpp" />
<ClCompile Include="Modem.cpp" /> <ClCompile Include="Modem.cpp" />
<ClCompile Include="ModemSerialPort.cpp" /> <ClCompile Include="ModemSerialPort.cpp" />
<ClCompile Include="Mutex.cpp" /> <ClCompile Include="Mutex.cpp" />

12
MMDVMHost.vcxproj.filters
View file

@ -278,9 +278,6 @@
<ClInclude Include="I2CController.h"> <ClInclude Include="I2CController.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MobileGPS.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="NullModem.h"> <ClInclude Include="NullModem.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -314,6 +311,9 @@
<ClInclude Include="AX25Defines.h"> <ClInclude Include="AX25Defines.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GPSD.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="BPTC19696.cpp"> <ClCompile Include="BPTC19696.cpp">
@ -556,9 +556,6 @@
<ClCompile Include="I2CController.cpp"> <ClCompile Include="I2CController.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MobileGPS.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="NullModem.cpp"> <ClCompile Include="NullModem.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -589,5 +586,8 @@
<ClCompile Include="NXDNKenwoodNetwork.cpp"> <ClCompile Include="NXDNKenwoodNetwork.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GPSD.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

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