From 3146f7d1ab6d3d929a9cf87756d99faa2155d901 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Wed, 29 May 2002 19:12:25 +0000
Subject: [PATCH] Latest YASim aero models from Andy.

---
 Aircraft-yasim/747.xml     | 17 +++++++++++++++--
 Aircraft-yasim/a4.xml      | 19 +++++++++++++++----
 Aircraft-yasim/c172.xml    |  6 +++---
 Aircraft-yasim/c310.xml    |  4 ++--
 Aircraft-yasim/dc3.xml     |  6 +++++-
 Aircraft-yasim/harrier.xml | 19 ++++++++++++++++---
 6 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/Aircraft-yasim/747.xml b/Aircraft-yasim/747.xml
index ec9027824..feebe7638 100644
--- a/Aircraft-yasim/747.xml
+++ b/Aircraft-yasim/747.xml
@@ -34,15 +34,21 @@
   <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
   <control-input axis="/controls/slats" control="SLAT"/>
   <control-input axis="/controls/spoilers" control="SPOILER"/>
+  <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
+  <control-output control="FLAP1" side="left"
+		  prop="/surface-positions/left-aileron-pos-norm"/>
+  <control-output control="FLAP1" side="right"
+		  prop="/surface-positions/right-aileron-pos-norm"/>
   <control-speed control="FLAP0" transition-time="10"/>
 </wing>
 
 <hstab x="-62.63" y="1.81" z="1.81" chord="8.43" length="10.84" taper=".29"
-       sweep="28" dihedral="7">
+       sweep="28" dihedral="7" effectiveness="1.9">
   <stall aoa="15" width="2" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.5" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.4" drag="1.8"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
 <vstab x="-62.63" y="0.00" z="3.61" chord="12.04" length="12.04" taper="0.3"
@@ -51,6 +57,8 @@
   <flap0 start="0" end="1" lift="1.2" drag="1.3"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
+  <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
+		  min="1" max="-1"/>
 </vstab>
 
 <jet x="-34.93" y="16.26"  z="-1.20" mass="8000" thrust="60000">
@@ -72,30 +80,35 @@
 <gear x="-5.42"  y="0.00" z="-5.42" compression="2"> <!-- nose -->
   <control-input axis="/controls/rudder" control="STEER" square="true"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-29.15" y="5.42" z="-5.42" compression="2"> <!-- fwd left main -->
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-31.32" y="1.81" z="-5.42" compression="2"> <!-- rear left main -->
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-31.32" y="-1.81" z="-5.42" compression="2"> <!-- rear right main -->
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[3]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-29.15" y="-5.42" z="-5.42" compression="2"> <!-- fwd right main -->
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[4]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
diff --git a/Aircraft-yasim/a4.xml b/Aircraft-yasim/a4.xml
index 301a1c29a..507376bfd 100644
--- a/Aircraft-yasim/a4.xml
+++ b/Aircraft-yasim/a4.xml
@@ -23,25 +23,33 @@
       length="4.04" chord="3.95" sweep="28" dihedral="0" camber="0.1">
   <stall aoa="27" width="10" peak="1.3"/>
   <flap0 start="0.0" end="0.5" lift="1.5" drag="2.0"/>
-  <flap1 start="0.5" end="1.0" lift="1.15" drag="1.3"/>
+  <flap1 start="0.5" end="1.0" lift="1.25" drag="1.3"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
+  <control-input axis="/controls/aileron" control="FLAP1" split="true"/> 
+  <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
+  <control-output control="FLAP1" side="left"
+		  prop="/surface-positions/left-aileron-pos-norm"/>
+  <control-output control="FLAP1" side="right"
+		  prop="/surface-positions/right-aileron-pos-norm"/>
   <control-speed control="FLAP0" transition-time="5"/>
 </wing>
 
-<hstab x="-11.01" y="0" z="1.38" taper=".3" effectiveness="1.3"
+<hstab x="-11.01" y="0" z="1.38" taper=".3" effectiveness="1.99"
        length="2.02" chord="2.02" sweep="26">
   <stall aoa="27" width="10" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.7" drag="2.0"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
 <vstab x="-11.01" y="0" z="1.38" taper=".176"
-       length="2.57" chord="3.11" sweep="28">
+       length="2.57" chord="3.11" sweep="28" effectiveness="1.5">
   <stall aoa="27" width="10" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.15" drag="1.3"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
+		  min="1" max="-1"/>
 </vstab>
 
 <!-- NOTE: Skyhawks do NOT have afterburners.  This one does for
@@ -55,6 +63,7 @@
 <gear x="-2.29" y="0" z="-1.93" retract-time="7" compression=".96">
   <control-input axis="/controls/rudder" control="STEER" square="true"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
@@ -62,6 +71,7 @@
 <gear x="-7" y="1.19" z="-1.56" retract-time="7" compression=".78">
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
@@ -69,6 +79,7 @@
 <gear x="-7" y="-1.19" z="-1.56" retract-time="7" compression=".78">
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
diff --git a/Aircraft-yasim/c172.xml b/Aircraft-yasim/c172.xml
index cc1119104..23c4709eb 100644
--- a/Aircraft-yasim/c172.xml
+++ b/Aircraft-yasim/c172.xml
@@ -20,7 +20,7 @@
           width="1.5" taper="0.2" midpoint="0.3"/>
 
 <wing x="-2.47" y=".51" z=".68" taper=".78"
