rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Last minute default settings refinement.

Browse Source 
CC Attitude UI improvement.
This commit is contained in:
elafargue 2011-05-13 08:24:34 +02:00
parent d2cf5529bf
commit f9212cda7b
2 changed files with 145 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
ground/openpilotgcs/src/plugins/config/ccattitude.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>343</height>
<width>415</width>
<height>349</height>
</rect>
</property>
<property name="windowTitle">
@ -159,86 +159,86 @@
<property name="title">
<string>Attitude Calibration</string>
</property>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>371</width>
<height>111</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Place aircraft flat before computing</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="status">
<property name="text">
<string>Click &quot;Zero Accel Bias&quot; to start</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="zeroBias">
<property name="toolTip">
<string>Launch horizontal calibration.</string>
</property>
<property name="text">
<string>Zero Accel Bias</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="zeroBiasProgress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Place aircraft flat before computing</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="status">
<property name="text">
<string>Click &quot;Zero Accel Bias&quot; to start</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>4</number>
</property>
<item>
<widget class="QPushButton" name="zeroBias">
<property name="toolTip">
<string>Launch horizontal calibration.</string>
</property>
<property name="text">
<string>Zero Accel Bias</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="zeroBiasProgress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>

98
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.ini
View File

@ -70,7 +70,6 @@ Mode1\splitter\side0\side1\splitterOrientation=1
Mode1\splitter\side0\side1\splitterSizes=304, 433
Mode1\splitter\side0\side1\side0\type=uavGadget
Mode1\splitter\side0\side1\side0\classId=ModelViewGadget
Mode1\splitter\side0\side1\side0\gadget\activeConfiguration=Test Quad X
Mode1\splitter\side0\side1\side1\type=splitter
Mode1\splitter\side0\side1\side1\splitterOrientation=2
Mode1\splitter\side0\side1\side1\splitterSizes=293, 64
@ -151,18 +150,18 @@ Mode1\splitter\side1\side1\side1\side1\splitterOrientation=1
Mode1\splitter\side1\side1\side1\side1\splitterSizes=64, 376
Mode1\splitter\side1\side1\side1\side1\side0\type=uavGadget
Mode1\splitter\side1\side1\side1\side1\side0\classId=LineardialGadget
Mode1\splitter\side1\side1\side1\side1\side0\gadget\activeConfiguration=Roll
Mode1\splitter\side1\side1\side1\side1\side0\gadget\activeConfiguration=Roll Desired
Mode1\splitter\side1\side1\side1\side1\side1\type=splitter
Mode1\splitter\side1\side1\side1\side1\side1\splitterOrientation=1
Mode1\splitter\side1\side1\side1\side1\side1\splitterSizes=64, 311
Mode1\splitter\side1\side1\side1\side1\side1\side0\type=uavGadget
Mode1\splitter\side1\side1\side1\side1\side1\side0\classId=LineardialGadget
Mode1\splitter\side1\side1\side1\side1\side1\side0\gadget\activeConfiguration=Pitch
Mode1\splitter\side1\side1\side1\side1\side1\side0\gadget\activeConfiguration=Pitch Desired
Mode1\splitter\side1\side1\side1\side1\side1\side1\type=uavGadget
Mode1\splitter\side1\side1\side1\side1\side1\side1\classId=LineardialGadget
Mode1\splitter\side1\side1\side1\side1\side1\side1\gadget\activeConfiguration=Yaw
Mode1\splitter\side1\side1\side1\side1\side1\side1\gadget\activeConfiguration=Yaw Desired
Mode2\version=UAVGadgetManagerV1
Mode2\showToolbars=true
Mode2\showToolbars=false
Mode2\splitter\type=splitter
Mode2\splitter\splitterOrientation=1
Mode2\splitter\splitterSizes=734, 631
@ -181,15 +180,7 @@ Mode2\splitter\side0\side1\side0\gadget\activeConfiguration=Telemetry RX Rate Ho
Mode2\splitter\side0\side1\side1\type=uavGadget
Mode2\splitter\side0\side1\side1\classId=LineardialGadget
Mode2\splitter\side0\side1\side1\gadget\activeConfiguration=Telemetry TX Rate Horizontal
Mode2\splitter\side1\type=splitter
Mode2\splitter\side1\splitterOrientation=2
Mode2\splitter\side1\splitterSizes=433, 347
Mode2\splitter\side1\side0\type=uavGadget
Mode2\splitter\side1\side0\classId=UAVObjectBrowser
Mode2\splitter\side1\side0\gadget\activeConfiguration=default
Mode2\splitter\side1\side1\type=uavGadget
Mode2\splitter\side1\side1\classId=GCSControlGadget
Mode2\splitter\side1\side1\gadget\activeConfiguration=MS Sidewinder
Mode2\splitter\side1\type=uavGadget
Mode3\version=UAVGadgetManagerV1
Mode3\showToolbars=false
Mode3\splitter\type=splitter
@ -203,7 +194,6 @@ Mode3\splitter\side1\splitterOrientation=2
Mode3\splitter\side1\splitterSizes=395, 236
Mode3\splitter\side1\side0\type=uavGadget
Mode3\splitter\side1\side0\classId=ModelViewGadget
Mode3\splitter\side1\side0\gadget\activeConfiguration=Test Quad X
Mode3\splitter\side1\side1\type=splitter
Mode3\splitter\side1\side1\splitterOrientation=1
Mode3\splitter\side1\side1\splitterSizes=@Invalid()
@ -266,7 +256,7 @@ Mode5\splitter\side0\side1\side1\side0\splitterOrientation=1
Mode5\splitter\side0\side1\side1\side0\splitterSizes=@Invalid()
Mode5\splitter\side0\side1\side1\side0\side0\type=uavGadget
Mode5\splitter\side0\side1\side1\side0\side0\classId=LineardialGadget
Mode5\splitter\side0\side1\side1\side0\side0\gadget\activeConfiguration=PitchDesired
Mode5\splitter\side0\side1\side1\side0\side0\gadget\activeConfiguration=Pitch Desired
Mode5\splitter\side0\side1\side1\side0\side1\type=uavGadget
Mode5\splitter\side0\side1\side1\side0\side1\classId=LineardialGadget
Mode5\splitter\side0\side1\side1\side0\side1\gadget\activeConfiguration=PitchActual
@ -299,6 +289,10 @@ Mode6\splitter\side1\side0\side1\gadget\activeConfiguration=raw
Mode6\splitter\side1\side1\type=uavGadget
Mode6\splitter\side1\side1\classId=ScopeGadget
Mode6\splitter\side1\side1\gadget\activeConfiguration=Uptimes
Mode1\splitter\side0\side1\side0\gadget\activeConfiguration=Test Quad X
Mode2\splitter\side1\classId=UAVObjectBrowser
Mode2\splitter\side1\gadget\activeConfiguration=default
Mode3\splitter\side1\side0\gadget\activeConfiguration=Test Quad X
[KeyBindings]
size=0
@ -307,8 +301,8 @@ size=0
SaveSettingsOnExit=true
TerminalEmulator=xterm -e
LastPreferenceCategory=LineardialGadget
LastPreferencePage=PitchCommand
SettingsWindowWidth=780
LastPreferencePage=Roll Desired 1
SettingsWindowWidth=921
SettingsWindowHeight=534
[UAVGadgetConfigurations]
@ -1256,23 +1250,6 @@ LineardialGadget\PitchActual\data\factor=1
LineardialGadget\PitchActual\data\useOpenGLFlag=false
LineardialGadget\PitchActual\configInfo\version=0.0.0
LineardialGadget\PitchActual\configInfo\locked=false
LineardialGadget\PitchDesired\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
LineardialGadget\PitchDesired\data\sourceDataObject=ActuatorDesired
LineardialGadget\PitchDesired\data\sourceObjectField=Pitch
LineardialGadget\PitchDesired\data\minValue=-1
LineardialGadget\PitchDesired\data\maxValue=1
LineardialGadget\PitchDesired\data\redMin=0
LineardialGadget\PitchDesired\data\redMax=1
LineardialGadget\PitchDesired\data\yellowMin=0.1
LineardialGadget\PitchDesired\data\yellowMax=0.9
LineardialGadget\PitchDesired\data\greenMin=0.3
LineardialGadget\PitchDesired\data\greenMax=0.8
LineardialGadget\PitchDesired\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
LineardialGadget\PitchDesired\data\decimalPlaces=2
LineardialGadget\PitchDesired\data\factor=1
LineardialGadget\PitchDesired\data\useOpenGLFlag=false
LineardialGadget\PitchDesired\configInfo\version=0.0.0
LineardialGadget\PitchDesired\configInfo\locked=false
LineardialGadget\Roll\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
LineardialGadget\Roll\data\sourceDataObject=ManualControlCommand
LineardialGadget\Roll\data\sourceObjectField=Roll
@ -1444,6 +1421,23 @@ LineardialGadget\Pitch\data\factor=1
LineardialGadget\Pitch\data\useOpenGLFlag=false
LineardialGadget\Pitch\configInfo\version=0.0.0
LineardialGadget\Pitch\configInfo\locked=false
LineardialGadget\Pitch%20Desired\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
LineardialGadget\Pitch%20Desired\data\sourceDataObject=ActuatorDesired
LineardialGadget\Pitch%20Desired\data\sourceObjectField=Pitch
LineardialGadget\Pitch%20Desired\data\minValue=-1
LineardialGadget\Pitch%20Desired\data\maxValue=1
LineardialGadget\Pitch%20Desired\data\redMin=-1
LineardialGadget\Pitch%20Desired\data\redMax=1
LineardialGadget\Pitch%20Desired\data\yellowMin=-0.8
LineardialGadget\Pitch%20Desired\data\yellowMax=0.8
LineardialGadget\Pitch%20Desired\data\greenMin=-0.5
LineardialGadget\Pitch%20Desired\data\greenMax=0.5
LineardialGadget\Pitch%20Desired\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
LineardialGadget\Pitch%20Desired\data\decimalPlaces=2
LineardialGadget\Pitch%20Desired\data\factor=1
LineardialGadget\Pitch%20Desired\data\useOpenGLFlag=false
LineardialGadget\Pitch%20Desired\configInfo\version=0.0.0
LineardialGadget\Pitch%20Desired\configInfo\locked=false
OPMapGadget\Google%20Sat\data\cacheLocation=%%STOREPATH%%mapscache/
OPMapGadget\Google%20Sat\configInfo\version=0.0.0
OPMapGadget\Google%20Sat\configInfo\locked=false
@ -1881,6 +1875,40 @@ Uploader\default\data\defaultStopBits=0
Uploader\default\data\defaultPort=/dev/ttyS0
Uploader\default\configInfo\version=0.0.0
Uploader\default\configInfo\locked=false
LineardialGadget\Roll%20Desired\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
LineardialGadget\Roll%20Desired\data\sourceDataObject=ActuatorDesired
LineardialGadget\Roll%20Desired\data\sourceObjectField=Roll
LineardialGadget\Roll%20Desired\data\minValue=-1
LineardialGadget\Roll%20Desired\data\maxValue=1
LineardialGadget\Roll%20Desired\data\redMin=-1
LineardialGadget\Roll%20Desired\data\redMax=1
LineardialGadget\Roll%20Desired\data\yellowMin=-0.8
LineardialGadget\Roll%20Desired\data\yellowMax=0.8
LineardialGadget\Roll%20Desired\data\greenMin=-0.5
LineardialGadget\Roll%20Desired\data\greenMax=0.5
LineardialGadget\Roll%20Desired\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
LineardialGadget\Roll%20Desired\data\decimalPlaces=2
LineardialGadget\Roll%20Desired\data\factor=1
LineardialGadget\Roll%20Desired\data\useOpenGLFlag=false
LineardialGadget\Roll%20Desired\configInfo\version=0.0.0
LineardialGadget\Roll%20Desired\configInfo\locked=false
LineardialGadget\Yaw%20Desired\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
LineardialGadget\Yaw%20Desired\data\sourceDataObject=ActuatorDesired
LineardialGadget\Yaw%20Desired\data\sourceObjectField=Yaw
LineardialGadget\Yaw%20Desired\data\minValue=-1
LineardialGadget\Yaw%20Desired\data\maxValue=1
LineardialGadget\Yaw%20Desired\data\redMin=-1
LineardialGadget\Yaw%20Desired\data\redMax=1
LineardialGadget\Yaw%20Desired\data\yellowMin=-0.8
LineardialGadget\Yaw%20Desired\data\yellowMax=0.8
LineardialGadget\Yaw%20Desired\data\greenMin=-0.5
LineardialGadget\Yaw%20Desired\data\greenMax=0.5
LineardialGadget\Yaw%20Desired\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
LineardialGadget\Yaw%20Desired\data\decimalPlaces=2
LineardialGadget\Yaw%20Desired\data\factor=1
LineardialGadget\Yaw%20Desired\data\useOpenGLFlag=false
LineardialGadget\Yaw%20Desired\configInfo\version=0.0.0
LineardialGadget\Yaw%20Desired\configInfo\locked=false
[Plugins]
SoundNotifyPlugin\data\Current\1\SoundCollectionPath=%%DATAPATH%%sounds