Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-24 01:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: tidy handling of barometer calibrations

Browse Source
This commit is contained in:
Peter Barker 2018-03-18 15:22:12 +11:00 committed by Francisco Ferreira
parent c10f404b12
commit 65893cfca5
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ArduPlane/GCS_Mavlink.cpp
View File

@ -849,19 +849,22 @@ MAV_RESULT GCS_MAVLINK_Plane::handle_command_preflight_calibration(const mavlink
return ret; return ret;
} }
MAV_RESULT GCS_MAVLINK_Plane::_handle_command_preflight_calibration(const mavlink_command_long_t &packet) MAV_RESULT GCS_MAVLINK_Plane::_handle_command_preflight_calibration_baro()
{ {
if (is_equal(packet.param3,1.0f)) { /*
/* baro and airspeed calibration
baro and airspeed calibration */
*/ MAV_RESULT ret = GCS_MAVLINK::_handle_command_preflight_calibration_baro();
plane.init_barometer(false); if (ret == MAV_RESULT_ACCEPTED) {
if (plane.airspeed.enabled()) { if (plane.airspeed.enabled()) {
plane.zero_airspeed(false); plane.zero_airspeed(false);
} }
return MAV_RESULT_ACCEPTED;
} }
return ret;
}
MAV_RESULT GCS_MAVLINK_Plane::_handle_command_preflight_calibration(const mavlink_command_long_t &packet)
{
if (is_equal(packet.param4,1.0f)) { if (is_equal(packet.param4,1.0f)) {
/* /*
radio trim radio trim

1
ArduPlane/GCS_Mavlink.h
View File

@ -33,6 +33,7 @@ protected:
bool set_mode(uint8_t mode) override; bool set_mode(uint8_t mode) override;
MAV_RESULT _handle_command_preflight_calibration_baro() override;
MAV_RESULT handle_command_preflight_calibration(const mavlink_command_long_t &packet) override; MAV_RESULT handle_command_preflight_calibration(const mavlink_command_long_t &packet) override;
MAV_RESULT _handle_command_preflight_calibration(const mavlink_command_long_t &packet) override; MAV_RESULT _handle_command_preflight_calibration(const mavlink_command_long_t &packet) override;

1
ArduPlane/Plane.h
View File

@ -926,7 +926,6 @@ private:
void trim_control_surfaces(); void trim_control_surfaces();
void trim_radio(); void trim_radio();
bool rc_failsafe_active(void); bool rc_failsafe_active(void);
void init_barometer(bool full_calibration);
void init_rangefinder(void); void init_rangefinder(void);
void read_rangefinder(void); void read_rangefinder(void);
void read_airspeed(void); void read_airspeed(void);

11
ArduPlane/sensors.cpp
View File

@ -1,17 +1,6 @@
#include "Plane.h" #include "Plane.h"
#include <AP_RSSI/AP_RSSI.h> #include <AP_RSSI/AP_RSSI.h>
void Plane::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 Plane::init_rangefinder(void) void Plane::init_rangefinder(void)
{ {
rangefinder.init(); rangefinder.init();

2
ArduPlane/system.cpp
View File

@ -587,7 +587,7 @@ void Plane::startup_INS_ground(void)
// read Baro pressure at ground // read Baro pressure at ground
//----------------------------- //-----------------------------
init_barometer(true); barometer.calibrate();
if (airspeed.enabled()) { if (airspeed.enabled()) {
// initialize airspeed sensor // initialize airspeed sensor