Revert adding state to GPS location packets
authorKeith Packard <keithp@keithp.com>
Tue, 10 Jun 2014 16:47:04 +0000 (09:47 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 10 Jun 2014 16:47:04 +0000 (09:47 -0700)
TeleGPS no longer has ao_flight_state

Signed-off-by: Keith Packard <keithp@keithp.com>
src/kernel/ao_telemetry.c
src/kernel/ao_telemetry.h

index dcda0dd7fdb451e3f797fa2f2213f4465c931111..9f778b0905b8448e51d58a321ea21cc186d67a4d 100644 (file)
@@ -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));
index 050bbf726a09c7d338ae2e31306336c26b760204..be7d0340745352d20505dc265a00e1f8390cf8da 100644 (file)
@@ -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 */
 };