Merge beta in master

This commit is contained in:
Lorenz Meier
2015-08-23 11:21:38 +02:00
10 changed files with 134 additions and 70 deletions
+4 -4
View File
@@ -143,19 +143,19 @@ MODULES += examples/rover_steering_control
#
#MODULES += examples/math_demo
# Tutorial code from
# https://pixhawk.ethz.ch/px4/dev/hello_sky
# https://px4.io/dev/px4_simple_app
#MODULES += examples/px4_simple_app
# Tutorial code from
# https://pixhawk.ethz.ch/px4/dev/daemon
# https://px4.io/dev/daemon
#MODULES += examples/px4_daemon_app
# Tutorial code from
# https://pixhawk.ethz.ch/px4/dev/debug_values
# https://px4.io/dev/debug_values
#MODULES += examples/px4_mavlink_debug
# Tutorial code from
# https://pixhawk.ethz.ch/px4/dev/example_fixedwing_control
# https://px4.io/dev/example_fixedwing_control
#MODULES += examples/fixedwing_control
# Hardware test