diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-25 16:30:35 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-25 16:30:35 +0200 |
| commit | 0ecc9c4bf4f2bf9fe1d99b5cbdf398718d2dccdd (patch) | |
| tree | e9ee7c3a5e8c5079cf2224ccf560e864cc0036d9 /src/modules/commander/state_machine_helper.h | |
| parent | 9ce2b62eb57b519348c4b2fcd58af09999e504e7 (diff) | |
| download | px4-firmware-0ecc9c4bf4f2bf9fe1d99b5cbdf398718d2dccdd.tar.gz px4-firmware-0ecc9c4bf4f2bf9fe1d99b5cbdf398718d2dccdd.tar.bz2 px4-firmware-0ecc9c4bf4f2bf9fe1d99b5cbdf398718d2dccdd.zip | |
Shrinking the main commander file a bit
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index b015c4efe..b553a4b56 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Copyright (C) 2013 PX4 Development Team. All rights reserved. * Author: Thomas Gubler <thomasgubler@student.ethz.ch> * Julian Oes <joes@student.ethz.ch> * @@ -50,15 +50,7 @@ #include <uORB/topics/vehicle_control_mode.h> -void navigation_state_update(int status_pub, struct vehicle_status_s *current_status, const int mavlink_fd); - -bool is_multirotor(const struct vehicle_status_s *current_status); - -bool is_rotary_wing(const struct vehicle_status_s *current_status); - -//int do_arming_state_update(int status_pub, struct vehicle_status_s *current_status, const int mavlink_fd, arming_state_t new_state); - -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, int control_mode_pub, struct vehicle_control_mode_s *control_mode, const int mavlink_fd); |