From 42baeeb9995eb1d6a61b9b80b4b67d66f5fc1eb6 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Wed, 20 Jan 2016 15:24:18 -0800 Subject: [PATCH] Merge fixes Signed-off-by: Mark Charlebois --- src/modules/commander/commander.cpp | 2 +- src/modules/muorb/adsp/module.mk | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index a6dfd46456..7661b6daee 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -2982,7 +2982,7 @@ set_control_mode() /* set vehicle_control_mode according to set_navigation_state */ control_mode.flag_armed = armed.armed; control_mode.flag_external_manual_override_ok = (!status.is_rotary_wing && !status.is_vtol); - //control_mode.flag_system_hil_enabled = status.hil_state == vehicle_status_s::HIL_STATE_ON; + control_mode.flag_system_hil_enabled = status.hil_state == vehicle_status_s::HIL_STATE_ON; control_mode.flag_control_offboard_enabled = false; switch (status.nav_state) { diff --git a/src/modules/muorb/adsp/module.mk b/src/modules/muorb/adsp/module.mk index 762f00713e..1ff9f68e76 100644 --- a/src/modules/muorb/adsp/module.mk +++ b/src/modules/muorb/adsp/module.mk @@ -42,10 +42,8 @@ SRCS = \ px4muorb.cpp \ uORBFastRpcChannel.cpp endif -======= SRCS = param/param.c -SRCS += perf_counter.c \ INCLUDE_DIRS += \ ${PX4_BASE}/src/modules/uORB