Merge remote-tracking branch 'remotes/pixhawk/v10release' into dev_senseSoarMavlinkv10

Conflicts:
	qgroundcontrol.pro
	src/comm/SerialLink.cc
	src/uas/QGCMAVLinkUASFactory.cc
	src/ui/CommConfigurationWindow.cc
	src/ui/MainWindow.cc
	src/ui/MainWindow.h
	src/ui/QGCParamWidget.h
	thirdParty/mavlink/include/mavlink_types.h

files/flightgear/Aircraft/Rascal110/Systems/ugear.nas

+var update_ugear = func( dt ) {
+    var max_zoom_rate = 10*dt;
+    var max_pan_rate = 30*dt;
+    var max_tilt_rate = 45*dt;
+
+    var ap_enable = props.globals.getNode("/ugear/settings/ap-enable");
+    if ( ap_enable == nil ) {
+	props.globals.initNode("/ugear/settings/ap-enable", 0, "BOOL", 1);
+        ap_enable = props.globals.getNode("/ugear/settings/ap-enable");
+    }
+    if ( ap_enable.getBoolValue() ) {
+	setprop( "/controls/flight/aileron", getprop("/ugear/act/aileron") );
+	setprop( "/controls/flight/elevator", getprop("/ugear/act/elevator") );
+    }
+
+    var turret_enable = props.globals.getNode("/ugear/settings/turret-enable");
+    if ( turret_enable == nil ) {
+	props.globals.initNode("/ugear/settings/turret-enable", 0, "BOOL", 1);
+        turret_enable = props.globals.getNode("/ugear/settings/turret-enable");
+    }
+
+    if ( (getprop("/sim/current-view/name") == "Camera View")
+         and turret_enable.getBoolValue() )
+    {
+        var target_zoom = getprop("/ugear/act/channel6");
+        var target_pan = -getprop("/ugear/act/channel7");
+        if ( target_pan < -180.0 ) { target_pan += 360.0; }
+        if ( target_pan > 180.0 ) { target_pan -= 360.0; }
+	var target_tilt = -getprop("/ugear/act/channel8");
+	var cur_zoom = getprop("/sim/current-view/field-of-view");
+	var cur_pan = getprop("/sim/current-view/heading-offset-deg");
+	var cur_tilt = getprop("/sim/current-view/pitch-offset-deg");
+	var diff = 0.0;
+
+	diff = target_zoom - cur_zoom;
+	if ( diff > max_zoom_rate ) { diff = max_zoom_rate; }
+        if ( diff < -max_zoom_rate ) { diff = -max_zoom_rate; }
+        setprop("/sim/current-view/field-of-view", cur_zoom + diff);
+
+	diff = target_pan - cur_pan;
+	if ( diff > 180 ) { diff -= 360; }
+        if ( diff < -180 ) { diff += 360; }
+	if ( diff > max_pan_rate ) { diff = max_pan_rate; }
+        if ( diff < -max_pan_rate ) { diff = -max_pan_rate; }
+        setprop("/sim/current-view/heading-offset-deg", cur_pan + diff);
+
+	diff = target_tilt - cur_tilt;
+	if ( diff > 90 ) { diff = 90; }
+        if ( diff < -90 ) { diff = -90; }
+	if ( diff > max_tilt_rate ) { diff = max_tilt_rate; }
+        if ( diff < -max_tilt_rate ) { diff = -max_tilt_rate; }
+        setprop("/sim/current-view/pitch-offset-deg", cur_tilt + diff);
+    }
+}

files/flightgear/Aircraft/Rascal110/initfile.xml

+<?xml version="1.0"?>
+<initialize name="reset00">
+  <ubody unit="FT/SEC"> 110.783 </ubody> 
+  <vbody unit="FT/SEC"> 5.03584 </vbody> 
+  <wbody unit="FT/SEC"> -0.226825 </wbody> 
+  <phi unit="DEG"> -2.16197 </phi>
+  <theta unit="DEG"> -1.06069 </theta>
+  <psi unit="DEG"> 2.95853 </psi>
+  <longitude unit="DEG"> 0 </longitude>
+  <latitude unit="DEG"> 0 </latitude>
+  <altitude unit="FT"> -0.401227 </altitude>
+</initialize>

files/flightgear/Aircraft/YardStick/Engines/Zenoah_G-26A.xml

+<?xml version="1.0"?>
+<!-- Zenoah G-26A -->
+<!-- 2.96 hp engine -->
+<!-- one horsepower equals 745.69987 Watts -->
+
+<electric_engine name="electric_1mw">
+  <power unit="WATTS">  2207.27 </power>
+</electric_engine>

files/flightgear/Aircraft/arducopter/Engines/a2830-12.xml

+<?xml version="1.0"?>
+<electric_engine name="a2830-12">
+  <power unit="WATTS">  187 </power>
+</electric_engine>