-      length="5.37" chord="1.54" sweep="0" dihedral="0" camber="0.1">
+      length="5.37" chord="1.54" sweep="0" dihedral="1" camber="0.1">
   <stall aoa="16" width="6" peak="1.5"/>
   <flap0 start="0" end=".38" lift="1.6" drag="2.0"/>
   <flap1 start=".78" end="1" lift="1.5" drag="1.6"/>
@@ -38,7 +38,7 @@
 <hstab x="-7.16" y="0.08" z=".17" taper=".63"
        length="1.71" chord="1.36" sweep="0">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.6" drag="1.8"/>
+  <flap0 start="0" end="1" lift="1.7" drag="2.0"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -57,7 +57,7 @@
 <propeller radius="1.0"
 	   cruise-speed="86" cruise-rpm="2200"
            cruise-alt="10000" cruise-power="99"
-           takeoff-power="134.5" takeoff-rpm="2100"
+           takeoff-power="140.8" takeoff-rpm="2200"
            eng-power="160" eng-rpm="2500"
            x="-.6" y="0" z="0" mass="400" moment="8">
   <actionpt x="0" y="0" z="0"/>
diff --git a/Aircraft-yasim/c310.xml b/Aircraft-yasim/c310.xml
index 716cd5a1e..fc9c475b9 100644
--- a/Aircraft-yasim/c310.xml
+++ b/Aircraft-yasim/c310.xml
@@ -43,9 +43,9 @@
 </wing>
 
 <hstab x="-8.33" y="0.22" z="0.07" length ="2.34" chord ="1.24"
-       sweep="0" dihedral="0" taper="0.6" camber="0.1">
+       sweep="0" dihedral="0" taper="0.6">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.5" drag="1.8"/>
+  <flap0 start="0" end="1" lift="1.68" drag="1.8"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
diff --git a/Aircraft-yasim/dc3.xml b/Aircraft-yasim/dc3.xml
index 8961cc0b2..1c5b719cd 100644
--- a/Aircraft-yasim/dc3.xml
+++ b/Aircraft-yasim/dc3.xml
@@ -47,7 +47,7 @@
 <hstab x="-18.12" y="0.41" z="0.27" length="3"
        chord="3" taper=".545" sweep="15">
   <stall aoa="14" width="3" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.5" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.5" drag="1.5"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -104,6 +104,8 @@
 <gear x="-6.08" y="2.52" z="-3.49" compression="1" retract-time="7">
   <control-input axis="/controls/parking-brake" control="BRAKE"/>
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
+  <control-input axis="/controls/rudder" control="BRAKE" square="1"
+	         src0="-1" src1="1" dst0="0.5" dst1="-0.5"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
@@ -112,6 +114,8 @@
 <gear x="-6.08" y="-2.52" z="-3.49" compression="1" retract-time="7">
   <control-input axis="/controls/parking-brake" control="BRAKE"/>
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
+  <control-input axis="/controls/rudder" control="BRAKE" square="1"
+                 src0="-1" src1="1" dst0="-0.5" dst1="0.5"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
diff --git a/Aircraft-yasim/harrier.xml b/Aircraft-yasim/harrier.xml
index d67c48cde..a86379a87 100644
--- a/Aircraft-yasim/harrier.xml
+++ b/Aircraft-yasim/harrier.xml
@@ -5,7 +5,7 @@
 <airplane mass="14052">
 
 <!-- Approach configuration -->
-<approach speed="130" aoa="11">
+<approach speed="160" aoa="11">
   <control-setting axis="/controls/throttle[0]" value="0.2"/>
   <control-setting axis="/controls/flaps" value="1.0"/>
   <control-setting axis="/controls/gear-down" value="1"/>
@@ -32,14 +32,20 @@
   <control-input axis="/controls/flaps" control="FLAP0"/>
   <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
   <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
+  <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
+  <control-output control="FLAP1" side="left"
+		  prop="/surface-positions/left-aileron-pos-norm"/>
+  <control-output control="FLAP1" side="right"
+		  prop="/surface-positions/right-aileron-pos-norm"/>
 </wing>
 
 <hstab x="-12.23" y="0.00" z="0.93" length="2.04" chord="1.48"
        taper=".313" sweep="24.5" dihedral="-12">
   <stall aoa="20" width="7" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.5" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.7" drag="2.0"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
 <vstab x="-12.51" y="0.00" z="1.20" length="2.78" chord="2.41"
@@ -48,12 +54,15 @@
   <flap0 start="0.12" end="0.88" lift="1.2" drag="1.5"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
+  <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
+		  min="1" max="-1"/>
 </vstab>
 
 <jet x="-6.12" y="0" z="0.56" mass="3000" thrust="21500" rotate="-90">
   <actionpt x="-7.5" y="0" z="0.7"/>
   <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
-  <control-input axis="/controls/thrust-vector[0]" control="VECTOR"/>
+  <control-input axis="/controls/mixture[0]" control="VECTOR"
+                 src0="0" src1="1" dst0="1" dst1="0"/>
 </jet>
 
 <!-- Harriers have little "reactor" jets to change the aircraft's
@@ -107,6 +116,7 @@
   <control-input axis="/controls/rudder" control="STEER" square="true"/>
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
@@ -114,17 +124,20 @@
 <gear x="-8.25" y="0.00" z="-1.5" compression="0.25">
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <!-- Wingtip gear -->
 <gear x="-8.90" y="3.24"  z="-1.5" compression="0.25">
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-8.90" y="-3.24" z="-1.5" compression="0.25">
   <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-output control="EXTEND" prop="/gear/gear[3]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>