diff options
| author | Julian Oes <julian@oes.ch> | 2013-06-18 15:35:26 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-06-18 15:35:26 +0200 |
| commit | 202792294ac8a4d0db2c0e64d944be8e95608930 (patch) | |
| tree | e4c39e482d20ac53d8cf09b6df4454a617c522e5 /src/modules/commander/state_machine_helper.h | |
| parent | 34c197c7cc77de0317112530eb60aa5f3ba5687d (diff) | |
| parent | c3a8f177b6316a9cefd814e312742f47d3049739 (diff) | |
| download | px4-firmware-202792294ac8a4d0db2c0e64d944be8e95608930.tar.gz px4-firmware-202792294ac8a4d0db2c0e64d944be8e95608930.tar.bz2 px4-firmware-202792294ac8a4d0db2c0e64d944be8e95608930.zip | |
Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
src/modules/commander/state_machine_helper.h
src/modules/px4iofirmware/mixer.cpp
src/modules/uORB/topics/actuator_controls.h
src/modules/uORB/topics/vehicle_status.h
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 8d8536090..b015c4efe 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -49,8 +49,13 @@ #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); +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); @@ -59,4 +64,4 @@ int navigation_state_transition(int status_pub, struct vehicle_status_s *current 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 +#endif /* STATE_MACHINE_HELPER_H_ */ |