diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-17 16:06:33 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-17 16:06:33 +0100 |
| commit | 038037d67656b92947a976cf647dfd4f748ec3ad (patch) | |
| tree | 900693c8b454fd85d3beeceaa1f716c675b5f66f /apps/uORB/topics/vehicle_status.h | |
| parent | 6bd18e46bb3b250213bb64d9b0da2e71ddc912ab (diff) | |
| download | px4-firmware-038037d67656b92947a976cf647dfd4f748ec3ad.tar.gz px4-firmware-038037d67656b92947a976cf647dfd4f748ec3ad.tar.bz2 px4-firmware-038037d67656b92947a976cf647dfd4f748ec3ad.zip | |
Allow to in-air restore the FMU and IO arming state if only one of the two fails
Diffstat (limited to 'apps/uORB/topics/vehicle_status.h')
| -rw-r--r-- | apps/uORB/topics/vehicle_status.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/uORB/topics/vehicle_status.h b/apps/uORB/topics/vehicle_status.h index 06b4c5ca5..893e34537 100644 --- a/apps/uORB/topics/vehicle_status.h +++ b/apps/uORB/topics/vehicle_status.h @@ -156,7 +156,9 @@ struct vehicle_status_s enum VEHICLE_FLIGHT_MODE flight_mode; /**< current flight mode, as defined by mode switch */ enum VEHICLE_MANUAL_CONTROL_MODE manual_control_mode; /**< current attitude control mode, as defined by VEHICLE_ATTITUDE_MODE enum */ enum VEHICLE_MANUAL_SAS_MODE manual_sas_mode; /**< current stabilization mode */ - int32_t system_type; /**< system type, inspired by MAVLinks VEHICLE_TYPE enum */ + int32_t system_type; /**< system type, inspired by MAVLink's VEHICLE_TYPE enum */ + int32_t system_id; /**< system id, inspired by MAVLink's system ID field */ + int32_t component_id; /**< subsystem / component id, inspired by MAVLink's component ID field */ /* system flags - these represent the state predicates */ @@ -171,7 +173,7 @@ struct vehicle_status_s bool flag_control_position_enabled; /**< true if position is controlled */ bool flag_preflight_gyro_calibration; /**< true if gyro calibration is requested */ - bool flag_preflight_mag_calibration; /**< true if mag calibration is requested */ + bool flag_preflight_mag_calibration; /**< true if mag calibration is requested */ bool flag_preflight_accel_calibration; bool rc_signal_found_once; @@ -209,6 +211,7 @@ struct vehicle_status_s bool flag_auto_flight_mode_ok; /**< conditions of vector flight mode apply plus a valid takeoff position lock has been aquired */ bool flag_external_manual_override_ok; /**< external override non-fatal for system. Only true for fixed wing */ bool flag_valid_launch_position; /**< indicates a valid launch position */ + bool flag_valid_home_position; /**< indicates a valid home position (a valid home position is not always a valid launch) */ }; /** |