Browse Source

git-svn-id: https://arducopter.googlecode.com/svn/trunk@349 f9c3cf11-9bcb-44bc-f272-b75c42450872

mission-4.1.18
jasonshort 15 years ago
parent
commit
5f459b1220
  1. 4
      libraries/GPS_IMU/GPS_IMU.cpp
  2. 13
      libraries/GPS_IMU/GPS_IMU.h

4
libraries/GPS_IMU/GPS_IMU.cpp

@ -154,7 +154,7 @@ void GPS_IMU_Class::Read(void) @@ -154,7 +154,7 @@ void GPS_IMU_Class::Read(void)
}// End for...
}
// If we don't receive GPS packets in 2 seconds => Bad FIX state
if ((millis() - GPS_timer)>2000){
if ((millis() - GPS_timer) > 3000){
Fix = 0;
}
if (PrintErrors){
@ -276,4 +276,4 @@ void GPS_IMU_Class::checksum(byte IMU_data) @@ -276,4 +276,4 @@ void GPS_IMU_Class::checksum(byte IMU_data)
ck_b+=ck_a;
}
GPS_IMU_Class GPS;
GPS_IMU_Class GPS;

13
libraries/GPS_IMU/GPS_IMU.h

@ -23,7 +23,6 @@ class GPS_IMU_Class @@ -23,7 +23,6 @@ class GPS_IMU_Class
uint8_t ck_b;
uint8_t IMU_ck_a;
uint8_t IMU_ck_b;
uint8_t IMU_step;
uint8_t IMU_class;
uint8_t message_num;
@ -44,11 +43,12 @@ class GPS_IMU_Class @@ -44,11 +43,12 @@ class GPS_IMU_Class
GPS_IMU_Class();
void Init();
void Read();
// Properties
long roll_sensor; // how much we're turning in deg * 100
long pitch_sensor; // our angle of attack in deg * 100
int airspeed;
float imu_health;
long roll_sensor; // how much we're turning in deg * 100
long pitch_sensor; // our angle of attack in deg * 100
int airspeed;
float imu_health;
uint8_t imu_ok;
long Time; //GPS Millisecond Time of Week
@ -58,6 +58,7 @@ class GPS_IMU_Class @@ -58,6 +58,7 @@ class GPS_IMU_Class
long Ground_Speed;
long Ground_Course;
long Speed_3d;
uint8_t NumSats; // Number of visible satelites
uint8_t Fix; // 1:GPS FIX 0:No FIX (normal logic)
uint8_t NewData; // 1:New GPS Data
@ -65,5 +66,3 @@ class GPS_IMU_Class @@ -65,5 +66,3 @@ class GPS_IMU_Class
};
extern GPS_IMU_Class GPS;
#endif
Loading…
Cancel
Save