diff options
| author | Julian Oes <joes@student.ethz.ch> | 2013-02-22 19:46:47 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2013-02-22 19:46:47 -0800 |
| commit | 0eca49a4f6d4a06868770c8b0c36094d889cb846 (patch) | |
| tree | 4a7ba0faccf1c704a08d490606971fd5086b1e96 /apps/drivers | |
| parent | f731b6f4e5b009cf12d66c9ff2f5bbed47ca14af (diff) | |
| download | px4-firmware-0eca49a4f6d4a06868770c8b0c36094d889cb846.tar.gz px4-firmware-0eca49a4f6d4a06868770c8b0c36094d889cb846.tar.bz2 px4-firmware-0eca49a4f6d4a06868770c8b0c36094d889cb846.zip | |
Checkpoint: Separated all bools in vehicle status into conditions and flags, they should be protected
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/blinkm/blinkm.cpp | 2 | ||||
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/apps/drivers/blinkm/blinkm.cpp b/apps/drivers/blinkm/blinkm.cpp index 6aff27e4c..ceb2d987d 100644 --- a/apps/drivers/blinkm/blinkm.cpp +++ b/apps/drivers/blinkm/blinkm.cpp @@ -529,7 +529,7 @@ BlinkM::led() } else { /* no battery warnings here */ - if(vehicle_status_raw.flag_system_armed == false) { + if(vehicle_status_raw.flag_fmu_armed == false) { /* system not armed */ led_color_1 = LED_RED; led_color_2 = LED_RED; diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index adb894371..99f0f35b2 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -446,7 +446,7 @@ PX4IO::init() } /* keep waiting for state change for 10 s */ - } while (!status.flag_system_armed); + } while (!status.flag_fmu_armed); /* regular boot, no in-air restart, init IO */ } else { @@ -658,11 +658,12 @@ PX4IO::io_set_arming_state() } else { clear |= PX4IO_P_SETUP_ARMING_ARM_OK; } - if (vstatus.flag_vector_flight_mode_ok) { - set |= PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK; - } else { - clear |= PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK; - } + // TODO fix this + // if (vstatus.flag_vector_flight_mode_ok) { + // set |= PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK; + // } else { + // clear |= PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK; + // } if (vstatus.flag_external_manual_override_ok) { set |= PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK; } else { |