From 6c0ad4d39f85b1b44c286da8005baa07b610e900 Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Wed, 27 Sep 2006 19:19:11 +0000 Subject: Don't init Garmin NMEA if we are going to init Garmin Serial binary --- drivers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers.c') 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 */ -- cgit v1.2.1