diff options
| author | Julian Oes <joes@student.ethz.ch> | 2013-02-22 09:32:49 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2013-02-22 09:32:49 -0800 |
| commit | 36f9f8082e1ac676994cab0a6ee2c7a8344b0216 (patch) | |
| tree | 4f7d5116373e86664f0eeba526ce85c3b0b860b2 /apps/commander/state_machine_helper.h | |
| parent | be7aeb754b85016e2609508d1c059797d5068ec1 (diff) | |
| download | px4-firmware-36f9f8082e1ac676994cab0a6ee2c7a8344b0216.tar.gz px4-firmware-36f9f8082e1ac676994cab0a6ee2c7a8344b0216.tar.bz2 px4-firmware-36f9f8082e1ac676994cab0a6ee2c7a8344b0216.zip | |
Checkpoint: Added flag checks inside navigation state update
Diffstat (limited to 'apps/commander/state_machine_helper.h')
| -rw-r--r-- | apps/commander/state_machine_helper.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/commander/state_machine_helper.h b/apps/commander/state_machine_helper.h index f2928db09..5b57cffb7 100644 --- a/apps/commander/state_machine_helper.h +++ b/apps/commander/state_machine_helper.h @@ -53,7 +53,9 @@ void navigation_state_update(int status_pub, struct vehicle_status_s *current_st void state_machine_publish(int status_pub, struct vehicle_status_s *current_status, const int mavlink_fd); -int check_navigation_state_transition(navigation_state_t current_navigation_state, navigation_state_t new_navigation_state); -int check_arming_state_transition(struct vehicle_status_s current_state, arming_state_t new_arming_state); +int arming_state_transition(int status_pub, struct vehicle_status_s *current_state, arming_state_t new_arming_state, const int mavlink_fd); +int navigation_state_transition(int status_pub, struct vehicle_status_s *current_state, navigation_state_t new_navigation_state, const int mavlink_fd); -#endif /* STATE_MACHINE_HELPER_H_ */ +int hil_state_transition(int status_pub, struct vehicle_status_s *current_status, const int mavlink_fd, hil_state_t new_state); + +#endif /* STATE_MACHINE_HELPER_H_ */
\ No newline at end of file |