From f6d633d73a8f826cf2a3128e3e234bd11af49718 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 10 Jun 2014 09:44:57 -0700 Subject: [PATCH] Revert "ao-tools: Parse TeleGPS state value from gps location packet" This reverts commit 428d09294ba0395fedd71346ad00fd90a4cdde97. --- ao-tools/ao-telem/ao-telem.c | 2 -- ao-tools/lib/cc-telemetry.h | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ao-tools/ao-telem/ao-telem.c b/ao-tools/ao-telem/ao-telem.c index 75f94ec1..da873838 100644 --- a/ao-tools/ao-telem/ao-telem.c +++ b/ao-tools/ao-telem/ao-telem.c @@ -145,8 +145,6 @@ main (int argc, char **argv) telem.location.ground_speed / 100.0, telem.location.climb_rate / 100.0, telem.location.course * 2); - if ((telem.location.state & AO_GPS_STATE_VALID)) - printf (" state %1d", telem.location.state & ~(AO_GPS_STATE_VALID)); printf ("\n"); break; case AO_TELEMETRY_SATELLITE: diff --git a/ao-tools/lib/cc-telemetry.h b/ao-tools/lib/cc-telemetry.h index 35cca13b..d64c4b30 100644 --- a/ao-tools/lib/cc-telemetry.h +++ b/ao-tools/lib/cc-telemetry.h @@ -90,8 +90,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 */ @@ -114,7 +112,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 */ + uint8_t unused[1]; /* 31 */ /* 32 */ }; -- 2.30.2