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/drivers/px4io/px4io.cpp | |
| 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/drivers/px4io/px4io.cpp')
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index c65855b83..51ff3fb83 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -335,7 +335,7 @@ PX4IO::init() /* dis-arm IO before touching anything */ io_reg_modify(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ARMING, PX4IO_P_SETUP_ARMING_ARM_OK | - PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE | + PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK | PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK, 0); /* publish RC config to IO */ @@ -541,9 +541,9 @@ PX4IO::io_set_arming_state() clear |= PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK; } if (vstatus.flag_external_manual_override_ok) { - set |= PX4IO_P_FEAT_ARMING_MANUAL_OVERRIDE_OK; + set |= PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK; } else { - clear |= PX4IO_P_FEAT_ARMING_MANUAL_OVERRIDE_OK; + clear |= PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK; } return io_reg_modify(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ARMING, clear, set); |