diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-07 11:39:10 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-07 11:39:10 -0700 |
| commit | db6003d34595fbd103d5b131912b6a797254f1c5 (patch) | |
| tree | 5e9e2e620bcd6bcc745453c94308ca5786ae5f30 /src | |
| parent | 302842ccda46a0a3d58b60d5c7fc82e05f614b0b (diff) | |
altos: Write current flight state to GPS data from GPS drivers
This will be useful with TeleGPS which has no other packet containing
flight state.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -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, 9 insertions, 1 deletions
diff --git a/src/drivers/ao_gps_sirf.c b/src/drivers/ao_gps_sirf.c index d89435b9..344b7121 100644 --- a/src/drivers/ao_gps_sirf.c +++ b/src/drivers/ao_gps_sirf.c @@ -413,6 +413,9 @@ 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 944a37f9..d789974d 100644 --- a/src/drivers/ao_gps_skytraq.c +++ b/src/drivers/ao_gps_skytraq.c @@ -259,6 +259,9 @@ 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 077698a9..6c42c1ba 100644 --- a/src/drivers/ao_gps_ublox.c +++ b/src/drivers/ao_gps_ublox.c @@ -749,7 +749,9 @@ 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]; |