mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-01 18:29:16 +01:00
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
This commit is contained in:
commit
7b1f9bf14e
@ -2,23 +2,14 @@
|
|||||||
<General>
|
<General>
|
||||||
<AutoConnect>true</AutoConnect>
|
<AutoConnect>true</AutoConnect>
|
||||||
<AutoSelect>true</AutoSelect>
|
<AutoSelect>true</AutoSelect>
|
||||||
|
<Description>None</Description>
|
||||||
|
<Details>None</Details>
|
||||||
<ExpertMode>false</ExpertMode>
|
<ExpertMode>false</ExpertMode>
|
||||||
<OverrideLanguage>en_AU</OverrideLanguage>
|
<OverrideLanguage>en_AU</OverrideLanguage>
|
||||||
<SaveSettingsOnExit>true</SaveSettingsOnExit>
|
<SaveSettingsOnExit>true</SaveSettingsOnExit>
|
||||||
<UDPMirror>false</UDPMirror>
|
|
||||||
<Description>Default configuration</Description>
|
|
||||||
<Details>Default configuration built to work on all screen sizes</Details>
|
|
||||||
<StyleSheet>default</StyleSheet>
|
<StyleSheet>default</StyleSheet>
|
||||||
|
<UDPMirror>false</UDPMirror>
|
||||||
</General>
|
</General>
|
||||||
<IPconnection>
|
|
||||||
<Current>
|
|
||||||
<arr_1>
|
|
||||||
<Port>1</Port>
|
|
||||||
<UseTCP>0</UseTCP>
|
|
||||||
</arr_1>
|
|
||||||
<size>1</size>
|
|
||||||
</Current>
|
|
||||||
</IPconnection>
|
|
||||||
<KeyBindings>
|
<KeyBindings>
|
||||||
<size>0</size>
|
<size>0</size>
|
||||||
</KeyBindings>
|
</KeyBindings>
|
||||||
@ -45,49 +36,30 @@
|
|||||||
<data>
|
<data>
|
||||||
<Current>
|
<Current>
|
||||||
<arr_1>
|
<arr_1>
|
||||||
<CurrentLanguage>default</CurrentLanguage>
|
<CurrentLanguage></CurrentLanguage>
|
||||||
<DataObject>FlightStatus</DataObject>
|
<DataObject></DataObject>
|
||||||
<ExpireTimeout>0</ExpireTimeout>
|
<ExpireTimeout>0</ExpireTimeout>
|
||||||
<Mute>false</Mute>
|
<Mute>false</Mute>
|
||||||
<ObjectField>Armed</ObjectField>
|
<ObjectField></ObjectField>
|
||||||
<RangeLimit>0</RangeLimit>
|
<RangeLimit>0</RangeLimit>
|
||||||
<Repeat>0</Repeat>
|
<Repeat>0</Repeat>
|
||||||
<SayOrder>0</SayOrder>
|
<SayOrder>0</SayOrder>
|
||||||
<Sound1>armed</Sound1>
|
<Sound1></Sound1>
|
||||||
<Sound2></Sound2>
|
<Sound2></Sound2>
|
||||||
<Sound3></Sound3>
|
<Sound3></Sound3>
|
||||||
<SoundCollectionPath>%%DATAPATH%%sounds</SoundCollectionPath>
|
<SoundCollectionPath></SoundCollectionPath>
|
||||||
<Value1>Armed</Value1>
|
<Value1></Value1>
|
||||||
<Value2>0</Value2>
|
<Value2>0</Value2>
|
||||||
</arr_1>
|
</arr_1>
|
||||||
<size>1</size>
|
<size>1</size>
|
||||||
</Current>
|
</Current>
|
||||||
<EnableSound>true</EnableSound>
|
<EnableSound>false</EnableSound>
|
||||||
<listNotifies>
|
<listNotifies>
|
||||||
<arr_1>
|
<size>0</size>
|
||||||
<CurrentLanguage>default</CurrentLanguage>
|
|
||||||
<DataObject>FlightStatus</DataObject>
|
|
||||||
<ExpireTimeout>15</ExpireTimeout>
|
|
||||||
<Mute>false</Mute>
|
|
||||||
<ObjectField>Armed</ObjectField>
|
|
||||||
<RangeLimit>0</RangeLimit>
|
|
||||||
<Repeat>0</Repeat>
|
|
||||||
<SayOrder>0</SayOrder>
|
|
||||||
<Sound1>armed</Sound1>
|
|
||||||
<Sound2></Sound2>
|
|
||||||
<Sound3></Sound3>
|
|
||||||
<SoundCollectionPath>%%DATAPATH%%sounds</SoundCollectionPath>
|
|
||||||
<Value1>Armed</Value1>
|
|
||||||
<Value2>0</Value2>
|
|
||||||
</arr_1>
|
|
||||||
<size>1</size>
|
|
||||||
</listNotifies>
|
</listNotifies>
|
||||||
</data>
|
</data>
|
||||||
</SoundNotifyPlugin>
|
</SoundNotifyPlugin>
|
||||||
</Plugins>
|
</Plugins>
|
||||||
<SerialConnection>
|
|
||||||
<speed>57600</speed>
|
|
||||||
</SerialConnection>
|
|
||||||
<UAVGadgetConfigurations>
|
<UAVGadgetConfigurations>
|
||||||
<ConfigGadget>
|
<ConfigGadget>
|
||||||
<default>
|
<default>
|
||||||
@ -1673,6 +1645,7 @@
|
|||||||
<defaultZoom>2</defaultZoom>
|
<defaultZoom>2</defaultZoom>
|
||||||
<mapProvider>GoogleSatellite</mapProvider>
|
<mapProvider>GoogleSatellite</mapProvider>
|
||||||
<maxUpdateRate>2000</maxUpdateRate>
|
<maxUpdateRate>2000</maxUpdateRate>
|
||||||
|
<overlayOpacity>1</overlayOpacity>
|
||||||
<showTileGridLines>false</showTileGridLines>
|
<showTileGridLines>false</showTileGridLines>
|
||||||
<uavSymbol>mapquad.png</uavSymbol>
|
<uavSymbol>mapquad.png</uavSymbol>
|
||||||
<useMemoryCache>true</useMemoryCache>
|
<useMemoryCache>true</useMemoryCache>
|
||||||
@ -1692,6 +1665,7 @@
|
|||||||
<defaultZoom>2</defaultZoom>
|
<defaultZoom>2</defaultZoom>
|
||||||
<mapProvider>GoogleMap</mapProvider>
|
<mapProvider>GoogleMap</mapProvider>
|
||||||
<maxUpdateRate>2000</maxUpdateRate>
|
<maxUpdateRate>2000</maxUpdateRate>
|
||||||
|
<overlayOpacity>1</overlayOpacity>
|
||||||
<showTileGridLines>false</showTileGridLines>
|
<showTileGridLines>false</showTileGridLines>
|
||||||
<uavSymbol>airplanepip.png</uavSymbol>
|
<uavSymbol>airplanepip.png</uavSymbol>
|
||||||
<useMemoryCache>true</useMemoryCache>
|
<useMemoryCache>true</useMemoryCache>
|
||||||
@ -1711,6 +1685,7 @@
|
|||||||
<defaultZoom>2</defaultZoom>
|
<defaultZoom>2</defaultZoom>
|
||||||
<mapProvider>GoogleMap</mapProvider>
|
<mapProvider>GoogleMap</mapProvider>
|
||||||
<maxUpdateRate>2000</maxUpdateRate>
|
<maxUpdateRate>2000</maxUpdateRate>
|
||||||
|
<overlayOpacity>1</overlayOpacity>
|
||||||
<showTileGridLines>false</showTileGridLines>
|
<showTileGridLines>false</showTileGridLines>
|
||||||
<uavSymbol>mapquad.png</uavSymbol>
|
<uavSymbol>mapquad.png</uavSymbol>
|
||||||
<useMemoryCache>true</useMemoryCache>
|
<useMemoryCache>true</useMemoryCache>
|
||||||
@ -2551,7 +2526,6 @@
|
|||||||
<Mode3>
|
<Mode3>
|
||||||
<showToolbars>false</showToolbars>
|
<showToolbars>false</showToolbars>
|
||||||
<splitter>
|
<splitter>
|
||||||
<side0>
|
|
||||||
<side0>
|
<side0>
|
||||||
<classId>UAVObjectBrowser</classId>
|
<classId>UAVObjectBrowser</classId>
|
||||||
<gadget>
|
<gadget>
|
||||||
@ -2559,28 +2533,32 @@
|
|||||||
</gadget>
|
</gadget>
|
||||||
<type>uavGadget</type>
|
<type>uavGadget</type>
|
||||||
</side0>
|
</side0>
|
||||||
|
<side1>
|
||||||
|
<side0>
|
||||||
|
<side0>
|
||||||
|
<classId>LoggingGadget</classId>
|
||||||
|
<type>uavGadget</type>
|
||||||
|
</side0>
|
||||||
|
<side1>
|
||||||
|
<classId>GpsDisplayGadget</classId>
|
||||||
|
<gadget>
|
||||||
|
<activeConfiguration>Flight GPS</activeConfiguration>
|
||||||
|
</gadget>
|
||||||
|
<type>uavGadget</type>
|
||||||
|
</side1>
|
||||||
|
<splitterOrientation>2</splitterOrientation>
|
||||||
|
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAAcAAAAAIAAAHo)</splitterSizes>
|
||||||
|
<type>splitter</type>
|
||||||
|
</side0>
|
||||||
<side1>
|
<side1>
|
||||||
<classId>DebugGadget</classId>
|
<classId>DebugGadget</classId>
|
||||||
<type>uavGadget</type>
|
<type>uavGadget</type>
|
||||||
</side1>
|
</side1>
|
||||||
<splitterOrientation>1</splitterOrientation>
|
|
||||||
<splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
|
|
||||||
<type>splitter</type>
|
|
||||||
</side0>
|
|
||||||
<side1>
|
|
||||||
<side0>
|
|
||||||
<classId>EmptyGadget</classId>
|
|
||||||
<type>uavGadget</type>
|
|
||||||
</side0>
|
|
||||||
<side1>
|
|
||||||
<classId>EmptyGadget</classId>
|
|
||||||
<type>uavGadget</type>
|
|
||||||
</side1>
|
|
||||||
<splitterOrientation>1</splitterOrientation>
|
|
||||||
<splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
|
|
||||||
<type>splitter</type>
|
|
||||||
</side1>
|
|
||||||
<splitterOrientation>2</splitterOrientation>
|
<splitterOrientation>2</splitterOrientation>
|
||||||
|
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAB3wAAAAIAAAEp)</splitterSizes>
|
||||||
|
<type>splitter</type>
|
||||||
|
</side1>
|
||||||
|
<splitterOrientation>1</splitterOrientation>
|
||||||
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAACJgAAAAIAAADo)</splitterSizes>
|
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAACJgAAAAIAAADo)</splitterSizes>
|
||||||
<type>splitter</type>
|
<type>splitter</type>
|
||||||
</splitter>
|
</splitter>
|
||||||
@ -2609,7 +2587,6 @@
|
|||||||
<type>splitter</type>
|
<type>splitter</type>
|
||||||
</side0>
|
</side0>
|
||||||
<side1>
|
<side1>
|
||||||
<side0>
|
|
||||||
<side0>
|
<side0>
|
||||||
<classId>ScopeGadget</classId>
|
<classId>ScopeGadget</classId>
|
||||||
<gadget>
|
<gadget>
|
||||||
@ -2625,14 +2602,6 @@
|
|||||||
<type>uavGadget</type>
|
<type>uavGadget</type>
|
||||||
</side1>
|
</side1>
|
||||||
<splitterOrientation>2</splitterOrientation>
|
<splitterOrientation>2</splitterOrientation>
|
||||||
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAABhgAAAAIAAAEO)</splitterSizes>
|
|
||||||
<type>splitter</type>
|
|
||||||
</side0>
|
|
||||||
<side1>
|
|
||||||
<classId>LoggingGadget</classId>
|
|
||||||
<type>uavGadget</type>
|
|
||||||
</side1>
|
|
||||||
<splitterOrientation>2</splitterOrientation>
|
|
||||||
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAClQAAAAIAAAB3)</splitterSizes>
|
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAClQAAAAIAAAB3)</splitterSizes>
|
||||||
<type>splitter</type>
|
<type>splitter</type>
|
||||||
</side1>
|
</side1>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user