diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 16:24:48 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 16:24:48 +0200 |
| commit | 9dbc83cce146a8e6d86499d994119c25f219c832 (patch) | |
| tree | 06b7fd9c709eef5e2f9cf1a7006759c50b5f9933 /src/modules/commander/state_machine_helper.h | |
| parent | b20d0c0f015fb62955f7a399b50626a0d57c5f64 (diff) | |
| parent | ff84fb2ac6b4c25feac9c82152c56e89e8ae29fb (diff) | |
| download | px4-firmware-9dbc83cce146a8e6d86499d994119c25f219c832.tar.gz px4-firmware-9dbc83cce146a8e6d86499d994119c25f219c832.tar.bz2 px4-firmware-9dbc83cce146a8e6d86499d994119c25f219c832.zip | |
Merged master into prearm_checks
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 abb917873..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); - 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_ */ |