diff options
| author | marco <marco@Marcos-MacBook-Pro.local> | 2013-07-02 19:46:15 +0200 |
|---|---|---|
| committer | marco <marco@Marcos-MacBook-Pro.local> | 2013-07-02 19:46:15 +0200 |
| commit | 209dc7100e03c257a88d3c71221f136295d61929 (patch) | |
| tree | 1cea2cc8fea1e779d53b4d2a7a3a257b7290decc /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 697c0a1a1d7fb1043786533da3570f28acd661dc (diff) | |
| download | px4-firmware-209dc7100e03c257a88d3c71221f136295d61929.tar.gz px4-firmware-209dc7100e03c257a88d3c71221f136295d61929.tar.bz2 px4-firmware-209dc7100e03c257a88d3c71221f136295d61929.zip | |
mkclctrl 8/11Bit support, uOrb Topic added, ESC Topic to Sdlog2 added
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 4a66fe116..9afae6000 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -209,6 +209,23 @@ 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_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 +247,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, "HBBBHHHHHfH", "Counter,NumESC,Conn,No,Adr,Volt,Amp,RPM,Temp,SetP,SetPRAW"), }; static const int log_formats_num = sizeof(log_formats) / sizeof(struct log_format_s); |