diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-27 23:08:00 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-27 23:08:00 +0200 |
| commit | 66c61fbe96e11ee7099431a8370d84f862543810 (patch) | |
| tree | 69c8bdaa273cea3b47b432a922f44d5c5338a27f /src/modules/commander/state_machine_helper.h | |
| parent | 864c1d048c6d9390d6bdf5a8058d48df9d36e973 (diff) | |
| download | px4-firmware-66c61fbe96e11ee7099431a8370d84f862543810.tar.gz px4-firmware-66c61fbe96e11ee7099431a8370d84f862543810.tar.bz2 px4-firmware-66c61fbe96e11ee7099431a8370d84f862543810.zip | |
Full failsafe rewrite.
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index a38c2497e..1641b6f60 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); + 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); @@ -68,10 +68,12 @@ transition_result_t main_state_transition(struct vehicle_status_s *current_state bool check_main_state_changed(); -transition_result_t navigation_state_transition(struct vehicle_status_s *current_status, navigation_state_t new_navigation_state, struct vehicle_control_mode_s *control_mode); +transition_result_t navigation_state_transition(struct vehicle_status_s *status, navigation_state_t new_navigation_state, struct vehicle_control_mode_s *control_mode); bool check_navigation_state_changed(); +void set_navigation_state_changed(); + int hil_state_transition(hil_state_t new_state, int status_pub, struct vehicle_status_s *current_state, int control_mode_pub, struct vehicle_control_mode_s *current_control_mode, const int mavlink_fd); #endif /* STATE_MACHINE_HELPER_H_ */ |