X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_gps_test_skytraq.c;h=11c54601b9cee77d5a784848afb3a7f44033114b;hb=refs%2Fheads%2Fmaster;hp=5eb7118d260bdf44e51488f55f23569c5f0d10d6;hpb=34d5be68ca23e8beb05db9a480faef63ecc911d0;p=fw%2Faltos diff --git a/src/test/ao_gps_test_skytraq.c b/src/test/ao_gps_test_skytraq.c index 5eb7118d..bd8998b7 100644 --- a/src/test/ao_gps_test_skytraq.c +++ b/src/test/ao_gps_test_skytraq.c @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,7 +17,9 @@ */ #define AO_GPS_TEST +#define AO_TICK_TYPE uint32_t #define HAS_GPS 1 +#define tick_count 0 #include "ao_host.h" #include #include @@ -48,6 +51,8 @@ struct ao_gps_orig { int16_t altitude; /* m */ uint16_t ground_speed; /* cm/s */ uint8_t course; /* degrees / 2 */ + uint8_t pdop; /* unused */ + uint8_t vdop; /* unused */ uint8_t hdop; /* * 5 */ int16_t climb_rate; /* cm/s */ uint16_t h_error; /* m */ @@ -82,8 +87,8 @@ struct ao_gps_tracking_orig { #define ao_telemetry_satellite ao_gps_tracking_orig #define ao_telemetry_satellite_info ao_gps_sat_orig -extern __xdata struct ao_telemetry_location ao_gps_data; -extern __xdata struct ao_telemetry_satellite ao_gps_tracking_data; +extern struct ao_telemetry_location ao_gps_data; +extern struct ao_telemetry_satellite ao_gps_tracking_data; uint8_t ao_gps_mutex;