diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:45:43 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:45:43 +0200 |
| commit | 20728e83f5acc52c5b96d6bdb93767375562dbe2 (patch) | |
| tree | 03ec8ac1215ecbfcee8dbffacd351fcb781d96c8 /src/modules/mavlink | |
| parent | 53b3498db440f8ecf8779ce7f3df55351c84852f (diff) | |
| parent | 2d4fc9eea1d693bafeeacc1e929d1906418ee3b0 (diff) | |
| download | px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.tar.gz px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.tar.bz2 px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fw_autoland
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 8243748dc..c51a6de08 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -422,13 +422,13 @@ handle_message(mavlink_message_t *msg) hil_sensors.accelerometer_counter = hil_counter; /* differential pressure */ - hil_sensors.differential_pressure_pa = imu.diff_pressure; + hil_sensors.differential_pressure_pa = imu.diff_pressure * 1e2f; //from hPa to Pa hil_sensors.differential_pressure_counter = hil_counter; /* airspeed from differential pressure, ambient pressure and temp */ struct airspeed_s airspeed; - float ias = calc_indicated_airspeed(imu.diff_pressure); + float ias = calc_indicated_airspeed(hil_sensors.differential_pressure_pa); // XXX need to fix this float tas = ias; |