diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-06 14:18:28 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-06 14:18:28 +0200 |
| commit | d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb (patch) | |
| tree | 73b47d4b3b7d89ec9ced5323f4465c5d98a268a9 /src/modules/commander/state_machine_helper.h | |
| parent | 90c4664dce0e3613e545eabb208aa5fbb02d90e9 (diff) | |
| download | px4-firmware-d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb.tar.gz px4-firmware-d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb.tar.bz2 px4-firmware-d1871bd7bb9ae9eefdf1ada56fc3f57428e689eb.zip | |
State machine fixes for HIL
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); |