diff options
| author | Julian Oes <joes@student.ethz.ch> | 2013-03-11 11:01:49 -0700 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2013-03-11 11:01:49 -0700 |
| commit | 591cc0ac4d17f7ade66fb7b9b248e403a8172d56 (patch) | |
| tree | 7382ef04263fb4df6c7603c4db9f6c290b24323b /apps/systemlib/conversions.c | |
| parent | 0fe5aeb02c6ab0ac9c50f54d028cd5dde908e051 (diff) | |
| parent | 1d444f80a3b9b575681e41b7a3a9b26a4b3d606d (diff) | |
| download | px4-firmware-591cc0ac4d17f7ade66fb7b9b248e403a8172d56.tar.gz px4-firmware-591cc0ac4d17f7ade66fb7b9b248e403a8172d56.tar.bz2 px4-firmware-591cc0ac4d17f7ade66fb7b9b248e403a8172d56.zip | |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
apps/commander/commander.c
apps/uORB/topics/vehicle_status.h
Diffstat (limited to 'apps/systemlib/conversions.c')
| -rw-r--r-- | apps/systemlib/conversions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/systemlib/conversions.c b/apps/systemlib/conversions.c index 2b8003e45..ac94252c5 100644 --- a/apps/systemlib/conversions.c +++ b/apps/systemlib/conversions.c @@ -150,5 +150,5 @@ void quat2rot(const float Q[4], float R[9]) float get_air_density(float static_pressure, float temperature_celsius) { - return static_pressure / (CONSTANTS_AIR_GAS_CONST * (temperature_celsius + CONSTANTS_ABSOLUTE_NULL_KELVIN)); + return static_pressure / (CONSTANTS_AIR_GAS_CONST * (temperature_celsius - CONSTANTS_ABSOLUTE_NULL_CELSIUS)); } |