g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 14:35:31 +00:00
Code Issues 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
Download patch file Download diff file Expand all files Collapse all files

8
MMDVMHost.cpp
View file

@ -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();