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/registers.c | |
| 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/registers.c')
| -rw-r--r-- | apps/px4io/registers.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/px4io/registers.c b/apps/px4io/registers.c index 815563daa..6229a6cc1 100644 --- a/apps/px4io/registers.c +++ b/apps/px4io/registers.c @@ -140,9 +140,9 @@ volatile uint16_t r_page_setup[] = [PX4IO_P_SETUP_IBATT_BIAS] = 0 }; -#define PX4IO_P_SETUP_FEATURES_VALID (PX4IO_P_FEAT_ARMING_MANUAL_OVERRIDE_OK) +#define PX4IO_P_SETUP_FEATURES_VALID (0) #define PX4IO_P_SETUP_ARMING_VALID (PX4IO_P_SETUP_ARMING_ARM_OK | \ - PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE) + PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK) #define PX4IO_P_SETUP_RATES_VALID ((1 << IO_SERVO_COUNT) - 1) #define PX4IO_P_SETUP_RELAYS_VALID ((1 << PX4IO_RELAY_CHANNELS) - 1) @@ -283,9 +283,7 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) value &= PX4IO_P_SETUP_FEATURES_VALID; r_setup_features = value; - /* update manual override state - disable if no longer OK */ - if ((r_status_flags & PX4IO_P_STATUS_FLAGS_OVERRIDE) && !(value & PX4IO_P_FEAT_ARMING_MANUAL_OVERRIDE_OK)) - r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE; + /* no implemented feature selection at this point */ break; |