rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release

Browse Source
This commit is contained in:
PT_Dreamer 2012-08-13 22:28:25 +01:00
commit 1c344bb4fe
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
View File

@ -2159,7 +2159,7 @@
<plotCurve0>
<color>4294901760</color>
<mathFunction>None</mathFunction>
<uavField>X</uavField>
<uavField>x</uavField>
<uavObject>Magnetometer</uavObject>
<yMaximum>0</yMaximum>
<yMeanSamples>1</yMeanSamples>
@ -2169,7 +2169,7 @@
<plotCurve1>
<color>4283782655</color>
<mathFunction>None</mathFunction>
<uavField>Y</uavField>
<uavField>y</uavField>
<uavObject>Magnetometer</uavObject>
<yMaximum>0</yMaximum>
<yMeanSamples>1</yMeanSamples>
@ -2179,7 +2179,7 @@
<plotCurve2>
<color>4283804160</color>
<mathFunction>None</mathFunction>
<uavField>Z</uavField>
<uavField>z</uavField>
<uavObject>Magnetometer</uavObject>
<yMaximum>0</yMaximum>
<yMeanSamples>1</yMeanSamples>

29
ground/openpilotgcs/src/plugins/config/airframe.ui
View File

@ -6,14 +6,17 @@
<rect>
<x>0</x>
<y>0</y>
<width>867</width>
<height>598</height>
<width>920</width>
<height>626</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<property name="bottomMargin">
<number>12</number>
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
@ -28,7 +31,7 @@
<number>12</number>
</property>
<property name="topMargin">
<number>0</number>
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
@ -128,8 +131,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>813</width>
<height>491</height>
<width>866</width>
<height>507</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -2745,8 +2748,8 @@ margin:1px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>813</width>
<height>455</height>
<width>866</width>
<height>483</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
@ -3190,18 +3193,18 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ConfigCcpmWidget</class>
<extends>QWidget</extends>
<header>cfg_vehicletypes/configccpmwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MixerCurve</class>
<extends>QWidget</extends>
<header location="global">mixercurve.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ConfigCcpmWidget</class>
<extends>QWidget</extends>
<header>cfg_vehicletypes/configccpmwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../coreplugin/core.qrc"/>