diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-20 12:52:16 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-20 12:52:16 +0200 |
| commit | a183f3e2733a70408355d71f592927d5e31abc74 (patch) | |
| tree | d311f45558939bf403bd60d272de30b13d8b8fd7 /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 9b6c9358ed072459ac61feed271a209c8c5dea23 (diff) | |
| parent | bf0de775329acfc8c450b2958222a83f2a32f977 (diff) | |
| download | px4-firmware-a183f3e2733a70408355d71f592927d5e31abc74.tar.gz px4-firmware-a183f3e2733a70408355d71f592927d5e31abc74.tar.bz2 px4-firmware-a183f3e2733a70408355d71f592927d5e31abc74.zip | |
Merge remote-tracking branch 'drton/pid_fixes_drton_debug' into new_state_machine
Conflicts:
src/modules/multirotor_att_control/multirotor_att_control_main.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/multirotor_att_control/multirotor_rate_control.h
src/modules/sdlog2/sdlog2.c
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index b6537b2cd..04eae40b0 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -63,6 +63,9 @@ struct log_ATT_s { float roll_rate; float pitch_rate; float yaw_rate; + float roll_acc; + float pitch_acc; + float yaw_acc; }; /* --- ATSP - ATTITUDE SET POINT --- */ @@ -209,7 +212,7 @@ struct log_ARSP_s { static const struct log_format_s log_formats[] = { LOG_FORMAT(TIME, "Q", "StartTime"), - LOG_FORMAT(ATT, "ffffff", "Roll,Pitch,Yaw,RollRate,PitchRate,YawRate"), + LOG_FORMAT(ATT, "fffffffff", "Roll,Pitch,Yaw,RollR,PitchR,YawR,RollA,PitchA,YawA"), LOG_FORMAT(ATSP, "ffff", "RollSP,PitchSP,YawSP,ThrustSP"), LOG_FORMAT(IMU, "fffffffff", "AccX,AccY,AccZ,GyroX,GyroY,GyroZ,MagX,MagY,MagZ"), LOG_FORMAT(SENS, "ffff", "BaroPres,BaroAlt,BaroTemp,DiffPres"), |