diff options
| author | Julian Oes <julian@oes.ch> | 2013-07-16 18:55:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-07-16 18:56:31 +0200 |
| commit | bcdedd9a35a5b9ebf3851a0d472adab8d3e7edac (patch) | |
| tree | c91207643c0c9e1057dd1662556dbfe7f5b5322c /src/modules/commander/state_machine_helper.h | |
| parent | 6e44a486c1511e980d54fead34676ea1bfed3b3d (diff) | |
| download | px4-firmware-bcdedd9a35a5b9ebf3851a0d472adab8d3e7edac.tar.gz px4-firmware-bcdedd9a35a5b9ebf3851a0d472adab8d3e7edac.tar.bz2 px4-firmware-bcdedd9a35a5b9ebf3851a0d472adab8d3e7edac.zip | |
Changed location of lots of flags and conditions, needs testing and more work
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 e591d2fef..75fdd224c 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -54,6 +54,6 @@ int arming_state_transition(int status_pub, struct vehicle_status_s *current_sta 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); +int hil_state_transition(hil_state_t new_state, int status_pub, struct vehicle_status_s *current_state, int control_mode_pub, struct vehicle_control_mode_s *current_control_mode, const int mavlink_fd); #endif /* STATE_MACHINE_HELPER_H_ */ |