Merged with px4/multitables

Conflicts:
	src/modules/systemlib/mixer/multi_tables

3 files changed, 13 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index b201d5130..fd2a6b6d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,10 @@
 language: cpp
 
 before_script:
-  - sudo apt-get update -q
+  - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
+  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8 gcc-4.8 libstdc++-4.8-dev; fi
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
 # Travis specific tools
   - sudo apt-get install s3cmd grep zip mailutils
 # General toolchain dependencies
@@ -39,6 +42,7 @@ script:
   - arm-none-eabi-gcc --version
   - echo 'Running Tests..' && echo -en 'travis_fold:start:script.1\\r'
   - make tests
+  - cat src/modules/systemlib/mixer/mixer_multirotor.generated.h
   - echo -en 'travis_fold:end:script.1\\r'
   - echo 'Building NuttX..' && echo -en 'travis_fold:start:script.2\\r'
   - make archives
diff --git a/ROMFS/px4fmu_common/init.d/10018_tbs_endurance b/ROMFS/px4fmu_common/init.d/10018_tbs_endurance
index 2d5e272bd..668026c61 100644
--- a/ROMFS/px4fmu_common/init.d/10018_tbs_endurance
+++ b/ROMFS/px4fmu_common/init.d/10018_tbs_endurance
@@ -9,7 +9,7 @@
 
 sh /etc/init.d/rc.mc_defaults
 
-if [ $DO_AUTOCONFIG == yes ]
+if [ $AUTOCNF == yes ]
 then
 	param set MC_ROLL_P 7.0
 	param set MC_ROLLRATE_P 0.07
diff --git a/src/modules/systemlib/mixer/multi_tables b/src/modules/systemlib/mixer/multi_tables
index 01ff1b719..a9edb357b 100755
--- a/src/modules/systemlib/mixer/multi_tables
+++ b/src/modules/systemlib/mixer/multi_tables
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 ############################################################################
 #
 #   Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
@@ -39,9 +39,12 @@
 import math
 
 print "/*"
-print "* These file is automatically generated by multi_tables - do not edit."
+print "* This file is automatically generated by multi_tables - do not edit."
 print "*/"
 print ""
+print "#ifndef _MIXER_MULTI_TABLES"
+print "#define _MIXER_MULTI_TABLES"
+print ""
 
 def rcos(angleInRadians):
   return math.cos(math.radians(angleInRadians))
@@ -190,3 +193,5 @@ printScaleTablesIndex()
 printScaleTablesCounts()
 
 print "} // anonymous namespace\n"
+print "#endif /* _MIXER_MULTI_TABLES */"
+print ""