diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-26 07:43:19 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-26 07:43:19 +0100 |
| commit | cbcd1ea1d143dfddd2331fb14d17d7be48fa8b6f (patch) | |
| tree | 5be46ffd492dd3980ccfb3b7303238d22a22ff6c /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 739c407cfd14d065b104977924875b3ee40d5e25 (diff) | |
| parent | 4724c050478900a0b0b760877f1613e43c0aa97c (diff) | |
| download | px4-firmware-cbcd1ea1d143dfddd2331fb14d17d7be48fa8b6f.tar.gz px4-firmware-cbcd1ea1d143dfddd2331fb14d17d7be48fa8b6f.tar.bz2 px4-firmware-cbcd1ea1d143dfddd2331fb14d17d7be48fa8b6f.zip | |
Merged PX4Flow driver changes
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 5264ff1c8..30491036a 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -413,6 +413,16 @@ struct log_VISN_s { float qw; }; +/* --- ENCODERS - ENCODER DATA --- */ +#define LOG_ENCD_MSG 39 +struct log_ENCD_s { + int64_t cnt0; + float vel0; + int64_t cnt1; + float vel1; +}; + + /********** SYSTEM MESSAGES, ID > 0x80 **********/ /* --- TIME - TIME STAMP --- */ @@ -477,6 +487,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(GS1B, "BBBBBBBBBBBBBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14,s15"), LOG_FORMAT(TECS, "fffffffffffffB", "ASP,AF,FSP,F,FF,AsSP,AsF,AsDSP,AsD,TERSP,TER,EDRSP,EDR,M"), LOG_FORMAT(WIND, "ffff", "X,Y,CovX,CovY"), + LOG_FORMAT(ENCD, "qfqf", "cnt0,vel0,cnt1,vel1"), /* system-level messages, ID >= 0x80 */ /* FMT: don't write format of format message, it's useless */ |