diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-06 14:47:31 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-06 14:47:31 +0400 |
| commit | aa9ce7cd24791e3e0fe9d1066a29a080cf85c2e8 (patch) | |
| tree | d1ac779706ee46bd589827921561bbea646d4e25 /src/modules/sensors/sensors.cpp | |
| parent | b00b70aeb2b7f20e74ca185e357e796f54031640 (diff) | |
| parent | be6c0d2ece235077f067f4db10689b8ad3d9c5b1 (diff) | |
| download | px4-firmware-aa9ce7cd24791e3e0fe9d1066a29a080cf85c2e8.tar.gz px4-firmware-aa9ce7cd24791e3e0fe9d1066a29a080cf85c2e8.tar.bz2 px4-firmware-aa9ce7cd24791e3e0fe9d1066a29a080cf85c2e8.zip | |
Merge branch 'master' into rc_timeout
Diffstat (limited to 'src/modules/sensors/sensors.cpp')
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 5b826a919..f20c328d3 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1013,12 +1013,13 @@ Sensors::diff_pres_poll(struct sensor_combined_s &raw) raw.differential_pressure_timestamp = _diff_pres.timestamp; raw.differential_pressure_filtered_pa = _diff_pres.differential_pressure_filtered_pa; - float air_temperature_celcius = (_diff_pres.temperature > -300.0f) ? _diff_pres.temperature : (raw.baro_temp_celcius - PCB_TEMP_ESTIMATE_DEG); + float air_temperature_celsius = (_diff_pres.temperature > -300.0f) ? _diff_pres.temperature : (raw.baro_temp_celcius - PCB_TEMP_ESTIMATE_DEG); _airspeed.timestamp = _diff_pres.timestamp; _airspeed.indicated_airspeed_m_s = calc_indicated_airspeed(_diff_pres.differential_pressure_filtered_pa); _airspeed.true_airspeed_m_s = calc_true_airspeed(_diff_pres.differential_pressure_filtered_pa + raw.baro_pres_mbar * 1e2f, - raw.baro_pres_mbar * 1e2f, air_temperature_celcius); + raw.baro_pres_mbar * 1e2f, air_temperature_celsius); + _airspeed.air_temperature_celsius = air_temperature_celsius; /* announce the airspeed if needed, just publish else */ if (_airspeed_pub > 0) { |