From a73108d116f950331a20f308c33ff8e5c6cda8d7 Mon Sep 17 00:00:00 2001 From: Anton Matosov Date: Mon, 5 Jan 2015 13:23:47 +0200 Subject: Fixed autoconf variable check --- ROMFS/px4fmu_common/init.d/10018_tbs_endurance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 6e144e6e42232b1ecc7a972f1d4e532694efb15a Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 5 Jan 2015 20:54:44 +0100 Subject: Multi-tables: Adjust shebang, add missing include guards --- src/modules/systemlib/mixer/multi_tables | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/systemlib/mixer/multi_tables b/src/modules/systemlib/mixer/multi_tables index 786b63b02..46dfc5bff 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 # # Generate multirotor mixer scale tables compatible with the ArduCopter layout # @@ -6,9 +6,12 @@ import math print "/*" -print "* These file is automatically generated by multi_tables.py - do not edit." +print "* This file is automatically generated by multi_tables.py - 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)) @@ -157,3 +160,5 @@ printScaleTablesIndex() printScaleTablesCounts() print "} // anonymous namespace\n" +print "#endif /* _MIXER_MULTI_TABLES */" +print "" -- cgit v1.2.3 From a6ad8b3cb74bf02c269c18187fdd938391581970 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 5 Jan 2015 20:54:57 +0100 Subject: Travis CI: Output generated mixer table. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b201d5130..586c0c756 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,12 @@ # http://travis-ci.org language: cpp +compiler: gcc before_script: - - sudo apt-get update -q + - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + - sudo apt-get install -qq g++-4.8 libstdc++-4.8-dev # 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 -- cgit v1.2.3 From 3fb61cf41e054fc27946281b8962d3ca9e3b0cba Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 5 Jan 2015 23:13:03 +0100 Subject: Travis CI: Install GCC 4.8 as well --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 586c0c756..957ab7f14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ compiler: gcc before_script: - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - - sudo apt-get install -qq g++-4.8 libstdc++-4.8-dev + - sudo apt-get install -qq gcc-4.8 g++-4.8 libstdc++-4.8-dev # Travis specific tools - sudo apt-get install s3cmd grep zip mailutils # General toolchain dependencies -- cgit v1.2.3 From 3f7b9b45eaa15fc9b14b0afe07726fcc8b61e6d7 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 5 Jan 2015 23:23:20 +0100 Subject: Travis CI: More fixes to really move to GCC 4.8 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 957ab7f14..fd2a6b6d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ # http://travis-ci.org language: cpp -compiler: gcc before_script: - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - - sudo apt-get install -qq gcc-4.8 g++-4.8 libstdc++-4.8-dev + - 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 -- cgit v1.2.3