fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 05:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into new_state_machine

Browse Source 
Conflicts:
	src/modules/sdlog2/sdlog2.c
	src/modules/sdlog2/sdlog2_messages.h
This commit is contained in:
Julian Oes
2013-06-27 09:23:11 +02:00
parent 0ecc9c4bf4 8191130bbc
commit f052442c2b
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/optical_flow.h
+2 -2
View File
@@ -57,8 +57,8 @@ struct optical_flow_s {
uint64_t timestamp; /**< in microseconds since system start */
uint16_t flow_raw_x; /**< flow in pixels in X direction, not rotation-compensated */
uint16_t flow_raw_y; /**< flow in pixels in Y direction, not rotation-compensated */
int16_t flow_raw_x; /**< flow in pixels in X direction, not rotation-compensated */
int16_t flow_raw_y; /**< flow in pixels in Y direction, not rotation-compensated */
float flow_comp_x_m; /**< speed over ground in meters, rotation-compensated */
float flow_comp_y_m; /**< speed over ground in meters, rotation-compensated */
float ground_distance_m; /**< Altitude / distance to ground in meters */