rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

Merge branch 'thread/OP-1474-PID_Scaling' into skarlsso/OP-1474-PID_Scaling_one_factor

Browse Source
This commit is contained in:
Stefan Karlsson 2014-09-11 00:01:04 +02:00
commit 959ded99aa
5 changed files with 124 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
.gitignore vendored
View File

@ -1,72 +1,73 @@
# Ignore artifacts of top-level Makefile # Ignore artifacts of top-level Makefile
/downloads /downloads
/tools /tools
/build /build
# Exclude temporary and system files # Exclude temporary and system files
Thumbs.db Thumbs.db
.DS_Store .DS_Store
GPATH GPATH
GRTAGS GRTAGS
GSYMS GSYMS
GTAGS GTAGS
core core
# flight # flight
/flight/*.pnproj /flight/*.pnproj
/flight/*.pnps /flight/*.pnps
/flight/.cproject /flight/.cproject
/flight/.metadata /flight/.metadata
/flight/.project /flight/.project
/flight/.settings /flight/.settings
/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3 /flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3
/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser /flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
# ground # ground
openpilotgcs-build-desktop openpilotgcs-build-desktop
ground/openpilotgcs/.cproject ground/openpilotgcs/.cproject
ground/openpilotgcs/.project ground/openpilotgcs/.project
ground/openpilotgcs/.settings ground/openpilotgcs/.settings
# Ignore some of the .pro.user files # Ignore some of the .pro.user files
*.pro.user *.pro.user
/ground/openpilotgcs/openpilotgcs.pro.user /ground/openpilotgcs/openpilotgcs.pro.user
/ground/uavobjgenerator/uavobjgenerator.pro.user /ground/uavobjgenerator/uavobjgenerator.pro.user
/ground/uavobjects/uavobjects.pro.user /ground/uavobjects/uavobjects.pro.user
/ground/ground.pro.user /ground/ground.pro.user
/ground/openpilotgcs/src/libs/sdlgamepad.pro.user
# Misc artifacts
/ground/openpilotgcs/share/openpilotgcs/sounds/normalize.exe # Misc artifacts
/ground/openpilotgcs/share/openpilotgcs/sounds/default/normalize.exe /ground/openpilotgcs/share/openpilotgcs/sounds/normalize.exe
/ground/openpilotgcs/share/openpilotgcs/translations/extract-mimetypes.xq /ground/openpilotgcs/share/openpilotgcs/sounds/default/normalize.exe
/ground/openpilotgcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h /ground/openpilotgcs/share/openpilotgcs/translations/extract-mimetypes.xq
/ground/openpilotgcs/src/libs/qextserialport/.hg /ground/openpilotgcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
/ground/openpilotgcs/src/libs/qextserialport/.hgtags /ground/openpilotgcs/src/libs/qextserialport/.hg
/ground/openpilotgcs/src/libs/qwt/qwt.prf /ground/openpilotgcs/src/libs/qextserialport/.hgtags
/ground/openpilotgcs/src/libs/qwt/designer /ground/openpilotgcs/src/libs/qwt/qwt.prf
/ground/openpilotgcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h /ground/openpilotgcs/src/libs/qwt/designer
/ground/openpilotgcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
# Ignore intermediate files generated by command-line android builds
# Couldn't figure out how to force these files into the ./build directory # Ignore intermediate files generated by command-line android builds
/androidgcs/build.xml # Couldn't figure out how to force these files into the ./build directory
/androidgcs/local.properties /androidgcs/build.xml
/androidgcs/proguard-project.txt /androidgcs/local.properties
/androidgcs/proguard-project.txt
# Ignore build output from Eclipse android builds
/androidgcs/bin/ # Ignore build output from Eclipse android builds
/androidgcs/gen/ /androidgcs/bin/
/androidgcs/gen/
# Ignore Eclipse Projects and Metadata
/.cproject # Ignore Eclipse Projects and Metadata
/.project /.cproject
/.metadata /.project
/.settings /.metadata
/.pydevproject /.settings
/.pydevproject
# Ignore Eclipse temp folder, git plugin based?
RemoteSystemsTempFiles # Ignore Eclipse temp folder, git plugin based?
RemoteSystemsTempFiles
# Ignore patch-related files
*.rej # Ignore patch-related files
*.orig *.rej
*.diff~ *.orig
*.diff~

60
MILESTONES.txt
View File

@ -177,15 +177,56 @@ C: Eric Price (Corvus Corax)
D: March 2012 D: March 2012
V: V:
M: First Revo 20km Navigated flight on a FixedWing
C: Eric Price / Team OP
D: Greece 2013
V: https://vimeo.com/71956880
M: First Auto spot landing on a fixed Wing using Revo
C: Eric Price (Corvus Corax)
D: Greece 2013
V:
M: First Revo Navigated flight on a MultiRotor M: First Revo Navigated flight on a MultiRotor
C: It got done somewhere along the line, James or Sami C: It got done somewhere along the line, James or Sami
M: First Revo 1km Navigated flight on a MultiRotor M: First Revo 1km Navigated flight on a MultiRotor
C: Jackson Russell
D: Greece 2013
V:
M: First Revo 5km Navigated flight on a MultiRotor
C: RoddersNZ
D: September 2014
V: https://www.youtube.com/watch?v=DYawRGz5KYM
M: First Revo 6km Navigated flight on a MultiRotor
C: C:
D: D:
V: V:
M: First Revo 5km Navigated flight on a MultiRotor M: First Revo 7km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo 8km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo 9km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo 10km Navigated flight on a MultiRotor
C:
D:
V:
M: First Revo Position Hold on a Heli
C: C:
D: D:
V: V:
@ -205,23 +246,8 @@ C:
D: D:
V: V:
M: First Auto spot landing on a fixed Wing using Revo
C:
D:
V:
M: First Auto take-off on a MultiRotor using Revo
C:
D:
V:
M: First Auto landing on a MultiRotor using Revo M: First Auto landing on a MultiRotor using Revo
C: Sami (please complete details) C: Sami
D:
V:
M: First Auto take-off on a Heli using Revo
C:
D: D:
V: V:

3
ground/openpilotgcs/openpilotgcs.pri
View File

@ -97,7 +97,8 @@ macx {
GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools) TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..) QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..)
equals(QT_INSTALL_DIR, $$TOOLS_DIR) { equals(QT_INSTALL_DIR, $$TOOLS_DIR) {
copyqt = 1 copyqt = 1

112
ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user
View File

@ -1,112 +0,0 @@
<!DOCTYPE QtCreatorProject>
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value key="EditorConfiguration.Codec" type="QByteArray">System</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
<value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
<value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
<valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
</valuemap>
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
<valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
<value type="QString">clean</value>
</valuelist>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/jcotton81/Documents/Programming/OpenPilot/ground/src/plugins/gcscontrol/sdlgamepad-build-desktop</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
</valuemap>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
<valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
</valuemap>
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
<valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
<value type="QString">clean</value>
</valuelist>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/Users/jcotton81/Documents/Programming/OpenPilot/ground/src/plugins/gcscontrol/sdlgamepad-build-desktop</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
</valuemap>
<value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
<valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
<valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" type="QVariantList"/>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase" type="int">2</value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.Executable" type="QString"></value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal" type="bool">false</value>
<valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.UserName" type="QString"></value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.UserSetName" type="bool">false</value>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory" type="QString">$BUILDDIR</value>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Custom Executable</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.CustomExecutableRunConfiguration</value>
</valuemap>
<value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">4</value>
</data>
</qtcreator>

12
shared/uavobjectdefinition/ekfconfiguration.xml
View File

@ -24,8 +24,8 @@
</field> </field>
<field name="Q" units="1^2" type="float" defaultvalue=" <field name="Q" units="1^2" type="float" defaultvalue="
0.01, 0.01, 0.01, 0.01, 0.01, 0.01,
0.1, 0.1, 0.1, 0.01, 0.01, 0.01,
0.0000001, 0.0000001, 0.0000001"> 0.000001, 0.000001, 0.000001">
<elementnames> <elementnames>
<elementname>GyroX</elementname> <elementname>GyroX</elementname>
<elementname>GyroY</elementname> <elementname>GyroY</elementname>
@ -39,10 +39,10 @@
</elementnames> </elementnames>
</field> </field>
<field name="R" units="1^2" type="float" defaultvalue=" <field name="R" units="1^2" type="float" defaultvalue="
10, 10, 1000, 1, 1, 1000000,
1, 1, 1, 0.001, 0.001, 0.001,
5000, 5000, 5000, 10, 10, 10,
1"> 0.01">
<elementnames> <elementnames>
<elementname>GPSPosNorth</elementname> <elementname>GPSPosNorth</elementname>
<elementname>GPSPosEast</elementname> <elementname>GPSPosEast</elementname>