Browse Source

Rover: removed unused variables

thanks to Mike McCauley
mission-4.1.18
Andrew Tridgell 11 years ago
parent
commit
11028c665d
  1. 8
      APMrover2/APMrover2.pde
  2. 1
      APMrover2/system.pde

8
APMrover2/APMrover2.pde

@ -402,10 +402,6 @@ static const float t7 = 10000000.0; @@ -402,10 +402,6 @@ static const float t7 = 10000000.0;
// A counter used to count down valid gps fixes to allow the gps estimate to settle
// before recording our home position (and executing a ground start if we booted with an air start)
static uint8_t ground_start_count = 5;
// Used to compute a speed estimate from the first valid gps fixes to decide if we are
// on the ground or in the air. Used to decide if a ground start is appropriate if we
// booted with an air start.
static int16_t ground_start_avg;
////////////////////////////////////////////////////////////////////////////////
// Location & Navigation
@ -538,8 +534,6 @@ static float G_Dt = 0.02; @@ -538,8 +534,6 @@ static float G_Dt = 0.02;
static int32_t perf_mon_timer;
// The maximum main loop execution time recorded in the current performance monitoring interval
static uint32_t G_Dt_max;
// The number of gps fixes recorded in the current performance monitoring interval
static uint8_t gps_fix_count = 0;
////////////////////////////////////////////////////////////////////////////////
// System Timers
@ -840,11 +834,9 @@ static void update_GPS_10Hz(void) @@ -840,11 +834,9 @@ static void update_GPS_10Hz(void)
have_position = ahrs.get_position(current_loc);
if (g_gps->new_data && g_gps->status() >= GPS::GPS_OK_FIX_3D) {
gps_fix_count++;
if(ground_start_count > 1){
ground_start_count--;
ground_start_avg += g_gps->ground_speed_cm;
} else if (ground_start_count == 1) {
// We countdown N number of good GPS fixes

1
APMrover2/system.pde

@ -403,7 +403,6 @@ static void update_notify() @@ -403,7 +403,6 @@ static void update_notify()
static void resetPerfData(void) {
mainLoop_count = 0;
G_Dt_max = 0;
gps_fix_count = 0;
perf_mon_timer = millis();
}

Loading…
Cancel
Save