diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-12 12:30:20 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-12 12:30:20 +0200 |
| commit | 017f82e2b808eefedb45971e6c416b6864055769 (patch) | |
| tree | b104f5f87b3554036c7d909e9eacb330c5da15b9 /src/modules/commander/state_machine_helper.h | |
| parent | f78ea38d982006389e83382a44baa672834acb6d (diff) | |
| parent | 3f4aef60c88b1e570dd30bc47a13d5340073e9a9 (diff) | |
| download | px4-firmware-017f82e2b808eefedb45971e6c416b6864055769.tar.gz px4-firmware-017f82e2b808eefedb45971e6c416b6864055769.tar.bz2 px4-firmware-017f82e2b808eefedb45971e6c416b6864055769.zip | |
Merge remote-tracking branch 'origin/master' into obcfailsafe
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 4285d2977..61d0f29d0 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -57,7 +57,7 @@ typedef enum { bool is_safe(const struct vehicle_status_s *current_state, const struct safety_s *safety, const struct actuator_armed_s *armed); transition_result_t arming_state_transition(struct vehicle_status_s *current_state, const struct safety_s *safety, - arming_state_t new_arming_state, struct actuator_armed_s *armed, const int mavlink_fd); + arming_state_t new_arming_state, struct actuator_armed_s *armed, bool fRunPreArmChecks, const int mavlink_fd); transition_result_t main_state_transition(struct vehicle_status_s *current_state, main_state_t new_main_state); |