diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-01 09:34:26 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-01 09:34:26 +0200 |
| commit | efc992b4d9bbaf39addc90b6acb3104288cfba5b (patch) | |
| tree | 83f633ec027022b3c575aa0770769bf55c6edda9 /src/modules/commander/state_machine_helper.h | |
| parent | a43e963bdb73e6fa0480d442e72e1d764418cad4 (diff) | |
| parent | 48f4a1e5cd6ef653b466eb68c1073fb47cbefbd7 (diff) | |
| download | px4-firmware-efc992b4d9bbaf39addc90b6acb3104288cfba5b.tar.gz px4-firmware-efc992b4d9bbaf39addc90b6acb3104288cfba5b.tar.bz2 px4-firmware-efc992b4d9bbaf39addc90b6acb3104288cfba5b.zip | |
Merged master into geo
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 0ddd4f05a..11072403e 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -56,25 +56,15 @@ 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); 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); +bool set_nav_state(struct vehicle_status_s *status, const bool data_link_loss_enabled, const bool mission_finished); #endif /* STATE_MACHINE_HELPER_H_ */ |