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

Added the Gaui and Scorpion 3D models, and updated the default settings file accordingly.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2389 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-01-12 12:54:19 +00:00 committed by edouard
parent dda5d55ffa
commit 49718aabf4
7 changed files with 108 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ground/share/openpilotgcs/models/multi/gaui_330x/gaui_330x.3ds Executable file
View File

Binary file not shown.

BIN
ground/share/openpilotgcs/models/multi/gaui_330x/gaui_330x.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 KiB

BIN
ground/share/openpilotgcs/models/multi/gaui_330x/texture.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
ground/share/openpilotgcs/models/multi/scorpion_tricopter/scorpion_tricopter.3ds Executable file
View File

Binary file not shown.

BIN
ground/share/openpilotgcs/models/multi/scorpion_tricopter/scorpion_tricopter.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 115 KiB

BIN
ground/share/openpilotgcs/models/multi/scorpion_tricopter/texture.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 KiB

145
ground/src/plugins/coreplugin/OpenPilotGCS.ini
View File

@ -3,8 +3,8 @@ ViewGroup_Default=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5V\0\0\x2\x9a\0
[%General]
TerminalEmulator=xterm -e
LastPreferenceCategory=DialGadget
LastPreferencePage=Barometer
LastPreferenceCategory=Notify Plugin
LastPreferencePage=settings
SettingsWindowWidth=881
SettingsWindowHeight=569
WelcomeTab=0
@ -41,10 +41,10 @@ Current\size=1
[NotifyPlugin]
Current\1\SoundCollectionPath=%%DATAPATH%%sounds/
Current\1\CurrentLanguage=default
Current\1\ObjectField=InputMode
Current\1\DataObject=ManualControlSettings
Current\1\ObjectField=SatsInView
Current\1\DataObject=GPSSatellites
Current\1\Value=Less than
Current\1\ValueSpinBox=4
Current\1\ValueSpinBox=3
Current\1\Sound1=low gps quality
Current\1\Sound2=gps
Current\1\Sound3=
@ -52,26 +52,14 @@ Current\1\SayOrder=After first
Current\1\Repeat=Repeat Instantly
Current\1\ExpireTimeout=15
Current\size=1
listNotifies\size=1
EnableSound=true
listNotifies\1\SoundCollectionPath=%%DATAPATH%%sounds/
listNotifies\1\CurrentLanguage=default
listNotifies\1\ObjectField=SatsInView
listNotifies\1\DataObject=GPSSatellites
listNotifies\1\Value=Less than
listNotifies\1\ValueSpinBox=3
listNotifies\1\Sound1=low gps quality
listNotifies\1\Sound2=gps
listNotifies\1\Sound3=
listNotifies\1\SayOrder=After first
listNotifies\1\Repeat=Repeat 10 seconds
listNotifies\1\ExpireTimeout=15
listNotifies\size=0
EnableSound=false
[MainWindow]
Color=@Variant(\0\0\0\x43\x1\xff\xff\x66\x66\x66\x66\x66\x66\0\0)
Maximized=true
FullScreen=false
Geometry=@Rect(1 53 770 523)
Geometry=@Rect(0 29 770 523)
[KeyBindings]
size=0
@ -1177,8 +1165,8 @@ ModelViewGadget\Funjet\configInfo\version=0.0.0
ModelViewGadget\Funjet\configInfo\locked=false
ScopeGadget\Uptimes\data\configurationStreamVersion=1000
ScopeGadget\Uptimes\data\plotType=1
ScopeGadget\Uptimes\data\dataSize=20
ScopeGadget\Uptimes\data\refreshInterval=100
ScopeGadget\Uptimes\data\dataSize=240
ScopeGadget\Uptimes\data\refreshInterval=800
ScopeGadget\Uptimes\data\plotCurveCount=2
ScopeGadget\Uptimes\data\plotCurve0\uavObject=AhrsStatus
ScopeGadget\Uptimes\data\plotCurve0\uavField=RunningTime
@ -1315,7 +1303,7 @@ HITL\XPlane%20HITL\configInfo\locked=false
ScopeGadget\AccelFiltered\data\configurationStreamVersion=1000
ScopeGadget\AccelFiltered\data\plotType=1
ScopeGadget\AccelFiltered\data\dataSize=60
ScopeGadget\AccelFiltered\data\refreshInterval=500
ScopeGadget\AccelFiltered\data\refreshInterval=100
ScopeGadget\AccelFiltered\data\plotCurveCount=3
ScopeGadget\AccelFiltered\data\plotCurve0\uavObject=AttitudeRaw
ScopeGadget\AccelFiltered\data\plotCurve0\uavField=accels_filtered-X
@ -1463,9 +1451,98 @@ DialGadget\Barometer\data\needle3Factor=1
DialGadget\Barometer\data\needle1Move=Rotate
DialGadget\Barometer\data\needle2Move=Rotate
DialGadget\Barometer\data\needle3Move=Rotate
DialGadget\Barometer\data\font="Arial,12,-1,5,50,0,0,0,0,0"
DialGadget\Barometer\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
DialGadget\Barometer\configInfo\version=0.0.0
DialGadget\Barometer\configInfo\locked=false
ScopeGadget\Stacks%20monitor\data\configurationStreamVersion=1000
ScopeGadget\Stacks%20monitor\data\plotType=1
ScopeGadget\Stacks%20monitor\data\dataSize=240
ScopeGadget\Stacks%20monitor\data\refreshInterval=1000
ScopeGadget\Stacks%20monitor\data\plotCurveCount=12
ScopeGadget\Stacks%20monitor\data\plotCurve0\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve0\uavField=StackRemaining-System
ScopeGadget\Stacks%20monitor\data\plotCurve0\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve0\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve0\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve0\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve1\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve1\uavField=StackRemaining-Actuator
ScopeGadget\Stacks%20monitor\data\plotCurve1\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve1\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve1\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve1\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve2\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve2\uavField=StackRemaining-TelemetryTx
ScopeGadget\Stacks%20monitor\data\plotCurve2\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve2\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve2\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve2\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve3\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve3\uavField=StackRemaining-TelemetryTxPri
ScopeGadget\Stacks%20monitor\data\plotCurve3\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve3\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve3\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve3\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve4\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve4\uavField=StackRemaining-TelemetryRx
ScopeGadget\Stacks%20monitor\data\plotCurve4\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve4\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve4\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve4\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve5\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve5\uavField=StackRemaining-GPS
ScopeGadget\Stacks%20monitor\data\plotCurve5\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve5\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve5\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve5\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve6\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve6\uavField=StackRemaining-ManualControl
ScopeGadget\Stacks%20monitor\data\plotCurve6\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve6\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve6\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve6\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve7\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve7\uavField=StackRemaining-Altitude
ScopeGadget\Stacks%20monitor\data\plotCurve7\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve7\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve7\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve7\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve8\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve8\uavField=StackRemaining-AHRSComms
ScopeGadget\Stacks%20monitor\data\plotCurve8\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve8\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve8\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve8\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve9\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve9\uavField=StackRemaining-Stabilization
ScopeGadget\Stacks%20monitor\data\plotCurve9\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve9\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve9\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve9\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve10\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve10\uavField=StackRemaining-Guidance
ScopeGadget\Stacks%20monitor\data\plotCurve10\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve10\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve10\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve10\yMaximum=0
ScopeGadget\Stacks%20monitor\data\plotCurve11\uavObject=TaskInfo
ScopeGadget\Stacks%20monitor\data\plotCurve11\uavField=StackRemaining-Watchdog
ScopeGadget\Stacks%20monitor\data\plotCurve11\color=4294945280
ScopeGadget\Stacks%20monitor\data\plotCurve11\yScalePower=0
ScopeGadget\Stacks%20monitor\data\plotCurve11\yMinimum=0
ScopeGadget\Stacks%20monitor\data\plotCurve11\yMaximum=0
ScopeGadget\Stacks%20monitor\configInfo\version=0.0.0
ScopeGadget\Stacks%20monitor\configInfo\locked=false
ModelViewGadget\Gaui%20330X\data\acFilename=%%DATAPATH%%models/multi/gaui_330x/gaui_330x.3ds
ModelViewGadget\Gaui%20330X\data\bgFilename=%%DATAPATH%%models/backgrounds/default_background.png
ModelViewGadget\Gaui%20330X\data\enableVbo=false
ModelViewGadget\Gaui%20330X\configInfo\version=0.0.0
ModelViewGadget\Gaui%20330X\configInfo\locked=false
ModelViewGadget\Scorpion%20Tricopter\data\acFilename=%%DATAPATH%%models/multi/scorpion_tricopter/scorpion_tricopter.3ds
ModelViewGadget\Scorpion%20Tricopter\data\bgFilename=%%DATAPATH%%models/backgrounds/default_background.png
ModelViewGadget\Scorpion%20Tricopter\data\enableVbo=false
ModelViewGadget\Scorpion%20Tricopter\configInfo\version=0.0.0
ModelViewGadget\Scorpion%20Tricopter\configInfo\locked=false
[UAVGadgetManager]
Mode1\version=UAVGadgetManagerV1
@ -1511,7 +1588,7 @@ Mode2\version=UAVGadgetManagerV1
Mode2\showToolbars=false
Mode2\splitter\type=splitter
Mode2\splitter\splitterOrientation=1
Mode2\splitter\splitterSizes=715, 650
Mode2\splitter\splitterSizes=661, 704
Mode2\splitter\side0\type=splitter
Mode2\splitter\side1\type=splitter
Mode3\version=UAVGadgetManagerV1
@ -1652,7 +1729,7 @@ Mode4\splitter\side1\side0\gadget\activeConfiguration=Test Quad X
Mode4\splitter\side0\gadget\activeConfiguration=default
Mode5\splitter\splitterOrientation=1
Mode5\splitter\splitterSizes=653, 660
Mode5\splitter\side0\type=splitter
Mode5\splitter\side0\type=uavGadget
Mode5\splitter\side1\type=splitter
Mode2\splitter\side0\splitterOrientation=2
Mode2\splitter\side0\splitterSizes=565, 66
@ -1663,7 +1740,7 @@ Mode5\splitter\side1\splitterOrientation=2
Mode5\splitter\side1\splitterSizes=437, 194
Mode5\splitter\side1\side0\type=uavGadget
Mode5\splitter\side1\side0\classId=ScopeGadget
Mode5\splitter\side1\side0\gadget\activeConfiguration=Raw Gyros
Mode5\splitter\side1\side0\gadget\activeConfiguration=Uptimes
Mode5\splitter\side1\side1\type=splitter
Mode5\splitter\side1\side1\splitterOrientation=1
Mode5\splitter\side1\side1\splitterSizes=194, 464
@ -1675,12 +1752,6 @@ Mode5\splitter\side1\side1\side1\splitterOrientation=1
Mode5\splitter\side1\side1\side1\splitterSizes=273, 207
Mode5\splitter\side1\side1\side1\side0\type=uavGadget
Mode5\splitter\side1\side1\side1\side1\type=splitter
Mode5\splitter\side0\splitterOrientation=2
Mode5\splitter\side0\splitterSizes=316, 315
Mode5\splitter\side0\side0\type=uavGadget
Mode5\splitter\side0\side0\classId=ScopeGadget
Mode5\splitter\side0\side0\gadget\activeConfiguration=Raw magnetometers
Mode5\splitter\side0\side1\type=uavGadget
Mode5\splitter\side1\side1\side1\side1\splitterOrientation=2
Mode5\splitter\side1\side1\side1\side1\splitterSizes=122, 64
Mode5\splitter\side1\side1\side1\side1\side0\type=uavGadget
@ -1740,7 +1811,7 @@ Mode6\version=UAVGadgetManagerV1
Mode6\showToolbars=false
Mode6\splitter\type=splitter
Mode6\splitter\splitterOrientation=1
Mode6\splitter\splitterSizes=641, 724
Mode6\splitter\splitterSizes=780, 585
Mode6\splitter\side0\type=splitter
Mode6\splitter\side0\splitterOrientation=2
Mode6\splitter\side0\splitterSizes=361, 270
@ -1772,7 +1843,7 @@ Mode6\splitter\side0\side1\side1\side0\side1\type=uavGadget
Mode6\splitter\side0\side1\side1\side0\side1\classId=LineardialGadget
Mode6\splitter\side0\side1\side1\side0\side1\gadget\activeConfiguration=PitchActual
Mode2\splitter\side1\splitterOrientation=2
Mode2\splitter\side1\splitterSizes=232, 399
Mode2\splitter\side1\splitterSizes=259, 372
Mode2\splitter\side1\side0\type=uavGadget
Mode2\splitter\side1\side0\classId=UAVObjectBrowser
Mode2\splitter\side1\side0\gadget\activeConfiguration=default
@ -1785,6 +1856,6 @@ Mode3\splitter\side0\side0\side1\side1\classId=DialGadget
Mode3\splitter\side0\side0\side1\side1\gadget\activeConfiguration=Barometer
Mode3\splitter\side0\side1\side1\side1\classId=DialGadget
Mode3\splitter\side0\side1\side1\side1\gadget\activeConfiguration=Deluxe Barometer
Mode5\splitter\side0\side1\classId=ScopeGadget
Mode5\splitter\side0\side1\gadget\activeConfiguration=Raw Accels
Mode5\splitter\side1\side1\side1\side0\classId=EmptyGadget
Mode5\splitter\side0\classId=ScopeGadget
Mode5\splitter\side0\gadget\activeConfiguration=AccelFiltered