diff options
| author | px4dev <px4@purgatory.org> | 2013-01-13 17:55:15 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-13 17:55:15 -0800 |
| commit | 9faf348cf5948c508a4a9b85e2ce5f6e51d48a2f (patch) | |
| tree | 6cde98078303285d71deefb6e2fe215dab656930 /apps/commander | |
| parent | 532993c281e810d17d5bd956e74a82268222d6ef (diff) | |
| parent | 63e6ea1b9505fef13b4a45f1048f727d997d27cf (diff) | |
| download | px4-firmware-9faf348cf5948c508a4a9b85e2ce5f6e51d48a2f.tar.gz px4-firmware-9faf348cf5948c508a4a9b85e2ce5f6e51d48a2f.tar.bz2 px4-firmware-9faf348cf5948c508a4a9b85e2ce5f6e51d48a2f.zip | |
Merge pull request #156 from jgoppert/sensor_hil_rebase
Rebase of changes to sensor_hil_fixedwing branch.
Diffstat (limited to 'apps/commander')
| -rw-r--r-- | apps/commander/state_machine_helper.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/commander/state_machine_helper.c b/apps/commander/state_machine_helper.c index d4e88b146..bea388a10 100644 --- a/apps/commander/state_machine_helper.c +++ b/apps/commander/state_machine_helper.c @@ -134,7 +134,8 @@ int do_state_update(int status_pub, struct vehicle_status_s *current_status, con case SYSTEM_STATE_REBOOT: if (current_status->state_machine == SYSTEM_STATE_STANDBY - || current_status->state_machine == SYSTEM_STATE_PREFLIGHT) { + || current_status->state_machine == SYSTEM_STATE_PREFLIGHT + || current_status->flag_hil_enabled) { invalid_state = false; /* set system flags according to state */ current_status->flag_system_armed = false; @@ -708,7 +709,9 @@ uint8_t update_state_machine_custom_mode_request(int status_pub, struct vehicle_ case SYSTEM_STATE_REBOOT: printf("try to reboot\n"); - if (current_system_state == SYSTEM_STATE_STANDBY || current_system_state == SYSTEM_STATE_PREFLIGHT) { + if (current_system_state == SYSTEM_STATE_STANDBY + || current_system_state == SYSTEM_STATE_PREFLIGHT + || current_status->flag_hil_enabled) { printf("system will reboot\n"); mavlink_log_critical(mavlink_fd, "Rebooting.."); usleep(200000); |