Merged

makefiles/config_px4fmu_default.mk

@@ -30,6 +30,7 @@ MODULES		+= systemcmds/preflight_check
 MODULES		+= systemcmds/pwm
 MODULES		+= systemcmds/reboot
 MODULES		+= systemcmds/top
+MODULES		+= systemcmds/tests
 
 #
 # General system control
@@ -79,6 +80,5 @@ BUILTIN_COMMANDS := \
 	$(call _B, sensors,                SCHED_PRIORITY_MAX-5,      4096,  sensors_main               ) \
 	$(call _B, sercon,                 ,                          2048,  sercon_main                ) \
 	$(call _B, serdis,                 ,                          2048,  serdis_main                ) \
-	$(call _B, tests,                  ,                          12000, tests_main                 ) \
 	$(call _B, tone_alarm,             ,                          2048,  tone_alarm_main            ) \
 	$(call _B, uorb,                   ,                          4096,  uorb_main                  )

makefiles/module.mk

@@ -75,6 +75,12 @@
 #	the list should be formatted as: 
 #		<command>.<priority>.<stacksize>.<entrypoint>
 #
+# INCLUDE_DIRS		(optional, must be appended)
+#
+#	The list of directories searched for include files. If non-standard
+#	includes (e.g. those from another module) are required, paths to search
+#	can be added here.
+#
 # DEFAULT_VISIBILITY	(optional)
 #
 #	If not set, global symbols defined in a module will not be visible 

makefiles/nuttx.mk

@@ -64,8 +64,8 @@ LDSCRIPT		+= $(NUTTX_EXPORT_DIR)build/ld.script
 # Add directories from the NuttX export to the relevant search paths
 #
 INCLUDE_DIRS		+= $(NUTTX_EXPORT_DIR)include \
-			+= $(NUTTX_EXPORT_DIR)arch/chip \
-			+= $(NUTTX_EXPORT_DIR)arch/common
+			   $(NUTTX_EXPORT_DIR)arch/chip \
+			   $(NUTTX_EXPORT_DIR)arch/common
 
 LIB_DIRS		+= $(NUTTX_EXPORT_DIR)libs
 LIBS			+= -lapps -lnuttx