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

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

Browse Source
This commit is contained in:
David Ankers 2012-07-29 01:54:51 +10:00
commit deefe31546
3 changed files with 21 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/plugins/config/camerastabilization.ui
View File

@ -131,8 +131,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>790</width>
<height>648</height>
<width>792</width>
<height>630</height>
</rect>
</property>
<property name="autoFillBackground">
@ -176,7 +176,7 @@
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>After enabling the module, you must power cycle before using and configuring.</string>
<string>After configuring you must power cycle your board before using and configuring</string>
</property>
</widget>
</item>

265
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

@ -600,47 +600,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>756</width>
<height>817</height>
<width>758</width>
<height>806</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_137">
<property name="minimumSize">
<size>
<width>0</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Rate Stabilization (Inner Loop)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_15">
<property name="sizePolicy">
@ -662,14 +629,14 @@
</size>
</property>
<property name="title">
<string/>
<string>Rate Stabilization (Inner Loop)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_16">
<property name="horizontalSpacing">
<number>-1</number>
<number>6</number>
</property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0">
@ -3538,39 +3505,6 @@ value as the Kp.</string>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_149">
<property name="minimumSize">
<size>
<width>0</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Attitude Stabilization (Outer Loop)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_17">
<property name="sizePolicy">
@ -4109,7 +4043,7 @@ value as the Kp.</string>
<bool>false</bool>
</property>
<property name="title">
<string/>
<string>Attitude Stabilization (Outer Loop)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -6905,39 +6839,6 @@ border-radius: 5;</string>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_161">
<property name="minimumSize">
<size>
<width>0</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Stick Range and Limits</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_19">
<property name="sizePolicy">
@ -7473,7 +7374,7 @@ border-radius: 5;</string>
</palette>
</property>
<property name="title">
<string/>
<string>Stick Range and Limits</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -10744,8 +10645,8 @@ automatically every 300ms, which will help for fast tuning.</string>
<rect>
<x>0</x>
<y>0</y>
<width>470</width>
<height>914</height>
<width>758</width>
<height>806</height>
</rect>
</property>
<property name="autoFillBackground">
@ -10753,41 +10654,8 @@ automatically every 300ms, which will help for fast tuning.</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<spacer name="horizontalSpacer_25">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_41">
<property name="minimumSize">
<size>
<width>241</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Rate Stabization Coefficients (Inner Loop)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_8">
<property name="sizePolicy">
@ -11323,7 +11191,7 @@ automatically every 300ms, which will help for fast tuning.</string>
</palette>
</property>
<property name="title">
<string/>
<string>Rate Stabization Coefficients (Inner Loop)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -14246,39 +14114,6 @@ value as the Kp.</string>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_35">
<property name="minimumSize">
<size>
<width>241</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Attitude Stabization Coefficients (Outer Loop)</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_4">
<property name="sizePolicy">
@ -14817,7 +14652,7 @@ value as the Kp.</string>
<bool>false</bool>
</property>
<property name="title">
<string/>
<string>Attitude Stabization Coefficients (Outer Loop)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -14829,7 +14664,7 @@ value as the Kp.</string>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="checkBox_2">
@ -17545,39 +17380,6 @@ border-radius: 5;</string>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_36">
<property name="minimumSize">
<size>
<width>180</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Stick Range and Limits</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_6">
<property name="sizePolicy">
@ -18113,7 +17915,7 @@ border-radius: 5;</string>
</palette>
</property>
<property name="title">
<string/>
<string>Stick Range and Limits</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -18122,7 +17924,7 @@ border-radius: 5;</string>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<item>
<spacer name="horizontalSpacer_14">
@ -20864,39 +20666,6 @@ rate(deg/s)</string>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<spacer name="horizontalSpacer_41">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_45">
<property name="minimumSize">
<size>
<width>180</width>
<height>16</height>
</size>
</property>
<property name="text">
<string>Sensor Tunning</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RateStabilizationGroup_23">
<property name="minimumSize">
@ -21429,7 +21198,7 @@ rate(deg/s)</string>
<bool>false</bool>
</property>
<property name="title">
<string/>
<string>Sensor Tuning</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -21438,7 +21207,7 @@ rate(deg/s)</string>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
<number>-1</number>
<number>6</number>
</property>
<item>
<spacer name="horizontalSpacer_40">

2
ground/openpilotgcs/src/plugins/uavsettingsimportexport/importsummarydialog.ui
View File

@ -101,7 +101,7 @@
then close the dialog.</string>
</property>
<property name="text">
<string>Save to Board Flash/SD</string>
<string>Save to Board Flash</string>
</property>
</widget>
</item>