Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-09 01:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: send airspeed temp in scaled_pressure

Browse Source
This commit is contained in:
Iampete1 2020-07-18 22:34:22 +01:00 committed by Andrew Tridgell
parent 2aff8787c1
commit 73594cb19b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -1743,8 +1743,8 @@ void GCS_MAVLINK::send_scaled_pressure_instance(uint8_t instance, void (*send_fn
bool have_data = false; bool have_data = false;
float press_abs = 0.0f; float press_abs = 0.0f;
float temperature = 0.0f; // Absolute pressure temperature int16_t temperature = 0; // Absolute pressure temperature
float temperature_press_diff = 0.0f; // TODO: Differential pressure temperature int16_t temperature_press_diff = 0; // Differential pressure temperature
if (instance < barometer.num_instances()) { if (instance < barometer.num_instances()) {
press_abs = barometer.get_pressure(instance) * 0.01f; press_abs = barometer.get_pressure(instance) * 0.01f;
temperature = barometer.get_temperature(instance)*100; temperature = barometer.get_temperature(instance)*100;
@ -1756,6 +1756,14 @@ void GCS_MAVLINK::send_scaled_pressure_instance(uint8_t instance, void (*send_fn
if (airspeed != nullptr && if (airspeed != nullptr &&
airspeed->enabled(instance)) { airspeed->enabled(instance)) {
press_diff = airspeed->get_differential_pressure(instance) * 0.01f; press_diff = airspeed->get_differential_pressure(instance) * 0.01f;
float temp;
if (airspeed->get_temperature(instance,temp)) {
temperature_press_diff = temp * 100;
if (temperature_press_diff == 0) {
// don't send zero as that is the value for 'no data'
temperature_press_diff = 1;
}
}
have_data = true; have_data = true;
} }