aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-03-15 22:14:52 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-03-15 22:14:52 +0100
commit494bcddaa4b968e30c763925e6a3cdc95c50d95e (patch)
tree551e6618b37025c8accec748a0fa41699ef889de /apps
parent688ec090e811ffa5df0a704767f5eb70c635913e (diff)
parent6b947a67d07eadc7dc882edf4505377085979784 (diff)
downloadpx4-firmware-494bcddaa4b968e30c763925e6a3cdc95c50d95e.tar.gz
px4-firmware-494bcddaa4b968e30c763925e6a3cdc95c50d95e.tar.bz2
px4-firmware-494bcddaa4b968e30c763925e6a3cdc95c50d95e.zip
Merge branch 'master' of github.com:PX4/Firmware into trim_calibration
Diffstat (limited to 'apps')
-rw-r--r--apps/mavlink/orb_listener.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/mavlink/orb_listener.c b/apps/mavlink/orb_listener.c
index 58c709aec..7c34fb474 100644
--- a/apps/mavlink/orb_listener.c
+++ b/apps/mavlink/orb_listener.c
@@ -513,14 +513,14 @@ l_actuator_outputs(struct listener *l)
} else {
mavlink_msg_hil_controls_send(chan,
hrt_absolute_time(),
- (act_outputs.output[0] - 1500.0f) / 600.0f,
- (act_outputs.output[1] - 1500.0f) / 600.0f,
- (act_outputs.output[2] - 1500.0f) / 600.0f,
- (act_outputs.output[3] - 900.0f) / 1200.0f,
- (act_outputs.output[4] - 1500.0f) / 600.0f,
- (act_outputs.output[5] - 1500.0f) / 600.0f,
- (act_outputs.output[6] - 1500.0f) / 600.0f,
- (act_outputs.output[7] - 1500.0f) / 600.0f,
+ (act_outputs.output[0] - 1500.0f) / 500.0f,
+ (act_outputs.output[1] - 1500.0f) / 500.0f,
+ (act_outputs.output[2] - 1500.0f) / 500.0f,
+ (act_outputs.output[3] - 1000.0f) / 1000.0f,
+ (act_outputs.output[4] - 1500.0f) / 500.0f,
+ (act_outputs.output[5] - 1500.0f) / 500.0f,
+ (act_outputs.output[6] - 1500.0f) / 500.0f,
+ (act_outputs.output[7] - 1500.0f) / 500.0f,
mavlink_mode,
0);
}