Rebase changes on upstream master

This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:41 +01:00
committed by Julian Oes
parent a0d91d2225
commit 65d89b5b97
5 changed files with 10 additions and 3 deletions
+4 -1
View File
@@ -155,6 +155,9 @@ posix_sitl_ekf2:
ros_sitl_default:
@echo "This target is deprecated. Use make 'posix_sitl_default gazebo' instead."
ros_sitl_default:
$(call cmake-build,$@)
qurt_eagle_travis:
$(call cmake-build,$@)
@@ -163,7 +166,7 @@ qurt_eagle_release:
posix_eagle_release:
$(call cmake-build,$@)
qurt_eagle_default:
$(call cmake-build,$@)