diff options
Diffstat (limited to 'src')
-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 | ||||
-rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 6 |
3 files changed, 7 insertions, 7 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(); diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 17401218a..49483b15a 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -474,9 +474,9 @@ static const struct log_format_s log_formats[] = { /* business-level messages, ID < 0x80 */ LOG_FORMAT(ATT, "fffffffffffff", "qw,qx,qy,qz,Roll,Pitch,Yaw,RollRate,PitchRate,YawRate,GX,GY,GZ"), LOG_FORMAT(ATSP, "ffff", "RollSP,PitchSP,YawSP,ThrustSP"), - LOG_FORMAT_S(IMU, IMU, "ffffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ,tA,tG,tM"), - LOG_FORMAT_S(IMU1, IMU, "ffffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ,tA,tG,tM"), - LOG_FORMAT_S(IMU2, IMU, "ffffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ,tA,tG,tM"), + LOG_FORMAT_S(IMU, IMU, "ffffffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ,tA,tG,tM"), + LOG_FORMAT_S(IMU1, IMU, "ffffffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ,tA,tG,tM"), + LOG_FORMAT_S(IMU2, IMU, "ffffffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ,tA,tG,tM"), LOG_FORMAT_S(SENS, SENS, "fffff", "BaroPres,BaroAlt,BaroTemp,DiffPres,DiffPresFilt"), LOG_FORMAT_S(AIR1, SENS, "fffff", "BaroPa,BaroAlt,BaroTmp,DiffPres,DiffPresF"), LOG_FORMAT(LPOS, "ffffffffLLfBBff", "X,Y,Z,Dist,DistR,VX,VY,VZ,RLat,RLon,RAlt,PFlg,GFlg,EPH,EPV"), |