Merge branch 'master' into ECAM2

A320-main.xml

@@ -405,7 +405,7 @@
 		
 		 <minimum-fg-version>2018.1.0</minimum-fg-version>
 	</sim>
-
+	
 	<consumables>
 		<fuel>
 			<tank n="0">
@@ -446,22 +446,40 @@
 			<max-lb type="double">440</max-lb>
 		</weight>
 		<weight n="1">
-			<name>Passengers</name>
+			<name>Forward Cabin</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
 			<min-lb type="double">0</min-lb>
-			<max-lb type="double">24360</max-lb>
+			<max-lb type="double">4649</max-lb>
 		</weight>
 		<weight n="2">
-			<name>Forward Cargo</name>
+			<name>Center Cabin</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
 			<min-lb type="double">0</min-lb>
-			<max-lb type="double">9400</max-lb>
+			<max-lb type="double">13949</max-lb>
 		</weight>
 		<weight n="3">
-			<name>Aft Cargo</name>
+			<name>Aft Cabin</name>
 			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
 			<min-lb type="double">0</min-lb>
-			<max-lb type="double">9400</max-lb>
+			<max-lb type="double">10462</max-lb>
+		</weight>
+		<weight n="4">
+			<name>Forward Cargo</name>
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]"/>
+			<min-lb type="double">0</min-lb>
+			<max-lb type="double">5000</max-lb>
+		</weight>
+		<weight n="5">
+			<name>Aft Cargo</name>
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[5]"/>
+			<min-lb type="double">0</min-lb>
+			<max-lb type="double">6662</max-lb>
+		</weight>
+		<weight n="6">
+			<name>Aft Bulk Cargo</name>
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[6]"/>
+			<min-lb type="double">0</min-lb>
+			<max-lb type="double">3285</max-lb>
 		</weight>
 	</payload>
 	

AircraftConfig/acconfig.nas

