diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-01 12:09:16 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-01 12:09:16 +0200 |
| commit | f78ea38d982006389e83382a44baa672834acb6d (patch) | |
| tree | e429b408296920f02156c07ccf1952513c5a401e /src/modules/commander/state_machine_helper.cpp | |
| parent | db5d668439be63e4c8fd7dab49b81c5e162ee095 (diff) | |
| parent | 2d4dd0d5c03a7ef3d696f40b6a6988e08e991034 (diff) | |
| download | px4-firmware-f78ea38d982006389e83382a44baa672834acb6d.tar.gz px4-firmware-f78ea38d982006389e83382a44baa672834acb6d.tar.bz2 px4-firmware-f78ea38d982006389e83382a44baa672834acb6d.zip | |
Merge remote-tracking branch 'upstream/master' into obcfailsafe
Diffstat (limited to 'src/modules/commander/state_machine_helper.cpp')
| -rw-r--r-- | src/modules/commander/state_machine_helper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index bc6803596..a3265142d 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -679,7 +679,9 @@ int prearm_check(const struct vehicle_status_s *status, const int mavlink_fd) goto system_eval; } - if (!status->is_rotary_wing) { + /* Perform airspeed check only if circuit breaker is not + * engaged and it's not a rotary wing */ + if (!status->circuit_breaker_engaged_airspd_check && !status->is_rotary_wing) { /* accel done, close it */ close(fd); fd = orb_subscribe(ORB_ID(airspeed)); |