Merged master into ekf2

2026-05-22 01:12:31 +00:00 · 2015-12-24 09:53:54 +01:00
parent b958928095 45e4def3eb
commit d3149153f6
24 changed files with 1606 additions and 168 deletions
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@@ -144,7 +144,7 @@ set(config_module_list
 	#examples/math_demo
 	# Tutorial code from
 	# https://px4.io/dev/px4_simple_app
-	#examples/px4_simple_app
+	examples/px4_simple_app

 	# Tutorial code from
 	# https://px4.io/dev/daemon
--- a/cmake/configs/posix_sitl_default.cmake
+++ b/cmake/configs/posix_sitl_default.cmake
@@ -59,6 +59,7 @@ set(config_module_list
 	lib/launchdetection
 	lib/terrain_estimation
 	lib/runway_takeoff
+	examples/px4_simple_app
 	)

 set(config_extra_builtin_cmds