diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-27 09:23:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-27 09:23:11 +0200 |
| commit | f052442c2b9dac56ead301e9208a392d7f2fe43d (patch) | |
| tree | 0112e0227436998d3aa7c95909ae12ba80c2427b /src/modules/sdlog2/sdlog2_messages.h | |
| parent | 0ecc9c4bf4f2bf9fe1d99b5cbdf398718d2dccdd (diff) | |
| parent | 8191130bbc8f2cbd53e69a7bcd1a4d4b1b2d68bb (diff) | |
| download | px4-firmware-f052442c2b9dac56ead301e9208a392d7f2fe43d.tar.gz px4-firmware-f052442c2b9dac56ead301e9208a392d7f2fe43d.tar.bz2 px4-firmware-f052442c2b9dac56ead301e9208a392d7f2fe43d.zip | |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
src/modules/sdlog2/sdlog2.c
src/modules/sdlog2/sdlog2_messages.h
Diffstat (limited to 'src/modules/sdlog2/sdlog2_messages.h')
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 755d21d55..96c44e7c2 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -207,13 +207,16 @@ struct log_ARSP_s { float yaw_rate_sp; }; -/* --- FLOW - FLOW DATA --- */ +/* --- FLOW - OPTICAL FLOW --- */ #define LOG_FLOW_MSG 16 struct log_FLOW_s { - float flow_comp_x_m; - float flow_comp_y_m; - float ground_distance_m; + int16_t flow_raw_x; + int16_t flow_raw_y; + float flow_comp_x; + float flow_comp_y; + float distance; uint8_t quality; + uint8_t sensor_id; }; #pragma pack(pop) @@ -235,7 +238,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(OUT0, "ffffffff", "Out0,Out1,Out2,Out3,Out4,Out5,Out6,Out7"), LOG_FORMAT(AIRS, "ff", "IndSpeed,TrueSpeed"), LOG_FORMAT(ARSP, "fff", "RollRateSP,PitchRateSP,YawRateSP"), - LOG_FORMAT(FLOW, "fffB", "FlowX,FlowY,SonAlt,FQual") + LOG_FORMAT(FLOW, "hhfffBB", "RawX,RawY,CompX,CompY,Dist,Q,SensID"), }; static const int log_formats_num = sizeof(log_formats) / sizeof(struct log_format_s); |