From: Keith Packard <keithp@keithp.com>
Date: Tue, 10 Jun 2014 16:47:04 +0000 (-0700)
Subject: Revert adding state to GPS location packets
X-Git-Tag: 1.4~91
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c5a7889a8da3da64deb0f118656784e0ee3fd511

Revert adding state to GPS location packets

TeleGPS no longer has ao_flight_state

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c
index dcda0dd7..9f778b09 100644
--- a/src/kernel/ao_telemetry.c
+++ b/src/kernel/ao_telemetry.c
@@ -340,9 +340,6 @@ ao_send_location(void)
 		ao_xmemcpy(&telemetry.location.flags,
 		       &ao_gps_data.flags,
 		       26);
-#if HAS_TRACKER
-		telemetry.location.state = ao_flight_state | AO_GPS_STATE_VALID;
-#endif
 		telemetry.location.tick = ao_gps_tick;
 		ao_mutex_put(&ao_gps_mutex);
 		ao_radio_send(&telemetry, sizeof (telemetry));
diff --git a/src/kernel/ao_telemetry.h b/src/kernel/ao_telemetry.h
index 050bbf72..be7d0340 100644
--- a/src/kernel/ao_telemetry.h
+++ b/src/kernel/ao_telemetry.h
@@ -93,8 +93,6 @@ struct ao_telemetry_configuration {
 #define AO_GPS_MODE_MANUAL		'M'
 #define AO_GPS_MODE_SIMULATED		'S'
 
-#define AO_GPS_STATE_VALID		0x80
-
 struct ao_telemetry_location {
 	uint16_t	serial;		/*  0 */
 	uint16_t	tick;		/*  2 */
@@ -117,7 +115,7 @@ struct ao_telemetry_location {
 	uint16_t	ground_speed;	/* 26 cm/s */
 	int16_t		climb_rate;	/* 28 cm/s */
 	uint8_t		course;		/* 30 degrees / 2 */
-	uint8_t		state;		/* 31 flight state */
+	uint8_t		unused;		/* 31 unused */
 	/* 32 */
 };