diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-13 11:12:34 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-13 11:12:34 +0100 |
| commit | 1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae (patch) | |
| tree | 65cf4f9b03e9dc63ffdf05ff698272f326d76908 /apps/px4io/px4io.h | |
| parent | 26faab64e5e1679d15afe88ef0edebd598f47dc7 (diff) | |
| parent | 03076a72ca75917cf62d7889c6c6d0de36866b04 (diff) | |
| download | px4-firmware-1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae.tar.gz px4-firmware-1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae.tar.bz2 px4-firmware-1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae.zip | |
Merged IO feature branch
Diffstat (limited to 'apps/px4io/px4io.h')
| -rw-r--r-- | apps/px4io/px4io.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apps/px4io/px4io.h b/apps/px4io/px4io.h index e0b7cdda1..84f5ba029 100644 --- a/apps/px4io/px4io.h +++ b/apps/px4io/px4io.h @@ -71,6 +71,7 @@ struct sys_state_s bool armed; /* IO armed */ bool arm_ok; /* FMU says OK to arm */ + uint16_t servo_rate; /* output rate of servos in Hz */ /** * Data from the remote control input(s) @@ -92,7 +93,7 @@ struct sys_state_s /** * If true, we are using the FMU controls, else RC input if available. */ - bool mixer_use_fmu; + bool mixer_manual_override; /** * If true, FMU input is available. @@ -124,6 +125,16 @@ struct sys_state_s * If true, the connection to FMU has been lost for more than a timeout interval */ bool fmu_lost; + + /** + * If true, FMU is ready for autonomous position control. Only used for LED indication + */ + bool vector_flight_mode_ok; + + /** + * If true, IO performs an on-board manual override with the RC channel values + */ + bool manual_override_ok; }; extern struct sys_state_s system_state; |