@@ -464,7 +464,7 @@ var takeoff = func {
 		var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {
 			if (getprop("/engines/engine[0]/state") == 3) {
 				removelistener(eng_one_chk_c);
-				setprop("/controls/lighting/strobe", 1);
+				setprop("/controls/switches/strobe", 0.5);
 				setprop("/controls/lighting/taxi-light-switch", 1);
 				setprop("/controls/lighting/landing-lights[1]", 1);
 				setprop("/controls/lighting/landing-lights[2]", 1);

AircraftConfig/update.xml

@@ -88,10 +88,28 @@
 			<halign>left</halign>
 			<label>You will need to restart FlightGear, and install the latest .zip file.</label>
 		</text>
+		
+		<hrule>
+			<color>
+				<red>1.0</red>
+				<green>1.0</green>
+				<blue>1.0</blue>
+				<alpha>0.95</alpha>
+			</color>
+		</hrule>
+		
 		<text>
 			<halign>left</halign>
 			<label>GIT users: Please press Remind Me Later, and run a "git pull" command. (or pull using GIT GUI)</label>
 		</text>
+		<text>
+			<halign>left</halign>
+			<label>Make sure you have cloned from either of the following: (git remote -v to check)</label>
+		</text>
+		<text>
+			<halign>left</halign>
+			<label>HTTP: http://www.github.com/it0uchpods/IDG-A32X.git or SSH: git@github.com:it0uchpods/IDG-A32X.git</label>
+		</text>
 	</group>
 	
 	<hrule>

Models/FlightDeck/a320.flightdeck.xml

@@ -630,7 +630,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>ParkBrk</object-name>
-		<property>controls/gear/brake-parking</property>
+		<property>fdm/jsbsim/fcs/brake-lever</property>
 		<factor>90</factor>
 		<axis>
 			<object-name>ParkBrk.axis</object-name>
@@ -1640,7 +1640,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>Lcutoff</object-name>
-		<property>controls/engines/engine[0]/cutoff-switch</property>
+		<property>fdm/jsbsim/fcs/engine-cutoff[0]</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>  0</dep></entry>
 			<entry><ind>1</ind><dep>-70</dep></entry>
@@ -1666,7 +1666,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>Rcutoff</object-name>
-		<property>controls/engines/engine[1]/cutoff-switch</property>
+		<property>fdm/jsbsim/fcs/engine-cutoff[1]</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>  0</dep></entry>
 			<entry><ind>1</ind><dep>-70</dep></entry>
@@ -4520,7 +4520,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>FlapsLever</object-name>
-		<property>controls/flight/flap-lever</property>
+		<property>fdm/jsbsim/fcs/flap-lever</property>
 		<interpolation>
 			<entry><ind>0</ind><dep> 0</dep></entry>
 			<entry><ind>1</ind><dep>14</dep></entry>
@@ -5567,7 +5567,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>SpdBrk</object-name>
-		<property>fdm/jsbsim/spoilers/speedbrake-nul</property>
+		<property>fdm/jsbsim/spoilers/main-lever</property>
 		<factor>45</factor>
 		<axis>
 			<object-name>SpdBrk.axis</object-name>
@@ -5577,7 +5577,7 @@
 	<animation>
 		<type>translate</type>
 		<object-name>SpdBrk</object-name>
-		<property>controls/flight/speedbrake-arm</property>
+		<property>fdm/jsbsim/spoilers/lever-arm</property>
 		<factor>-0.006</factor>
 		<axis>
 			<x>1</x>
@@ -5589,7 +5589,7 @@
 	<animation>
 		<type>translate</type>
 		<object-name>SpdBrk</object-name>
-		<property>controls/flight/speedbrake-arm</property>
+		<property>fdm/jsbsim/spoilers/lever-arm</property>
 		<factor>0.006</factor>
 		<axis>
 			<x>0</x>
@@ -5878,7 +5878,7 @@
 		<name>Engine 1 throttle lever</name>
 		<type>rotate</type>
 		<object-name>thr_l</object-name>
-		<property>controls/engines/engine[0]/throttle-lever</property>
+		<property>fdm/jsbsim/fcs/throttle-lever[0]</property>
 		<interpolation>
 			<entry><ind>0.00000</ind><dep> 0</dep></entry>
 			<entry><ind>0.00999</ind><dep> 0</dep></entry>
@@ -5903,7 +5903,7 @@
 		<name>Engine 1 throttle lever rev</name>
 		<type>rotate</type>
 		<object-name>thr_l</object-name>
-		<property>controls/engines/engine[0]/reverser</property>
+		<property>fdm/jsbsim/fcs/reverse-lever[0]</property>
 		<factor>-3.5</factor> 
 		<axis>
 			<object-name>trim.axis</object-name>
@@ -5913,7 +5913,7 @@
 		<name>Engine 1 throttle lever rev 2</name>
 		<type>rotate</type>
 		<object-name>thr_l</object-name>
-		<property>controls/engines/engine[0]/throttle-rev</property>
+		<property>fdm/jsbsim/fcs/reverse-thr-lever[0]</property>
 		<interpolation>
 			<entry><ind>0.00</ind><dep>  0</dep></entry>
 			<entry><ind>0.50</ind><dep>-20</dep></entry>
@@ -5953,7 +5953,7 @@
 		<name>Engine 2 throttle lever</name>
 		<type>rotate</type>
 		<object-name>thr_r</object-name>
-		<property>controls/engines/engine[1]/throttle-lever</property>
+		<property>fdm/jsbsim/fcs/throttle-lever[1]</property>
 		<interpolation>
 			<entry><ind>0.00000</ind><dep> 0</dep></entry>
 			<entry><ind>0.00999</ind><dep> 0</dep></entry>
@@ -5978,7 +5978,7 @@
 		<name>Engine 2 throttle lever rev</name>
 		<type>rotate</type>
 		<object-name>thr_r</object-name>
-		<property>controls/engines/engine[1]/reverser</property>
+		<property>fdm/jsbsim/fcs/reverse-lever[1]</property>
 		<factor>-3.5</factor> 
 		<axis>
 			<object-name>trim.axis</object-name>
@@ -5988,7 +5988,7 @@
 		<name>Engine 2 throttle lever rev 2</name>
 		<type>rotate</type>
 		<object-name>thr_r</object-name>
-		<property>controls/engines/engine[1]/throttle-rev</property>
+		<property>fdm/jsbsim/fcs/reverse-thr-lever[1]</property>
 		<interpolation>
 			<entry><ind>0.00</ind><dep> 0</dep></entry>
 			<entry><ind>0.50</ind><dep>-20</dep></entry>

Systems/a320-aerodynamics.xml

@@ -181,9 +181,9 @@
 					<independentVar lookup="row">aero/alpha-rad</independentVar>
 					<tableData>
 						-1.57  1.3083
-						-0.20  0.0331
+						-0.20  0.0301
 						 0.00  0.0000
-						 0.20  0.0331
+						 0.20  0.0301
 						 1.57  1.3083
 					</tableData>
 				</table>
@@ -210,7 +210,7 @@
 					<tableData>
 						0.00  0.000
 						0.20  0.000
-						0.79  0.002
+						0.82  0.002
 						1.10  0.023
 						1.80  0.015
 					</tableData>
@@ -442,7 +442,7 @@
 				<property>metrics/bw-ft</property>
 				<property>aero/bi2vel</property>
 				<property>velocities/r-aero-rad_sec</property>
-				<value>0.2</value>
+				<value>0.1</value>
 			</product>
 		</function>
 		

Systems/a320-fcs.xml

@@ -107,7 +107,7 @@
 					<tableData>
 						     0    1
 						140 -2.1  0.0
-						350 -0.8  0.0
+						350 -0.2  0.0
 					</tableData>
 				</table>
 			</function>
@@ -511,11 +511,25 @@
 			</test>
 		</switch>
 		
+		<switch name="fbw/roll/s-i-f-i">
+			<default value="0"/>
+			<test logic="AND" value="fbw/roll/a-i">
+				position/wow eq 0
+				/it-fbw/law eq 0
+			</test>
+			<test value="fbw/roll/a-i-f">
+				fbw/roll/gear-law-switch eq 1
+			</test>
+			<test logic="AND" value="0">
+				/it-fbw/law eq 3
+			</test>
+		</switch>
+		
 		<fcs_function name="fbw/roll/s-i-f">
 			<function>
 				<product>
 					<table>
-						<independentVar lookup="row">fbw/roll/a-i</independentVar>
+						<independentVar lookup="row">fbw/roll/s-i-f-i</independentVar>
 						<tableData>
 							-1.0 -1.0
 							-0.2  0.0
@@ -1353,18 +1367,19 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/aileron-l/final">
+		<aerosurface_scale name="hydraulics/aileron-l/cmd-deg">
 			<input>hydraulics/aileron-l/switch</input>
-			<c1>14.5</c1>
-		</lag_filter>
-		
-		<aerosurface_scale name="hydraulics/aileron-l/final-deg">
-			<input>hydraulics/aileron-l/final</input>
 			<range>
 				<min>-25</min>
 				<max>25</max>
 			</range>
 		</aerosurface_scale>
+		
+		<actuator name="hydraulics/aileron-l/final-deg">
+			<input>hydraulics/aileron-l/cmd-deg</input>
+			<rate_limit>150</rate_limit>
+			<lag>26.5</lag>
+		</actuator>
 	
 	</channel>
 	
@@ -1427,18 +1442,19 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/aileron-r/final">
+		<aerosurface_scale name="hydraulics/aileron-r/cmd-deg">
 			<input>hydraulics/aileron-r/switch</input>
-			<c1>14.5</c1>
-		</lag_filter>
-		
-		<aerosurface_scale name="hydraulics/aileron-r/final-deg">
-			<input>hydraulics/aileron-r/final</input>
 			<range>
 				<min>-25</min>
 				<max>25</max>
 			</range>
 		</aerosurface_scale>
+		
+		<actuator name="hydraulics/aileron-r/final-deg">
+			<input>hydraulics/aileron-r/cmd-deg</input>
+			<rate_limit>150</rate_limit>
+			<lag>26.5</lag>
+		</actuator>
 	
 	</channel>
 	
@@ -1483,19 +1499,19 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/elevator-l/final">
+		<aerosurface_scale name="hydraulics/elevator-l/cmd-deg">
 			<input>hydraulics/elevator-l/switch</input>
-			<c1>14.5</c1>
-			<output>/controls/flight/elevator-left</output>
-		</lag_filter>
-		
-		<aerosurface_scale name="hydraulics/elevator-l/final-deg">
-			<input>hydraulics/elevator-l/final</input>
 			<range>
 				<min>-30</min>
 				<max>17</max>
 			</range>
 		</aerosurface_scale>
+		
+		<actuator name="hydraulics/elevator-l/final-deg">
+			<input>hydraulics/elevator-l/cmd-deg</input>
+			<rate_limit>150</rate_limit>
+			<lag>26.5</lag>
+		</actuator>
 	
 	</channel>
 	
@@ -1521,23 +1537,30 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/elevator-r/final">
+		<aerosurface_scale name="hydraulics/elevator-r/cmd-deg">
 			<input>hydraulics/elevator-r/switch</input>
-			<c1>14.5</c1>
-			<output>/controls/flight/elevator-right</output>
-		</lag_filter>
-		
-		<aerosurface_scale name="hydraulics/elevator-r/final-deg">
-			<input>hydraulics/elevator-r/final</input>
 			<range>
 				<min>-30</min>
 				<max>17</max>
 			</range>
 		</aerosurface_scale>
+		
+		<actuator name="hydraulics/elevator-r/final-deg">
+			<input>hydraulics/elevator-r/cmd-deg</input>
+			<rate_limit>150</rate_limit>
+			<lag>26.5</lag>
+		</actuator>
 	
 	</channel>
 	
-	<channel name="Elevator Trim">
+	<channel name="Pitch Trim">
+		
+		<switch name="hydraulics/elevator-trim/rate">
+			<default value="0.125"/>
+			<test value="0.25">
+				/systems/hydraulic/green-psi ge 1500
+			</test>
+		</switch>
 		
 		<aerosurface_scale name="hydraulics/elevator-trim/cmd-deg">
 			<input>/controls/flight/elevator-trim</input>
@@ -1551,34 +1574,11 @@
 			</range>
 		</aerosurface_scale>
 		
-		<switch name="hydraulics/elevator-trim/rate">
+		<actuator name="hydraulics/elevator-trim/final-deg">
-			<default value="0.01"/>
+			<input>hydraulics/elevator-trim/cmd-deg</input>
-			<test value="0.02">
-				/systems/hydraulic/green-psi ge 1500
-			</test>
-		</switch>
-		
-		<actuator name="hydraulics/elevator-trim/actuator">
-			<input>/controls/flight/elevator-trim</input>
 			<rate_limit>hydraulics/elevator-trim/rate</rate_limit>
+			<lag>22.5</lag>
 		</actuator>
-		
-		<lag_filter name="hydraulics/elevator-trim/lag">
-			<input>hydraulics/elevator-trim/actuator</input>
-			<c1>10.5</c1>
-		</lag_filter>
-		
-		<aerosurface_scale name="hydraulics/elevator-trim/final-deg">
-			<input>hydraulics/elevator-trim/lag</input>
-			<domain>
-				<min>-1.00</min>
-				<max>0.32</max>
-			</domain>
-			<range>
-				<min>-12.5</min>
-				<max>4.0</max>
-			</range>
-		</aerosurface_scale>
 	
 	</channel>
 	
@@ -1634,18 +1634,19 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/rudder/final">
+		<aerosurface_scale name="hydraulics/rudder/cmd-deg">
 			<input>hydraulics/rudder/switch</input>
-			<c1>13.5</c1>
-		</lag_filter>
-		
-		<aerosurface_scale name="hydraulics/rudder/final-deg">
-			<input>hydraulics/rudder/final</input>
 			<range>
 				<min>-25</min>
 				<max>25</max>
 			</range>
 		</aerosurface_scale>
+		
+		<actuator name="hydraulics/rudder/final-deg">
+			<input>hydraulics/rudder/cmd-deg</input>
+			<rate_limit>150</rate_limit>
+			<lag>25.5</lag>
+		</actuator>
 	
 	</channel>
 	
@@ -1690,11 +1691,56 @@
 			<output>/engines/engine[1]/n2-actual</output>
 			<output>/engines/engine[4]/n2</output>
 		</lag_filter>
+		
+		<lag_filter name="fcs/throttle-lever[0]">
+			<input>/controls/engines/engine[0]/throttle-lever</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/throttle-lever[1]">
+			<input>/controls/engines/engine[1]/throttle-lever</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/reverse-lever[0]">
+			<input>/controls/engines/engine[0]/reverser</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/reverse-lever[1]">
+			<input>/controls/engines/engine[1]/reverser</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/reverse-thr-lever[0]">
+			<input>/controls/engines/engine[0]/throttle-rev</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/reverse-thr-lever[1]">
+			<input>/controls/engines/engine[1]/throttle-rev</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/engine-cutoff[0]">
+			<input>/controls/engines/engine[0]/cutoff-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/engine-cutoff[1]">
+			<input>/controls/engines/engine[1]/cutoff-switch</input>
+			<c1>20</c1>
+		</lag_filter>
 	
 	</channel>
 	
 	<channel name="SFCC">
 		
+		<lag_filter name="fcs/flap-lever">
+			<input>/controls/flight/flap-lever</input>
+			<c1>20</c1>
+		</lag_filter>
+		
 		<switch name="fcs/sfcc/unit1-avail">
 			<default value="0"/>
 			<test logic="OR" value="1">
@@ -1904,6 +1950,11 @@
 	
 	<channel name="Brakes">
 		
+		<lag_filter name="fcs/brake-lever">
+			<input>/controls/gear/brake-parking</input>
+			<c1>20</c1>
+		</lag_filter>
+		
 		<pure_gain name="/services/chokes/nose-half">
 			<input>/services/chokes/nose</input>
 			<gain>0.5</gain>

Systems/a320-mass-balance.xml

@@ -20,38 +20,65 @@
 	</location>
 	
 	<pointmass name="Crew">
-		<weight unit="LBS">380</weight>
+		<weight unit="LBS">320</weight>
 		<location name="POINTMASS" unit="M">
 			<x> 5.29845 </x>
 			<y> 0 </y>
-			<z> -0.66384 </z>
+			<z> 0.5 </z>
 		</location>
 	</pointmass>
 	
-	<pointmass name="PAX">
+	<pointmass name="Forward Cabin">
-		<weight unit="LBS">23000</weight>
+		<weight unit="LBS">3722</weight>
 		<location name="POINTMASS" unit="M">
-			<x> 18.8231 </x>
+			<x> 10 </x>
 			<y> 0 </y>
-			<z> 0.19249 </z>
+			<z> 0.5 </z>
+		</location>
+	</pointmass>
+	
+	<pointmass name="Center Cabin">
+		<weight unit="LBS">11361</weight>
+		<location name="POINTMASS" unit="M">
+			<x> 16.5 </x>
+			<y> 0 </y>
+			<z> 0.5 </z>
+		</location>
+	</pointmass>
+	
+	<pointmass name="Aft Cabin">
+		<weight unit="LBS">8422</weight>
+		<location name="POINTMASS" unit="M">
+			<x> 26 </x>
+			<y> 0 </y>
+			<z> 0.5 </z>
 		</location>
 	</pointmass>
 	
 	<pointmass name="Fwd Cargo">
 		<weight unit="LBS">3000</weight>
 		<location name="POINTMASS" unit="M"> 
-			<x> 13.0849 </x>
+			<x> 14.0 </x>
 			<y> 0 </y>
-			<z> -1.18112 </z>
+			<z> -1.1 </z>
 		</location>
 	</pointmass>
 	
 	<pointmass name="Aft Cargo">
 		<weight unit="LBS">3000</weight>
 		<location name="POINTMASS" unit="M">
-			<x> 24.5565 </x>
+			<x> 24.0 </x>
 			<y> 0 </y>
-			<z> -1.18112 </z>
+			<z> -1.1 </z>
+		</location>
+	</pointmass>
+	
+	<pointmass name="Aft Bulk Cargo">
+		<weight unit="LBS">0</weight>
+		<location name="POINTMASS" unit="M">
+			<x> 29.0 </x>
+			<y> 0 </y>
+			<z> -1.1 </z>
 		</location>
 	</pointmass>
 </mass_balance>

Systems/a320-spoiler.xml

@@ -84,6 +84,11 @@
 			</function>
 		</fcs_function>
 		
+		<lag_filter name="spoilers/main-lever">
+			<input>spoilers/speedbrake-nul</input>
+			<c1>20</c1>
+		</lag_filter>
+		
 		<summer name="spoilers/main-cmd">
 			<input>spoilers/speedbrake-nul</input>
 			<input>spoilers/auto-speedbrake-cmd</input>
@@ -93,6 +98,11 @@
 			</clipto>
 			<output>fbw/spoiler-output</output>
 		</summer>
+		
+		<lag_filter name="spoilers/lever-arm">
+			<input>/controls/flight/speedbrake-arm</input>
+			<c1>20</c1>
+		</lag_filter>
 	
 	</channel>
 	
@@ -113,16 +123,12 @@
 		
 		<actuator name="hydraulics/spoiler-l1/final">
 			<input>hydraulics/spoiler-l1/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l1/final-lag">
-			<input>hydraulics/spoiler-l1/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l1/final-gain">
-			<input>hydraulics/spoiler-l1/final-lag</input>
+			<input>hydraulics/spoiler-l1/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l1/final-deg</output>
 		</pure_gain>
@@ -216,16 +222,12 @@
 		
 		<actuator name="hydraulics/spoiler-l2/final">
 			<input>hydraulics/spoiler-l2/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l2/final-lag">
-			<input>hydraulics/spoiler-l2/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l2/final-gain">
-			<input>hydraulics/spoiler-l2/final-lag</input>
+			<input>hydraulics/spoiler-l2/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l2/final-deg</output>
 		</pure_gain>
@@ -281,16 +283,12 @@
 		
 		<actuator name="hydraulics/spoiler-l3/final">
 			<input>hydraulics/spoiler-l3/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l3/final-lag">
-			<input>hydraulics/spoiler-l3/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l3/final-gain">
-			<input>hydraulics/spoiler-l3/final-lag</input>
+			<input>hydraulics/spoiler-l3/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l3/final-deg</output>
 		</pure_gain>
@@ -346,16 +344,12 @@
 		
 		<actuator name="hydraulics/spoiler-l4/final">
 			<input>hydraulics/spoiler-l4/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l4/final-lag">
-			<input>hydraulics/spoiler-l4/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l4/final-gain">
-			<input>hydraulics/spoiler-l4/final-lag</input>
+			<input>hydraulics/spoiler-l4/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l4/final-deg</output>
 		</pure_gain>
@@ -412,16 +406,12 @@
 		
 		<actuator name="hydraulics/spoiler-l5/final">
 			<input>hydraulics/spoiler-l5/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l5/final-lag">
-			<input>hydraulics/spoiler-l5/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l5/final-gain">
-			<input>hydraulics/spoiler-l5/final-lag</input>
+			<input>hydraulics/spoiler-l5/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l5/final-deg</output>
 		</pure_gain>
@@ -445,16 +435,12 @@
 		
 		<actuator name="hydraulics/spoiler-r1/final">
 			<input>hydraulics/spoiler-r1/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r1/final-lag">
-			<input>hydraulics/spoiler-r1/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r1/final-gain">
-			<input>hydraulics/spoiler-r1/final-lag</input>
+			<input>hydraulics/spoiler-r1/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r1/final-deg</output>
 		</pure_gain>
@@ -548,16 +534,12 @@
 		
 		<actuator name="hydraulics/spoiler-r2/final">
 			<input>hydraulics/spoiler-r2/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r2/final-lag">
-			<input>hydraulics/spoiler-r2/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r2/final-gain">
-			<input>hydraulics/spoiler-r2/final-lag</input>
+			<input>hydraulics/spoiler-r2/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r2/final-deg</output>
 		</pure_gain>
@@ -613,16 +595,12 @@
 		
 		<actuator name="hydraulics/spoiler-r3/final">
 			<input>hydraulics/spoiler-r3/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r3/final-lag">
-			<input>hydraulics/spoiler-r3/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r3/final-gain">
-			<input>hydraulics/spoiler-r3/final-lag</input>
+			<input>hydraulics/spoiler-r3/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r3/final-deg</output>
 		</pure_gain>
@@ -678,16 +656,12 @@
 		
 		<actuator name="hydraulics/spoiler-r4/final">
 			<input>hydraulics/spoiler-r4/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r4/final-lag">
-			<input>hydraulics/spoiler-r4/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r4/final-gain">
-			<input>hydraulics/spoiler-r4/final-lag</input>
+			<input>hydraulics/spoiler-r4/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r4/final-deg</output>
 		</pure_gain>
@@ -744,16 +718,12 @@
 		
 		<actuator name="hydraulics/spoiler-r5/final">
 			<input>hydraulics/spoiler-r5/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r5/final-lag">
-			<input>hydraulics/spoiler-r5/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r5/final-gain">
-			<input>hydraulics/spoiler-r5/final-lag</input>
+			<input>hydraulics/spoiler-r5/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r5/final-deg</output>
 		</pure_gain>

Systems/libraries.xml

@@ -31,7 +31,7 @@
 			<expression>
 				<dif>
 					<property>/position/altitude-agl-ft</property>
-					<value>15.001</value>
+					<value>14.201</value>
 				</dif>
 			</expression>
 		</input>

revision.txt

@@ -1 +1 @@
-4752
+4760