g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-01-20 23:20:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #59 from f1rmb/gps_read_api_version_checking

Browse source 
Take care if the gpsd API version with gps_read() as function prototype as changed in version 7.
This commit is contained in:
Jonathan Naylor 2020-06-24 11:47:56 +01:00 committed by GitHub
parent 94db475b2e 0c7eef460d
commit 2d7fca4f0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Common/APRSWriter.cpp
View file

@ -448,8 +448,13 @@ void CAPRSWriter::sendIdFramesMobile()
if (!::gps_waiting(&m_gpsdData, 0))
return;
#if GPSD_API_MAJOR_VERSION >= 7
if (::gps_read(&m_gpsdData, NULL, 0) <= 0)
return;
#else
if (::gps_read(&m_gpsdData) <= 0)
return;
#endif
if (m_gpsdData.status != STATUS_FIX)
return;
@ -464,7 +469,11 @@ void CAPRSWriter::sendIdFramesMobile()
float rawLatitude = float(m_gpsdData.fix.latitude);
float rawLongitude = float(m_gpsdData.fix.longitude);
#if GPSD_API_MAJOR_VERSION >= 9
float rawAltitude = float(m_gpsdData.fix.altMSL);
#else
float rawAltitude = float(m_gpsdData.fix.altitude);
#endif
float rawVelocity = float(m_gpsdData.fix.speed);
float rawBearing = float(m_gpsdData.fix.track);

2
Makefile
View file

@ -14,7 +14,7 @@ endif
# Add -DDCS_LINK to the end of the CFLAGS line below to add DCS linking to StarNet
# Add -DDEXTRA_LINK to the end of the CFLAGS line below to add DExtra linking to StarNet
# Add -DUSE_GPS to the end of the CFLAGS line to enable the use of gpsd, and add -lgps to
# Add -DUSE_GPSD to the end of the CFLAGS line to enable the use of gpsd, and add -lgps to
# end of the LIBS line.
DEBUGFLAGS := -g -D_DEBUG