Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merged with px4/multitables

Browse Source 
Conflicts:
	src/modules/systemlib/mixer/multi_tables
This commit is contained in:
Anton Matosov
2015-01-06 00:30:23 +02:00
parent b04559e5fa 3f7b9b45ea
commit fbf51360b3
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+5 -1
View File
@@ -4,7 +4,10 @@
language: cpp language: cpp
before_script: 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 # Travis specific tools
- sudo apt-get install s3cmd grep zip mailutils - sudo apt-get install s3cmd grep zip mailutils
# General toolchain dependencies # General toolchain dependencies
@@ -39,6 +42,7 @@ script:
- arm-none-eabi-gcc --version - arm-none-eabi-gcc --version
- echo 'Running Tests..' && echo -en 'travis_fold:start:script.1\\r' - echo 'Running Tests..' && echo -en 'travis_fold:start:script.1\\r'
- make tests - make tests
- cat src/modules/systemlib/mixer/mixer_multirotor.generated.h
- echo -en 'travis_fold:end:script.1\\r' - echo -en 'travis_fold:end:script.1\\r'
- echo 'Building NuttX..' && echo -en 'travis_fold:start:script.2\\r' - echo 'Building NuttX..' && echo -en 'travis_fold:start:script.2\\r'
- make archives - make archives
ROMFS/px4fmu_common/init.d/10018_tbs_endurance
+1 -1
View File
@@ -9,7 +9,7 @@
sh /etc/init.d/rc.mc_defaults sh /etc/init.d/rc.mc_defaults
if [ $DO_AUTOCONFIG == yes ] if [ $AUTOCNF == yes ]
then then
param set MC_ROLL_P 7.0 param set MC_ROLL_P 7.0
param set MC_ROLLRATE_P 0.07 param set MC_ROLLRATE_P 0.07
src/modules/systemlib/mixer/multi_tables
+7 -2
View File
@@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
############################################################################ ############################################################################
# #
# Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved. # Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved.
@@ -39,9 +39,12 @@
import math import math
print "/*" 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 "" print ""
print "#ifndef _MIXER_MULTI_TABLES"
print "#define _MIXER_MULTI_TABLES"
print ""
def rcos(angleInRadians): def rcos(angleInRadians):
return math.cos(math.radians(angleInRadians)) return math.cos(math.radians(angleInRadians))
@@ -190,3 +193,5 @@ printScaleTablesIndex()
printScaleTablesCounts() printScaleTablesCounts()
print "} // anonymous namespace\n" print "} // anonymous namespace\n"
print "#endif /* _MIXER_MULTI_TABLES */"
print ""