Merged beta into master

This commit is contained in:
Lorenz Meier
2015-08-22 14:06:01 +02:00
25 changed files with 1385 additions and 238 deletions
+5 -4
View File
@@ -300,6 +300,11 @@ then
then
fi
#
# UAVCAN
#
sh /etc/init.d/rc.uavcan
#
# Sensors System (start before Commander so Preflight checks are properly run)
#
@@ -505,10 +510,6 @@ then
fi
fi
# UAVCAN
#
sh /etc/init.d/rc.uavcan
#
# Logging
#