diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-10-11 16:22:08 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-10-11 16:22:08 +0200 |
| commit | e770f84858491591cd07554989fbc0708b9e0cd3 (patch) | |
| tree | 723d690aa3759fdfe0776888f5c22bddf1d2d40c /src/modules/commander/state_machine_helper.h | |
| parent | 87e1ffe0ba293c62b882a8ae9729878e36a95c4c (diff) | |
| parent | 1306c9de7b946783ff1143bb42a33734e9380e2c (diff) | |
| download | px4-firmware-e770f84858491591cd07554989fbc0708b9e0cd3.tar.gz px4-firmware-e770f84858491591cd07554989fbc0708b9e0cd3.tar.bz2 px4-firmware-e770f84858491591cd07554989fbc0708b9e0cd3.zip | |
Merge branch 'master' into px4io_fix
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 1641b6f60..0bfdf36a8 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -58,7 +58,7 @@ typedef enum { } transition_result_t; 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 struct vehicle_control_mode_s *control_mode, arming_state_t new_arming_state, struct actuator_armed_s *armed); bool is_safe(const struct vehicle_status_s *current_state, const struct safety_s *safety, const struct actuator_armed_s *armed); |