aboutsummaryrefslogtreecommitdiff
path: root/src/modules/sdlog2/sdlog2_messages.h
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-04-18 11:30:04 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-04-18 11:30:04 +0200
commitcc5fddd34e0db7b3e0402d4fdd8c400f9a1d39bc (patch)
treeec2cb331504c2f5b0da044af6d324faa78485760 /src/modules/sdlog2/sdlog2_messages.h
parent45cef9eed4a9f1c6761f41a187672cc4ba82cd39 (diff)
parentc77c5c878b05928d0817123e935af4941f653759 (diff)
downloadpx4-firmware-cc5fddd34e0db7b3e0402d4fdd8c400f9a1d39bc.tar.gz
px4-firmware-cc5fddd34e0db7b3e0402d4fdd8c400f9a1d39bc.tar.bz2
px4-firmware-cc5fddd34e0db7b3e0402d4fdd8c400f9a1d39bc.zip
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
-rw-r--r--src/modules/sdlog2/sdlog2_messages.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h
index a1a5856bc..d0585df39 100644
--- a/src/modules/sdlog2/sdlog2_messages.h
+++ b/src/modules/sdlog2/sdlog2_messages.h
@@ -301,6 +301,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 --- */
@@ -351,6 +362,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 */