diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-19 19:04:10 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-19 19:04:10 +0200 |
| commit | 1e96633907f46bffeefbb6c3c913266e667d5a13 (patch) | |
| tree | a2157847c2bf78d282bffc64767fa128629364b4 /src/modules/uORB | |
| parent | 7bd952c7acf7bc1c588a123d395930525be1349c (diff) | |
| parent | 69a183e221a6ae2fc1f9677b0193d11e43d46d72 (diff) | |
| download | px4-firmware-1e96633907f46bffeefbb6c3c913266e667d5a13.tar.gz px4-firmware-1e96633907f46bffeefbb6c3c913266e667d5a13.tar.bz2 px4-firmware-1e96633907f46bffeefbb6c3c913266e667d5a13.zip | |
Merged seatbelt_multirotor_new / master
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index 67aeac372..4f4db5dbc 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -61,7 +61,7 @@ */ struct vehicle_control_mode_s { - uint16_t counter; /**< incremented by the writing thread everytime new data is stored */ + uint16_t counter; /**< incremented by the writing thread every time new data is stored */ uint64_t timestamp; /**< in microseconds since system start, is set whenever the writing thread stores new data */ bool flag_armed; @@ -73,11 +73,9 @@ struct vehicle_control_mode_s bool flag_control_manual_enabled; /**< true if manual input is mixed in */ bool flag_control_offboard_enabled; /**< true if offboard control input is on */ - // XXX shouldn't be necessairy - //bool flag_auto_enabled; bool flag_control_rates_enabled; /**< true if rates are stabilized */ bool flag_control_attitude_enabled; /**< true if attitude stabilization is mixed in */ - bool flag_control_velocity_enabled; /**< true if horisontal speed (implies direction) is controlled */ + bool flag_control_velocity_enabled; /**< true if horizontal velocity (implies direction) is controlled */ bool flag_control_position_enabled; /**< true if position is controlled */ bool flag_control_altitude_enabled; /**< true if altitude is controlled */ bool flag_control_climb_rate_enabled; /**< true if climb rate is controlled */ |