diff options
| author | Julian Oes <julian@oes.ch> | 2014-05-27 21:56:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-05-27 21:56:32 +0200 |
| commit | ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9 (patch) | |
| tree | b71c7b12719a3d4535615aee2cf95a034bc87b13 /src/modules/commander/state_machine_helper.h | |
| parent | 063caba36bd2fe26eb4bfa8e546e9551ccc05519 (diff) | |
| download | px4-firmware-ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9.tar.gz px4-firmware-ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9.tar.bz2 px4-firmware-ed6c2a5168ca891f20594687acfd3c6bbf7e1cf9.zip | |
commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP)
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 0ddd4f05a..594bf23a1 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -56,25 +56,17 @@ 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 int mavlink_fd = 0); - bool is_safe(const struct vehicle_status_s *current_state, const struct safety_s *safety, const struct actuator_armed_s *armed); -bool check_arming_state_changed(); +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 = 0); transition_result_t main_state_transition(struct vehicle_status_s *current_state, main_state_t new_main_state); -bool check_main_state_changed(); - transition_result_t failsafe_state_transition(struct vehicle_status_s *status, failsafe_state_t new_failsafe_state); -bool check_navigation_state_changed(); - -bool check_failsafe_state_changed(); - -void set_navigation_state_changed(); +transition_result_t hil_state_transition(hil_state_t new_state, int status_pub, struct vehicle_status_s *current_state, const int mavlink_fd); -int hil_state_transition(hil_state_t new_state, int status_pub, struct vehicle_status_s *current_state, const int mavlink_fd); +void set_nav_state(struct vehicle_status_s *status); #endif /* STATE_MACHINE_HELPER_H_ */ |