files/flightgear/Aircraft/arducopter/Models/quad.skp

 ໿SketchUp Model૿{8.0.4811}ꎻ᷻迕伝﮵쟴獯ÿ벲丨￿噃牥楳湯慍ｰ￾䌉䄀爀挀䌀甀爀瘀攀Ā＀￾䌊䄀琀琀爀椀戀甀琀攀＀￾䌓䄀琀琀爀椀戀甀琀攀䌀漀渀琀愀椀渀攀爀＀￾䌏䄀琀琀爀椀戀甀琀攀一愀洀攀搀Ā＀￾䌐䈀愀挀欀最爀漀甀渀搀䤀洀愀最攀਀＀￾䌇䌀愀洀攀爀愀Ԁ＀￾䌊䌀漀洀瀀漀渀攀渀琀଀＀￾䌒䌀漀洀瀀漀渀攀渀琀䈀攀栀愀瘀椀漀爀Ԁ＀￾䌔䌀漀洀瀀漀渀攀渀琀䐀攀昀椀渀椀琀椀漀渀਀＀￾䌒䌀漀洀瀀漀渀攀渀琀䤀渀猀琀愀渀挀攀Ѐ＀￾䌕䌀漀渀猀琀爀甀挀琀椀漀渀䜀攀漀洀攀琀爀礀＀￾䌑䌀漀渀猀琀爀甀挀琀椀漀渀䰀椀渀攀Ā＀￾䌒䌀漀渀猀琀爀甀挀琀椀漀渀倀漀椀渀琀＀￾䌆䌀甀爀瘀攀Ѐ＀￾䌏䐀攀昀椀渀椀琀椀漀渀䰀椀猀琀＀￾䌄䐀椀戀̀＀￾䌊䐀椀洀攀渀猀椀漀渀Ā＀￾䌐䐀椀洀攀渀猀椀漀渀䰀椀渀攀愀爀؀＀￾䌐䐀椀洀攀渀猀椀漀渀刀愀搀椀愀氀Ȁ＀￾䌏䐀椀洀攀渀猀椀漀渀匀琀礀氀攀Ѐ＀￾䌏䐀爀愀眀椀渀最䔀氀攀洀攀渀琀ऀ＀￾䌅䔀搀最攀Ȁ＀￾䌈䔀搀最攀唀猀攀Ā＀￾䌇䔀渀琀椀琀礀̀＀￾䌅䘀愀挀攀̀＀￾䌒䘀愀挀攀吀攀砀琀甀爀攀䌀漀漀爀搀猀Ѐ＀￾䌌䘀漀渀琀䴀愀渀愀最攀爀＀￾䌆䜀爀漀甀瀀Ā＀￾䌆䤀洀愀最攀Ā＀￾䌆䰀愀礀攀爀Ȁ＀￾䌍䰀愀礀攀爀䴀愀渀愀最攀爀Ѐ＀￾䌅䰀漀漀瀀Ā＀￾䌉䴀愀琀攀爀椀愀氀ఀ＀￾䌐䴀愀琀攀爀椀愀氀䴀愀渀愀最攀爀Ѐ＀￾䌉倀愀最攀䰀椀猀琀Ā＀￾䌋倀漀氀礀氀椀渀攀㌀搀＀￾䌍刀攀氀愀琀椀漀渀猀栀椀瀀＀￾䌐刀攀氀愀琀椀漀渀猀栀椀瀀䴀愀瀀＀￾䌑刀攀渀搀攀爀椀渀最伀瀀琀椀漀渀猀␀＀￾䌍匀攀挀琀椀漀渀倀氀愀渀攀Ȁ＀￾䌋匀栀愀搀漀眀䤀渀昀漀܀＀￾䌇匀欀䘀漀渀琀Ā＀￾䌉匀欀攀琀挀栀䌀匀＀￾䌎匀欀攀琀挀栀唀瀀䴀漀搀攀氀ᘀ＀￾䌍匀欀攀琀挀栀唀瀀倀愀最攀Ā＀￾䌉匀欀瀀匀琀礀氀攀Ā＀￾䌐匀欀瀀匀琀礀氀攀䴀愀渀愀最攀爀Ȁ＀￾䌅吀攀砀琀ऀ＀￾䌊吀攀砀琀匀琀礀氀攀Ԁ＀￾䌈吀攀砀琀甀爀攀؀＀￾䌊吀栀甀洀戀渀愀椀氀Ā＀￾䌇嘀攀爀琀攀砀＀￾䌉嘀椀攀眀倀愀最攀ఀ＀￾䌊圀愀琀攀爀洀愀爀欀Ā＀￾䌑圀愀琀攀爀洀愀爀欀䴀愀渀愀最攀爀Ȁ＀￾䔒渀搀ⴀ伀昀ⴀ嘀攀爀猀椀漀渀ⴀ䴀愀瀀Ā뀀Ā＀ϿЀ䌀楄Ѣ頀褀乐േᨊ