diff options
| author | Simon Wilks <sjwilks@gmail.com> | 2013-07-16 08:14:23 +0200 |
|---|---|---|
| committer | Simon Wilks <sjwilks@gmail.com> | 2013-07-16 08:14:23 +0200 |
| commit | 1a408431e12e6c1c4fe629939bb0d6ebf09985e8 (patch) | |
| tree | 3ea3e29b20f2520e82ef7b2eb0c30b4238e8c1aa | |
| parent | 7380cebb6752b954a43801d5508a7babcadad558 (diff) | |
| parent | 1d883ad4c6e5b45cf8133c0d954d6a1155969890 (diff) | |
| download | px4-firmware-1a408431e12e6c1c4fe629939bb0d6ebf09985e8.tar.gz px4-firmware-1a408431e12e6c1c4fe629939bb0d6ebf09985e8.tar.bz2 px4-firmware-1a408431e12e6c1c4fe629939bb0d6ebf09985e8.zip | |
Merge remote-tracking branch 'upstream/master' into hott-esc
| -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); } } |