diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-15 08:42:08 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-15 08:42:08 +0200 |
| commit | 0bbc4b7012c72fda61dca01a897552e9483a4f5f (patch) | |
| tree | cc762f2c0784bf59d48d5d4c2204e279d420e1fc | |
| parent | aebdd6e05969e415db2f7f939229163dddc35f23 (diff) | |
| download | px4-firmware-0bbc4b7012c72fda61dca01a897552e9483a4f5f.tar.gz px4-firmware-0bbc4b7012c72fda61dca01a897552e9483a4f5f.tar.bz2 px4-firmware-0bbc4b7012c72fda61dca01a897552e9483a4f5f.zip | |
Build fixes
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 2 | ||||
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 2f70d001d..33ffba6bf 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -76,7 +76,7 @@ MODULES += examples/flow_position_estimator # # Vehicle Control # -MODULES += modules/segway +#MODULES += modules/segway # XXX needs state machine update MODULES += modules/fixedwing_backside MODULES += modules/fixedwing_att_control MODULES += modules/fixedwing_pos_control diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 2953639bf..65e8fa4b6 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -870,7 +870,7 @@ PX4IO::io_set_arming_state() uint16_t set = 0; uint16_t clear = 0; - _system_armed = vstatus.flag_system_armed; + _system_armed = armed.armed; if (armed.armed && !armed.lockdown) { set |= PX4IO_P_SETUP_ARMING_FMU_ARMED; |