diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-13 07:43:51 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-13 08:38:31 +0100 |
| commit | 4595cc65b8bd30ba084783660a541c57c3921dbb (patch) | |
| tree | c9d74ddef6e420247beb9fae6582644e76766cb8 /apps/px4io/protocol.h | |
| parent | d4ca6a29a19c96d359aa1458a4e6f3d9c86b01ac (diff) | |
| download | px4-firmware-4595cc65b8bd30ba084783660a541c57c3921dbb.tar.gz px4-firmware-4595cc65b8bd30ba084783660a541c57c3921dbb.tar.bz2 px4-firmware-4595cc65b8bd30ba084783660a541c57c3921dbb.zip | |
Reworked manual override flag, reworked arming slightly. Pending testing
Diffstat (limited to 'apps/px4io/protocol.h')
| -rw-r--r-- | apps/px4io/protocol.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/px4io/protocol.h b/apps/px4io/protocol.h index 6278e05d4..29a287e45 100644 --- a/apps/px4io/protocol.h +++ b/apps/px4io/protocol.h @@ -136,12 +136,11 @@ /* setup page */ #define PX4IO_PAGE_SETUP 100 #define PX4IO_P_SETUP_FEATURES 0 -#define PX4IO_P_FEAT_ARMING_MANUAL_OVERRIDE_OK (1 << 0) /* OK to switch to manual override */ #define PX4IO_P_SETUP_ARMING 1 /* arming controls */ #define PX4IO_P_SETUP_ARMING_ARM_OK (1 << 0) /* OK to arm */ -#define PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE (1 << 2) /* request switch to manual override */ -#define PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK (1 << 3) +#define PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK (1 << 2) /* OK to switch to manual override via override RC channel */ +#define PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK (1 << 3) /* OK to perform position / vector control (= position lock) */ #define PX4IO_P_SETUP_PWM_RATES 2 /* bitmask, 0 = low rate, 1 = high rate */ #define PX4IO_P_SETUP_PWM_LOWRATE 3 /* 'low' PWM frame output rate in Hz */ |