diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-20 20:10:39 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-20 20:10:39 +0200 |
| commit | 8634780e80f728ccbd4bc63860aeaa11727aeedb (patch) | |
| tree | 3c29da11c2e9bb2b931821f73cd581281790f47b /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 88149311ea687b62ba28e036e7de09ed2763f2bc (diff) | |
| parent | 0b85c41cd19486e829d48cf9e604fbc25b9e52a6 (diff) | |
| download | px4-firmware-8634780e80f728ccbd4bc63860aeaa11727aeedb.tar.gz px4-firmware-8634780e80f728ccbd4bc63860aeaa11727aeedb.tar.bz2 px4-firmware-8634780e80f728ccbd4bc63860aeaa11727aeedb.zip | |
Merge branch 'master' into mpc_rc
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index f8de7a535..a37437346 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -302,6 +302,17 @@ struct log_PWR_s { uint8_t high_power_rail_overcurrent; }; +/* --- VICN - VICON POSITION --- */ +#define LOG_VICN_MSG 25 +struct log_VICN_s { + float x; + float y; + float z; + float roll; + float pitch; + float yaw; +}; + /********** SYSTEM MESSAGES, ID > 0x80 **********/ /* --- TIME - TIME STAMP --- */ @@ -352,6 +363,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(TELE, "BBBBHHB", "RSSI,RemRSSI,Noise,RemNoise,RXErr,Fixed,TXBuf"), LOG_FORMAT(ESTM, "ffffffffffBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,n_states,states_nan,cov_nan,kgain_nan"), LOG_FORMAT(PWR, "fffBBBBB", "Periph_5V,Servo_5V,RSSI,USB_OK,BRICK_OK,SRV_OK,PERIPH_OC,HIPWR_OC"), + LOG_FORMAT(VICN, "ffffff", "X,Y,Z,Roll,Pitch,Yaw"), /* system-level messages, ID >= 0x80 */ /* FMT: don't write format of format message, it's useless */ |