diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-05 10:59:05 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-05 10:59:05 +0400 |
| commit | b98157c6556743dd60ca8a6c8de9e5bfbcdf1b5a (patch) | |
| tree | c56b36946c6bc456619aadf83a1caff25ce511f3 /src/modules/sdlog2 | |
| parent | a6a4ab1dbeded057a72067a50999034ebbc788cd (diff) | |
| parent | 1ecd3e9291216a7b9847e1387521527a0b6d3bb2 (diff) | |
| download | px4-firmware-b98157c6556743dd60ca8a6c8de9e5bfbcdf1b5a.tar.gz px4-firmware-b98157c6556743dd60ca8a6c8de9e5bfbcdf1b5a.tar.bz2 px4-firmware-b98157c6556743dd60ca8a6c8de9e5bfbcdf1b5a.zip | |
Merge branch 'master' into mpc_local_pos
Diffstat (limited to 'src/modules/sdlog2')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 936f1c4d1..0141ad0f6 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -302,12 +302,19 @@ struct log_PARM_s { /* --- ESTM - ESTIMATOR STATUS --- */ #define LOG_ESTM_MSG 132 struct log_ESTM_s { - float s[32]; + float s[10]; uint8_t n_states; uint8_t states_nan; uint8_t covariance_nan; uint8_t kalman_gain_nan; }; +// struct log_ESTM_s { +// float s[32]; +// uint8_t n_states; +// uint8_t states_nan; +// uint8_t covariance_nan; +// uint8_t kalman_gain_nan; +// }; #pragma pack(pop) @@ -341,7 +348,8 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(TIME, "Q", "StartTime"), LOG_FORMAT(VER, "NZ", "Arch,FwGit"), LOG_FORMAT(PARM, "Nf", "Name,Value"), - LOG_FORMAT(ESTM, "ffffffffffffffffffffffffffffffffBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14,s15,s16,s17,s18,s19,s20,s21,s22,s23,s24,s25,s26,s27,s28,s29,s30,s31,n_states,states_nan,cov_nan,kgain_nan"), + LOG_FORMAT(ESTM, "ffffffffffBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,n_states,states_nan,cov_nan,kgain_nan"), + //LOG_FORMAT(ESTM, "ffffffffffffffffffffffffffffffffBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14,s15,s16,s17,s18,s19,s20,s21,s22,s23,s24,s25,s26,s27,s28,s29,s30,s31,n_states,states_nan,cov_nan,kgain_nan"), }; static const int log_formats_num = sizeof(log_formats) / sizeof(struct log_format_s); |