summaryrefslogtreecommitdiff
path: root/drivers.c
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2006-09-27 19:19:11 +0000
committerGary E. Miller <gem@rellim.com>2006-09-27 19:19:11 +0000
commit6c0ad4d39f85b1b44c286da8005baa07b610e900 (patch)
tree0eba1f1bbe7875c02b3b04d9ed069b5f9ef2ea0b /drivers.c
parente7b7fec41d2f2f447f33d59c70ca3da4fac88830 (diff)
downloadgpsd-6c0ad4d39f85b1b44c286da8005baa07b610e900.tar.gz
Don't init Garmin NMEA if we are going to init Garmin Serial binary
Diffstat (limited to 'drivers.c')
-rw-r--r--drivers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers.c b/drivers.c
index eeba487f..3b676b73 100644
--- a/drivers.c
+++ b/drivers.c
@@ -155,7 +155,7 @@ static struct gps_type_t nmea = {
static void garmin_nmea_initializer(struct gps_device_t *session)
{
-#ifdef NMEA_ENABLE
+#if defined(NMEA_ENABLE) && !defined(GARMIN_ENABLE)
/* reset some config, AutoFix, WGS84, PPS */
(void)nmea_send(session->gpsdata.gps_fd, "$PGRMC,A,,100,,,,,,A,,1,2,4,30");
/* once a sec, no averaging, NMEA 2.3, WAAS */
@@ -169,7 +169,7 @@ static void garmin_nmea_initializer(struct gps_device_t *session)
(void)nmea_send(session->gpsdata.gps_fd, "$PGRMO,GPGSA,1");
(void)nmea_send(session->gpsdata.gps_fd, "$PGRMO,GPGSV,1");
(void)nmea_send(session->gpsdata.gps_fd, "$PGRMO,GPRMC,1");
-#endif /* NMEA_ENABLE */
+#endif /* NMEA_ENABLE && !GARMIN_ENABLE */
#if GARMIN_ENABLE
/* try to go binary */
/* once a sec, binary, no averaging, NMEA 2.3, WAAS */