diff options
author | Anton Matosov <anton.matosov@gmail.com> | 2015-01-06 00:30:23 +0200 |
---|---|---|
committer | Anton Matosov <anton.matosov@gmail.com> | 2015-01-06 00:30:23 +0200 |
commit | fbf51360b3de28db9c9b3a0b83b3daf34caaedb4 (patch) | |
tree | b4a66d686c9a7c368da634aba91d030c95385f7c | |
parent | b04559e5fa856aad48d7c371806557dab9ba12a3 (diff) | |
parent | 3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7 (diff) | |
download | px4-firmware-fbf51360b3de28db9c9b3a0b83b3daf34caaedb4.tar.gz px4-firmware-fbf51360b3de28db9c9b3a0b83b3daf34caaedb4.tar.bz2 px4-firmware-fbf51360b3de28db9c9b3a0b83b3daf34caaedb4.zip |
Merged with px4/multitables
Conflicts:
src/modules/systemlib/mixer/multi_tables
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/10018_tbs_endurance | 2 | ||||
-rwxr-xr-x | src/modules/systemlib/mixer/multi_tables | 9 |
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 "" |