fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 07:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Checkpoint: Separated all bools in vehicle status into conditions and flags, they should be protected

Browse Source
This commit is contained in:
Julian Oes
2013-02-22 19:46:47 -08:00
parent f731b6f4e5
commit 0eca49a4f6
8 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/drivers/blinkm/blinkm.cpp
+1 -1
View File
@@ -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;
apps/drivers/px4io/px4io.cpp
+7 -6
View File
@@ -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 {