diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-16 08:57:40 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-16 08:57:40 +0200 |
commit | 41b51bdb88e5720d6aab7cfbfca9fbba327944cb (patch) | |
tree | c4cbdadfc96818718099205d259ca694d7280f91 /src/modules | |
parent | 61ad4ed5fd2102514094c7d031f0748c1c4c38a4 (diff) | |
parent | 2afd462eed4a0b9a5eb01d2e84bc1c6f90d435c5 (diff) | |
download | px4-firmware-41b51bdb88e5720d6aab7cfbfca9fbba327944cb.tar.gz px4-firmware-41b51bdb88e5720d6aab7cfbfca9fbba327944cb.tar.bz2 px4-firmware-41b51bdb88e5720d6aab7cfbfca9fbba327944cb.zip |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/commander/commander.c | 2 | ||||
-rw-r--r-- | src/modules/systemlib/airspeed.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/commander/commander.c b/src/modules/commander/commander.c index 928d9b85e..8e5e36712 100644 --- a/src/modules/commander/commander.c +++ b/src/modules/commander/commander.c @@ -282,7 +282,7 @@ void tune_error(void) void do_rc_calibration(int status_pub, struct vehicle_status_s *status) { - if (current_status.offboard_control_signal_lost) { + if (current_status.rc_signal_lost) { mavlink_log_critical(mavlink_fd, "TRIM CAL: ABORT. No RC signal."); return; } diff --git a/src/modules/systemlib/airspeed.c b/src/modules/systemlib/airspeed.c index 15bb833a9..e01cc4dda 100644 --- a/src/modules/systemlib/airspeed.c +++ b/src/modules/systemlib/airspeed.c @@ -62,7 +62,7 @@ float calc_indicated_airspeed(float differential_pressure) if (differential_pressure > 0) { return sqrtf((2.0f*differential_pressure) / CONSTANTS_AIR_DENSITY_SEA_LEVEL_15C); } else { - return -sqrtf((2.0f*fabs(differential_pressure)) / CONSTANTS_AIR_DENSITY_SEA_LEVEL_15C); + return -sqrtf((2.0f*fabsf(differential_pressure)) / CONSTANTS_AIR_DENSITY_SEA_LEVEL_15C); } } @@ -106,6 +106,6 @@ float calc_true_airspeed(float total_pressure, float static_pressure, float temp return sqrtf((2.0f*(pressure_difference)) / density); } else { - return -sqrtf((2.0f*fabs(pressure_difference)) / density); + return -sqrtf((2.0f*fabsf(pressure_difference)) / density); } } |