dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge fixes 

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2016-01-20 15:24:18 -08:00 committed by Julian Oes
parent da8519b44d
commit 7389ea7648
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/commander/commander.cpp
View File

@ -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) {

4
src/modules/muorb/adsp/module.mk
View File

@ -41,11 +41,7 @@ ifeq ($(PX4_TARGET_OS),qurt)
SRCS = \
px4muorb.cpp \
uORBFastRpcChannel.cpp
SRCS = param/param.c
endif
endif
SRCS += perf_counter.c \
INCLUDE_DIRS += \
${PX4_BASE}/src/modules/uORB

3
src/modules/muorb/krait/CMakeLists.txt
View File

@ -30,9 +30,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
#if("${DSPAL_STUBS_ENABLE}" STREQUAL "1")
# include_directories(../krait-stubs)
#endif()
px4_add_module(
MODULE modules__muorb__krait