diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-27 14:39:36 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-27 14:39:36 +0200 |
| commit | cc8f7f4c97de923f60f9469aa2847e6e1474d52d (patch) | |
| tree | 4a5895a4421fbd66a2159de08c3ad70506b55051 /src/modules/commander/state_machine_helper.h | |
| parent | 3aab37e0e04ce98ddacd99e238e626ab5c3d4445 (diff) | |
| parent | f3a77705a701a92ae510e18280136b3b7f204b3e (diff) | |
| download | px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.tar.gz px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.tar.bz2 px4-firmware-cc8f7f4c97de923f60f9469aa2847e6e1474d52d.zip | |
Merge branch 'master' into navigator_rewrite
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.h
src/modules/mavlink/mavlink_messages.cpp
Diffstat (limited to 'src/modules/commander/state_machine_helper.h')
| -rw-r--r-- | src/modules/commander/state_machine_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 2e076cdae..11072403e 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -59,7 +59,7 @@ typedef enum { bool is_safe(const struct vehicle_status_s *current_state, const struct safety_s *safety, const struct actuator_armed_s *armed); 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 = 0); + 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); |