MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'AX25' into AX25_FM

Browse Source
This commit is contained in:
Jonathan Naylor
2020-06-30 11:45:58 +01:00
parent 8383c7d320 e339de8fee
commit 14413963d9
11 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MMDVMHost.cpp
View File

@@ -168,7 +168,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),
@@ -1102,7 +1102,7 @@ int CMMDVMHost::run()
if (m_fmNetwork != NULL)
m_fmNetwork->clock(ms);
#if defined(USE_GPS)
#if defined(USE_GPSD)
if (m_gpsd != NULL)
m_gpsd->clock(ms);
#endif
@@ -1182,7 +1182,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;
@@ -1526,7 +1526,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();