1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00

removed tabs after spaces.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2839 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2011-02-22 10:55:01 +00:00 committed by pip
parent 414836a4c9
commit a2259201e5
3 changed files with 32 additions and 32 deletions

View File

@ -81,7 +81,7 @@ static void setHomeLocation(GPSPositionData * gpsData);
// **************** // ****************
// Private variables // Private variables
static uint32_t gpsPort; static uint32_t gpsPort;
static xTaskHandle gpsTaskHandle; static xTaskHandle gpsTaskHandle;
@ -123,17 +123,17 @@ int32_t GPSInitialize(void)
static void gpsTask(void *parameters) static void gpsTask(void *parameters)
{ {
portTickType xDelay = 100 / portTICK_RATE_MS; portTickType xDelay = 100 / portTICK_RATE_MS;
uint32_t timeNowMs = xTaskGetTickCount() * portTICK_RATE_MS;; uint32_t timeNowMs = xTaskGetTickCount() * portTICK_RATE_MS;;
GPSPositionData GpsData; GPSPositionData GpsData;
#ifdef ENABLE_GPS_BINARY_GTOP #ifdef ENABLE_GPS_BINARY_GTOP
GTOP_BIN_init(); GTOP_BIN_init();
#else #else
uint8_t rx_count = 0; uint8_t rx_count = 0;
bool start_flag = false; bool start_flag = false;
bool found_cr = false; bool found_cr = false;
int32_t gpsRxOverflow = 0; int32_t gpsRxOverflow = 0;
#endif #endif
#ifdef FULL_COLD_RESTART #ifdef FULL_COLD_RESTART

View File

@ -44,42 +44,42 @@
typedef struct typedef struct
{ {
uint32_t utc_time; uint32_t utc_time;
int32_t latitude; int32_t latitude;
uint8_t ns_indicator; uint8_t ns_indicator;
int32_t longitude; int32_t longitude;
uint8_t ew_indicator; uint8_t ew_indicator;
uint8_t fix_quality; uint8_t fix_quality;
uint8_t satellites_used; uint8_t satellites_used;
uint16_t hdop; uint16_t hdop;
int32_t msl_altitude; int32_t msl_altitude;
int32_t geoidal_seperation; int32_t geoidal_seperation;
uint8_t fix_type; uint8_t fix_type;
int32_t course_over_ground; int32_t course_over_ground;
int32_t speed_over_ground; int32_t speed_over_ground;
uint8_t day; uint8_t day;
uint8_t month; uint8_t month;
uint16_t year; uint16_t year;
} __attribute__((__packed__)) t_gps_bin_packet_data; } __attribute__((__packed__)) t_gps_bin_packet_data;
typedef struct typedef struct
{ {
uint16_t header; uint16_t header;
t_gps_bin_packet_data data; t_gps_bin_packet_data data;
uint8_t asterisk; uint8_t asterisk;
uint8_t checksum; uint8_t checksum;
uint16_t end_word; uint16_t end_word;
} __attribute__((__packed__)) t_gps_bin_packet; } __attribute__((__packed__)) t_gps_bin_packet;
// ************ // ************

View File

@ -39,9 +39,9 @@
// //
// note: the NMEA includes the one-sentance code as OP has the memory for it // note: the NMEA includes the one-sentance code as OP has the memory for it
//#define ENABLE_GPS_BINARY_GTOP // uncomment this if we are using GTOP BINARY mode //#define ENABLE_GPS_BINARY_GTOP // uncomment this if we are using GTOP BINARY mode
//#define ENABLE_GPS_ONESENTENCE_GTOP // uncomment this if we are using single sentance mode //#define ENABLE_GPS_ONESENTENCE_GTOP // uncomment this if we are using single sentance mode
#define ENABLE_GPS_NMEA // uncomment this if we are using NMEA mode #define ENABLE_GPS_NMEA // uncomment this if we are using NMEA mode
// **************** // ****************
// make sure they have defined a protocol to use // make sure they have defined a protocol to use