diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-14 13:53:26 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-14 13:53:26 +0200 |
| commit | 90f5e30f2a177bed2ac08e76699ec3029292d640 (patch) | |
| tree | 25752b2843f573e3affe42b7e20b8fc06c457290 /src/modules/uORB/topics/vehicle_status.h | |
| parent | 236053a600f5708aee0e5849f4fefc2380e7d101 (diff) | |
| download | px4-firmware-90f5e30f2a177bed2ac08e76699ec3029292d640.tar.gz px4-firmware-90f5e30f2a177bed2ac08e76699ec3029292d640.tar.bz2 px4-firmware-90f5e30f2a177bed2ac08e76699ec3029292d640.zip | |
Introduced new actuator_safety topic
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 6d3f8a863..b19075921 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -199,8 +199,8 @@ struct vehicle_status_s bool flag_external_manual_override_ok; /**< external override non-fatal for system. Only true for fixed wing */ bool flag_hil_enabled; /**< true if hardware in the loop simulation is enabled */ - bool flag_fmu_armed; /**< true is motors / actuators of FMU are armed */ - bool flag_io_armed; /**< true is motors / actuators of IO are armed */ + bool flag_armed; /**< true is motors / actuators are armed */ + bool flag_safety_off; /**< true if safety is off */ bool flag_system_emergency; bool flag_preflight_calibration; @@ -245,7 +245,6 @@ struct vehicle_status_s uint16_t errors_count2; uint16_t errors_count3; uint16_t errors_count4; - }; /** |