diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-07-17 19:16:49 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-07-17 19:16:49 +0400 |
| commit | c6d184e29dbf906c1dfbebe0d7f353653db8cc7e (patch) | |
| tree | af7163073bd470529530f990d6a792e80bde47c7 /src/modules | |
| parent | b174a6051527dacc858c6ed54b5d113888c5d4de (diff) | |
| parent | 2afd462eed4a0b9a5eb01d2e84bc1c6f90d435c5 (diff) | |
| download | px4-firmware-c6d184e29dbf906c1dfbebe0d7f353653db8cc7e.tar.gz px4-firmware-c6d184e29dbf906c1dfbebe0d7f353653db8cc7e.tar.bz2 px4-firmware-c6d184e29dbf906c1dfbebe0d7f353653db8cc7e.zip | |
Merge branch 'master' into seatbelt_multirotor
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/commander/commander.c | 2 | ||||
| -rw-r--r-- | src/modules/systemlib/airspeed.c | 4 | ||||
| -rw-r--r-- | src/modules/uORB/topics/esc_status.h | 3 |
3 files changed, 5 insertions, 4 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); } } diff --git a/src/modules/uORB/topics/esc_status.h b/src/modules/uORB/topics/esc_status.h index e67a39e1e..00cf59b28 100644 --- a/src/modules/uORB/topics/esc_status.h +++ b/src/modules/uORB/topics/esc_status.h @@ -63,7 +63,8 @@ enum ESC_VENDOR { ESC_VENDOR_GENERIC = 0, /**< generic ESC */ - ESC_VENDOR_MIKROKOPTER /**< Mikrokopter */ + ESC_VENDOR_MIKROKOPTER, /**< Mikrokopter */ + ESC_VENDOR_GRAUPNER_HOTT /**< Graupner HoTT ESC */ }; enum ESC_CONNECTION_TYPE { |