diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-15 19:41:54 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-15 19:41:54 +0200 |
| commit | 9f5565de3221718ba12800a54ca1a0c06b7491ef (patch) | |
| tree | 7cda3831fabd567a97b140207edef793a24e9250 /src/modules/commander/state_machine_helper.h | |
| parent | e556649f2ff6922a7a3b7751b68cdedd0d6254aa (diff) | |
| download | px4-firmware-9f5565de3221718ba12800a54ca1a0c06b7491ef.tar.gz px4-firmware-9f5565de3221718ba12800a54ca1a0c06b7491ef.tar.bz2 px4-firmware-9f5565de3221718ba12800a54ca1a0c06b7491ef.zip | |
Controllers should not access state machine anymore but access the vehicle_control_mode flags
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 824a7529f..8d8536090 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -47,6 +47,7 @@ #include <uORB/uORB.h> #include <uORB/topics/vehicle_status.h> #include <uORB/topics/actuator_safety.h> +#include <uORB/topics/vehicle_control_mode.h> void navigation_state_update(int status_pub, struct vehicle_status_s *current_status, const int mavlink_fd); @@ -54,8 +55,7 @@ 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 arming_state_transition(int status_pub, struct vehicle_status_s *current_state, arming_state_t new_arming_state, int safety_pub, struct actuator_safety_s *safety, 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); +int navigation_state_transition(int status_pub, struct vehicle_status_s *current_state, navigation_state_t new_navigation_state, int control_mode_pub, struct vehicle_control_mode_s *control_mode, const int mavlink_fd); int hil_state_transition(int status_pub, struct vehicle_status_s *current_status, const int mavlink_fd, hil_state_t new_state); |