Merge branch 'master' of github.com:PX4/Firmware

This commit is contained in:
Lorenz Meier
2012-10-30 07:50:13 +01:00
23 changed files with 946 additions and 340 deletions
+2 -2
View File
@@ -83,7 +83,7 @@ else
#
# Are we attached to a PX4IOAR (AR.Drone carrier board)?
#
if boardinfo -t 7
if boardinfo test name PX4IOAR
then
set BOARD PX4IOAR
if [ -f /etc/init.d/rc.PX4IOAR ]
@@ -99,7 +99,7 @@ else
#
# Are we attached to a PX4IO?
#
if boardinfo -t 6
if boardinfo test name PX4IO
then
set BOARD PX4IO
if [ -f /etc/init.d/rc.PX4IO ]