diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-07-11 20:49:28 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-07-11 20:49:28 +0400 |
| commit | c291c4482a74c028a2c28f24978dc06c52b0c6d4 (patch) | |
| tree | 6c74fca4f49d0c9af356c8c05ddcd6161ca7480b /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 04fbed493aab1dede6c2200aaab2b990d24a66e7 (diff) | |
| parent | 3ac760978f3cd4be1ede595e1802d38d28ce1d96 (diff) | |
| download | px4-firmware-c291c4482a74c028a2c28f24978dc06c52b0c6d4.tar.gz px4-firmware-c291c4482a74c028a2c28f24978dc06c52b0c6d4.tar.bz2 px4-firmware-c291c4482a74c028a2c28f24978dc06c52b0c6d4.zip | |
Merge branch 'master' into seatbelt_multirotor
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 1b2237d65..d9f1cd634 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -209,6 +209,24 @@ struct log_GPOS_s { float vel_e; float vel_d; }; + +/* --- ESC - ESC STATE --- */ +#define LOG_ESC_MSG 64 +struct log_ESC_s { + uint16_t counter; + uint8_t esc_count; + uint8_t esc_connectiontype; + + uint8_t esc_num; + uint16_t esc_address; + uint16_t esc_version; + uint16_t esc_voltage; + uint16_t esc_current; + uint16_t esc_rpm; + uint16_t esc_temperature; + float esc_setpoint; + uint16_t esc_setpoint_raw; +}; #pragma pack(pop) /* construct list of all message formats */ @@ -230,6 +248,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(ARSP, "fff", "RollRateSP,PitchRateSP,YawRateSP"), LOG_FORMAT(FLOW, "hhfffBB", "RawX,RawY,CompX,CompY,Dist,Q,SensID"), LOG_FORMAT(GPOS, "LLffff", "Lat,Lon,Alt,VelN,VelE,VelD"), + LOG_FORMAT(ESC, "HBBBHHHHHHfH", "Counter,NumESC,Conn,No,Version,Adr,Volt,Amp,RPM,Temp,SetP,SetPRAW"), }; static const int log_formats_num = sizeof(log_formats) / sizeof(struct log_format_s); |