aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Antener <antener_a@gmx.ch>2015-03-25 11:58:01 +0100
committerAndreas Antener <antener_a@gmx.ch>2015-03-25 11:58:01 +0100
commitb361f7c81b07ebe3e75358b254eee492a1ef49da (patch)
tree8fd0f84a05b27f88dca0da29399cb66ea8c1fc77
parent7554eb515a9b87658e860de3ceee552beff610ee (diff)
downloadpx4-firmware-b361f7c81b07ebe3e75358b254eee492a1ef49da.tar.gz
px4-firmware-b361f7c81b07ebe3e75358b254eee492a1ef49da.tar.bz2
px4-firmware-b361f7c81b07ebe3e75358b254eee492a1ef49da.zip
write trust setpoint to correct field for logging
-rw-r--r--src/modules/mc_pos_control/mc_pos_control_main.cpp4
-rw-r--r--src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mc_pos_control/mc_pos_control_main.cpp b/src/modules/mc_pos_control/mc_pos_control_main.cpp
index 58d20ebef..4910454bd 100644
--- a/src/modules/mc_pos_control/mc_pos_control_main.cpp
+++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp
@@ -1308,8 +1308,8 @@ MulticopterPositionControl::task_main()
/* save thrust setpoint for logging */
_local_pos_sp.acc_x = thrust_sp(0);
- _local_pos_sp.acc_x = thrust_sp(1);
- _local_pos_sp.acc_x = thrust_sp(2);
+ _local_pos_sp.acc_y = thrust_sp(1);
+ _local_pos_sp.acc_z = thrust_sp(2);
_att_sp.timestamp = hrt_absolute_time();
diff --git a/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp b/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp
index 40268358a..d135eecfb 100644
--- a/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp
+++ b/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp
@@ -922,8 +922,8 @@ void MulticopterPositionControl::handle_vehicle_attitude(const px4_vehicle_atti
/* save thrust setpoint for logging */
_local_pos_sp_msg.data().acc_x = thrust_sp(0);
- _local_pos_sp_msg.data().acc_x = thrust_sp(1);
- _local_pos_sp_msg.data().acc_x = thrust_sp(2);
+ _local_pos_sp_msg.data().acc_y = thrust_sp(1);
+ _local_pos_sp_msg.data().acc_z = thrust_sp(2);
_att_sp_msg.data().timestamp = get_time_micros();