Browse Source

Rover: tidy handling of barometer calibrations

master
Peter Barker 7 years ago committed by Francisco Ferreira
parent
commit
c10f404b12
  1. 1
      APMrover2/Rover.h
  2. 11
      APMrover2/sensors.cpp
  3. 2
      APMrover2/system.cpp

1
APMrover2/Rover.h

@ -522,7 +522,6 @@ private: @@ -522,7 +522,6 @@ private:
// sensors.cpp
void init_compass(void);
void compass_accumulate(void);
void init_barometer(bool full_calibration);
void init_rangefinder(void);
void init_beacon();
void init_visual_odom();

11
APMrover2/sensors.cpp

@ -39,17 +39,6 @@ void Rover::compass_accumulate(void) @@ -39,17 +39,6 @@ void Rover::compass_accumulate(void)
}
}
void Rover::init_barometer(bool full_calibration)
{
gcs().send_text(MAV_SEVERITY_INFO, "Calibrating barometer");
if (full_calibration) {
barometer.calibrate();
} else {
barometer.update_calibration();
}
gcs().send_text(MAV_SEVERITY_INFO, "Barometer calibration complete");
}
void Rover::init_rangefinder(void)
{
rangefinder.init();

2
APMrover2/system.cpp

@ -103,7 +103,7 @@ void Rover::init_ardupilot() @@ -103,7 +103,7 @@ void Rover::init_ardupilot()
init_visual_odom();
// and baro for EKF
init_barometer(true);
barometer.calibrate();
// Do GPS init
gps.set_log_gps_bit(MASK_LOG_GPS);

Loading…
Cancel
Save