aboutsummaryrefslogtreecommitdiff
path: root/src/modules/sdlog2/sdlog2_messages.h
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2013-06-08 18:15:55 +0400
committerAnton Babushkin <anton.babushkin@me.com>2013-06-08 18:15:55 +0400
commit079cb2cd652ec3dd2be011e30bbe459437e80d44 (patch)
tree41b47e889d10c513293aef4a28cfa85640277035 /src/modules/sdlog2/sdlog2_messages.h
parent7b98f0a56749809ce0150bad6983ac9956250abd (diff)
downloadpx4-firmware-079cb2cd652ec3dd2be011e30bbe459437e80d44.tar.gz
px4-firmware-079cb2cd652ec3dd2be011e30bbe459437e80d44.tar.bz2
px4-firmware-079cb2cd652ec3dd2be011e30bbe459437e80d44.zip
sdlog2: RC (RC controls) and OUT0 (actuator 0 output) messages added, print statistics to mavlink console
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
-rw-r--r--src/modules/sdlog2/sdlog2_messages.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h
index 2b6b86521..40763ee1e 100644
--- a/src/modules/sdlog2/sdlog2_messages.h
+++ b/src/modules/sdlog2/sdlog2_messages.h
@@ -133,7 +133,7 @@ struct log_GPS_s {
float cog;
};
-/* --- ATTC - ATTITUDE CONTROLS --- */
+/* --- ATTC - ATTITUDE CONTROLS (ACTUATOR_0 CONTROLS)--- */
#define LOG_ATTC_MSG 9
struct log_ATTC_s {
float roll;
@@ -155,6 +155,18 @@ struct log_STAT_s {
float battery_remaining;
unsigned char battery_warning;
};
+
+/* --- RC - RC INPUT CHANNELS --- */
+#define LOG_RC_MSG 11
+struct log_RC_s {
+ float channel[8];
+};
+
+/* --- OUT0 - ACTUATOR_0 OUTPUT --- */
+#define LOG_OUT0_MSG 12
+struct log_OUT0_s {
+ float output[8];
+};
#pragma pack(pop)
/* construct list of all message formats */
@@ -170,6 +182,8 @@ static const struct log_format_s log_formats[] = {
LOG_FORMAT(GPS, "QBffLLfffff", "GPSTime,FixType,EPH,EPV,Lat,Lon,Alt,VelN,VelE,VelD,Cog"),
LOG_FORMAT(ATTC, "ffff", "Roll,Pitch,Yaw,Thrust"),
LOG_FORMAT(STAT, "BBBBBfffB", "State,FlightMode,CtlMode,SASMode,Armed,BatV,BatC,BatRem,BatWarn"),
+ LOG_FORMAT(RC, "ffffffff", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7"),
+ LOG_FORMAT(OUT0, "ffffffff", "Out0,Out1,Out2,Out3,Out4,Out5,Out6,Out7"),
};
static const int log_formats_num = sizeof(log_formats) / sizeof(struct log_format_s);