diff options
| author | Julian Oes <joes@student.ethz.ch> | 2012-11-13 14:18:59 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2012-11-13 14:18:59 -0800 |
| commit | 359cc4bb86cae716d3d47dc888c836d04e920215 (patch) | |
| tree | bb2158364b83fc511e5eef647eac650eb797fa7f /apps/commander/state_machine_helper.c | |
| parent | a8dfcaace27aa0abee4b3c44bffee9f94e391628 (diff) | |
| parent | e52c7e3c4ba4f909ae7ae51347c0c659c0c9cea7 (diff) | |
| download | px4-firmware-359cc4bb86cae716d3d47dc888c836d04e920215.tar.gz px4-firmware-359cc4bb86cae716d3d47dc888c836d04e920215.tar.bz2 px4-firmware-359cc4bb86cae716d3d47dc888c836d04e920215.zip | |
Merge remote-tracking branch 'upstream/master' into io
Diffstat (limited to 'apps/commander/state_machine_helper.c')
| -rw-r--r-- | apps/commander/state_machine_helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/commander/state_machine_helper.c b/apps/commander/state_machine_helper.c index 1149f735f..9c7db8fca 100644 --- a/apps/commander/state_machine_helper.c +++ b/apps/commander/state_machine_helper.c @@ -576,6 +576,8 @@ uint8_t update_state_machine_mode_request(int status_pub, struct vehicle_status_ state_machine_publish(status_pub, current_status, mavlink_fd); publish_armed_status(current_status); printf("[commander] Enabling HIL, locking down all actuators for safety.\n\t(Arming the system will not activate them while in HIL mode)\n"); + } else if (current_status->state_machine != SYSTEM_STATE_STANDBY) { + mavlink_log_critical(mavlink_fd, "[commander] REJECTING switch to HIL, not in standby.") } /* NEVER actually switch off HIL without reboot */ |