diff --git a/libraries/AP_GPS/AP_GPS_IMU.h b/libraries/AP_GPS/AP_GPS_IMU.h index a50bce01bf..73c755812a 100644 --- a/libraries/AP_GPS/AP_GPS_IMU.h +++ b/libraries/AP_GPS/AP_GPS_IMU.h @@ -1,48 +1,48 @@ - -// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*- -#ifndef AP_GPS_IMU_h -#define AP_GPS_IMU_h - -#include "GPS.h" -#define MAXPAYLOAD 32 - -class AP_GPS_IMU : public GPS { -public: - - // Methods - AP_GPS_IMU(Stream *s); - virtual void init(enum GPS_Engine_Setting nav_setting); - virtual bool read(void); - - // Properties - int32_t roll_sensor; // how much we're turning in deg * 100 - int32_t pitch_sensor; // our angle of attack in deg * 100 - int16_t airspeed; - float imu_health; - uint8_t imu_ok; - - // Unused - virtual void setHIL(uint32_t time, float latitude, float longitude, float altitude, - float ground_speed, float ground_course, float speed_3d, uint8_t num_sats); - -private: - // Packet checksums - uint8_t ck_a; - uint8_t ck_b; - uint8_t GPS_ck_a; - uint8_t GPS_ck_b; - - uint8_t step; - uint8_t msg_class; - uint8_t message_num; - uint8_t payload_length; - uint8_t payload_counter; - uint8_t buffer[MAXPAYLOAD]; - - void join_data(); - void join_data_xplane(); - void GPS_join_data(); - void checksum(unsigned char data); -}; - -#endif + +// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*- +#ifndef AP_GPS_IMU_h +#define AP_GPS_IMU_h + +#include "GPS.h" +#define MAXPAYLOAD 32 + +class AP_GPS_IMU : public GPS { +public: + + // Methods + AP_GPS_IMU(Stream *s); + virtual void init(enum GPS_Engine_Setting nav_setting); + virtual bool read(void); + + // Properties + int32_t roll_sensor; // how much we're turning in deg * 100 + int32_t pitch_sensor; // our angle of attack in deg * 100 + int16_t airspeed; + float imu_health; + uint8_t imu_ok; + + // Unused + virtual void setHIL(uint32_t time, float latitude, float longitude, float altitude, + float ground_speed, float ground_course, float speed_3d, uint8_t num_sats); + +private: + // Packet checksums + uint8_t ck_a; + uint8_t ck_b; + uint8_t GPS_ck_a; + uint8_t GPS_ck_b; + + uint8_t step; + uint8_t msg_class; + uint8_t message_num; + uint8_t payload_length; + uint8_t payload_counter; + uint8_t buffer[MAXPAYLOAD]; + + void join_data(); + void join_data_xplane(); + void GPS_join_data(); + void checksum(unsigned char data); +}; + +#endif