fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 21:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

commander: fix 'commander arm' not working in HIL mode

Browse Source 
This got introduced with 61b0a81bf9. Due to the removed startup_in_hil flag,
this check does not work anymore, so remove it completely.
This commit is contained in:
Beat Küng
2017-10-30 20:53:58 +01:00
committed by Lorenz Meier
parent f6693f1f17
commit 9c8dc3941d
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
-8
View File
@@ -722,14 +722,6 @@ transition_result_t arm_disarm(bool arm, orb_advert_t *mavlink_log_pub_local, co
{
transition_result_t arming_res = TRANSITION_NOT_CHANGED;
// For HIL platforms, require that simulated sensors are connected
if (arm && hrt_absolute_time() > commander_boot_timestamp + INAIR_RESTART_HOLDOFF_INTERVAL &&
status.hil_state == vehicle_status_s::HIL_STATE_ON) {
mavlink_log_critical(mavlink_log_pub_local, "HITL: Connect to simulator before arming.");
return TRANSITION_DENIED;
}
// Transition the armed state. By passing mavlink_log_pub to arming_state_transition it will
// output appropriate error messages if the state cannot transition.
arming_res = arming_state_transition(&status,