diff options
| author | Lorenz Meier <lorenz@px4.io> | 2015-03-27 10:34:53 -0700 |
|---|---|---|
| committer | Lorenz Meier <lorenz@px4.io> | 2015-03-27 10:34:53 -0700 |
| commit | 285c1f916b44859e78f291869e88840415d5ba81 (patch) | |
| tree | fa2fd997fc41eb160666b492ad6f8c3a12416897 | |
| parent | e2499bbb238036856ee25fc72f9d8294090b4619 (diff) | |
| parent | b361f7c81b07ebe3e75358b254eee492a1ef49da (diff) | |
| download | px4-firmware-285c1f916b44859e78f291869e88840415d5ba81.tar.gz px4-firmware-285c1f916b44859e78f291869e88840415d5ba81.tar.bz2 px4-firmware-285c1f916b44859e78f291869e88840415d5ba81.zip | |
Merge pull request #1955 from UAVenture/fix_thrust_sp_logging
Write trust setpoint to correct field for logging
| -rw-r--r-- | src/modules/mc_pos_control/mc_pos_control_main.cpp | 4 | ||||
| -rw-r--r-- | src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp | 4 |
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(); |