diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-10 09:36:59 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-10 09:36:59 -0700 |
| commit | 998eae61ecf56dd6ead4ec6ad82c952ae84170df (patch) | |
| tree | ca71f8722a45c0abec512e8a2595ba83ee881e24 | |
| parent | d696b34b4823647e2e91093ba9d5a351d3a52f8a (diff) | |
Revert "altos: Write current flight state to GPS data from GPS drivers"
This reverts commit db6003d34595fbd103d5b131912b6a797254f1c5.
| -rw-r--r-- | src/drivers/ao_gps_sirf.c | 3 | ||||
| -rw-r--r-- | src/drivers/ao_gps_skytraq.c | 3 | ||||
| -rw-r--r-- | src/drivers/ao_gps_ublox.c | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/drivers/ao_gps_sirf.c b/src/drivers/ao_gps_sirf.c index 344b7121..d89435b9 100644 --- a/src/drivers/ao_gps_sirf.c +++ b/src/drivers/ao_gps_sirf.c @@ -413,9 +413,6 @@ ao_gps(void) __reentrant ao_gps_data.hdop = ao_sirf_data.hdop; ao_gps_data.climb_rate = ao_sirf_data.climb_rate; ao_gps_data.flags |= AO_GPS_COURSE_VALID; -#if HAS_FLIGHT || HAS_TRACKER - ao_gps_data.state = ao_flight_state; -#endif #if 0 if (ao_sirf_data.h_error > 6553500) ao_gps_data.h_error = 65535; diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c index d789974d..944a37f9 100644 --- a/src/drivers/ao_gps_skytraq.c +++ b/src/drivers/ao_gps_skytraq.c @@ -259,9 +259,6 @@ ao_nmea_gga(void) ao_gps_next.minute = ao_gps_decimal(2); ao_gps_next.second = ao_gps_decimal(2); ao_gps_skip_field(); /* skip seconds fraction */ -#if HAS_FLIGHT || HAS_TRACKER - ao_gps_data.state = ao_flight_state; -#endif ao_gps_next.latitude = ao_gps_parse_pos(2); if (ao_gps_parse_flag('N', 'S')) diff --git a/src/drivers/ao_gps_ublox.c b/src/drivers/ao_gps_ublox.c index 6c42c1ba..077698a9 100644 --- a/src/drivers/ao_gps_ublox.c +++ b/src/drivers/ao_gps_ublox.c @@ -749,9 +749,7 @@ ao_gps(void) __reentrant ao_gps_data.ground_speed = nav_velned.g_speed; ao_gps_data.climb_rate = -nav_velned.vel_d; ao_gps_data.course = nav_velned.heading / 200000; -#if HAS_FLIGHT || HAS_TRACKER - ao_gps_data.state = ao_flight_state; -#endif + ao_gps_tracking_data.channels = 0; struct ao_telemetry_satellite_info *dst = &ao_gps_tracking_data.sats[0]; |