Merge branch 'master' into Lower-ECAM

A320-main.xml

@@ -94,8 +94,6 @@
 			<tag>retractable-gear</tag>
 			<tag>glass-cockpit</tag>
 			<tag>pressurised</tag>
-			<tag>rembrandt</tag>
-			<!--tag>dual-controls</tag--> <!-- Coming Soon ;) -->
 			<tag>jet</tag>
 			<tag>2-engine</tag>
 		</tags>

Models/FlightDeck/a320.flightdeck.xml

@@ -4809,7 +4809,7 @@
 		<type>translate</type>
 		<object-name>RRudderPedalL</object-name>
 		<object-name>RRudderPedalR</object-name>
-		<property>controls/flight/rudder</property>
+		<property>fdm/jsbsim/fbw/rudder-pedal</property>
 		<factor>0.07</factor>
 		<axis>
 			<x>-1</x>
@@ -4822,7 +4822,7 @@
 		<type>translate</type>
 		<object-name>LRudderPedalL</object-name>
 		<object-name>LRudderPedalR</object-name>
-		<property>controls/flight/rudder</property>
+		<property>fdm/jsbsim/fbw/rudder-pedal</property>
 		<factor>-0.07</factor>
 		<axis>
 			<x>-1</x>
@@ -4970,7 +4970,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>sidestick_1</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>-5</factor>
 		<axis>
 			<object-name>sidestick_1.y.axis</object-name>
@@ -4980,7 +4980,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>sidestick_1</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>5</factor>
 		<axis>
 			<object-name>sidestick_1.x.axis</object-name>
@@ -4991,7 +4991,7 @@
 		<type>rotate</type>
 		<object-name>sidestick_1</object-name>
 		<object-name>level3</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>-4</factor>
 		<axis>
 			<object-name>sidestick_1.y.axis</object-name>
@@ -5002,7 +5002,7 @@
 		<type>rotate</type>
 		<object-name>sidestick_1</object-name>
 		<object-name>level3</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>4</factor>
 		<axis>
 			<object-name>sidestick_1.x.axis</object-name>
@@ -5014,7 +5014,7 @@
 		<object-name>sidestick_1</object-name>
 		<object-name>level3</object-name>
 		<object-name>level2</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>-3</factor>
 		<axis>
 			<object-name>sidestick_1.y.axis</object-name>
@@ -5026,7 +5026,7 @@
 		<object-name>sidestick_1</object-name>
 		<object-name>level3</object-name>
 		<object-name>level2</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>3</factor>
 		<axis>
 			<object-name>sidestick_1.x.axis</object-name>
@@ -5039,7 +5039,7 @@
 		<object-name>level3</object-name>
 		<object-name>level2</object-name>
 		<object-name>level1</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>-2</factor>
 		<axis>
 			<object-name>sidestick_1.y.axis</object-name>
@@ -5052,7 +5052,7 @@
 		<object-name>level3</object-name>
 		<object-name>level2</object-name>
 		<object-name>level1</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>2</factor>
 		<axis>
 			<object-name>sidestick_1.x.axis</object-name>
@@ -5064,7 +5064,7 @@
 	<!--animation>
 		<type>rotate</type>
 		<object-name>sidestick_2</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>5</factor>
 		<axis>
 			<object-name>sidestick_2.y.axis</object-name>
@@ -5074,7 +5074,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>sidestick_2</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>5</factor>
 		<axis>
 			<object-name>sidestick_2.x.axis</object-name>
@@ -5085,7 +5085,7 @@
 		<type>rotate</type>
 		<object-name>sidestick_2</object-name>
 		<object-name>level3_2</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>4</factor>
 		<axis>
 			<object-name>sidestick_2.y.axis</object-name>
@@ -5096,7 +5096,7 @@
 		<type>rotate</type>
 		<object-name>sidestick_2</object-name>
 		<object-name>level3_2</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>4</factor>
 		<axis>
 			<object-name>sidestick_2.x.axis</object-name>
@@ -5108,7 +5108,7 @@
 		<object-name>sidestick_2</object-name>
 		<object-name>level3_2</object-name>
 		<object-name>level2_2</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>3</factor>
 		<axis>
 			<object-name>sidestick_2.y.axis</object-name>
@@ -5120,7 +5120,7 @@
 		<object-name>sidestick_2</object-name>
 		<object-name>level3_2</object-name>
 		<object-name>level2_2</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>3</factor>
 		<axis>
 			<object-name>sidestick_2.x.axis</object-name>
@@ -5133,7 +5133,7 @@
 		<object-name>level3_2</object-name>
 		<object-name>level2_2</object-name>
 		<object-name>level1_2</object-name>
-		<property>controls/flight/elevator</property>
+		<property>fdm/jsbsim/fbw/elevator-sidestick</property>
 		<factor>2</factor>
 		<axis>
 			<object-name>sidestick_2.y.axis</object-name>
@@ -5146,7 +5146,7 @@
 		<object-name>level3_2</object-name>
 		<object-name>level2_2</object-name>
 		<object-name>level1_2</object-name>
-		<property>controls/flight/aileron</property>
+		<property>fdm/jsbsim/fbw/aileron-sidestick</property>
 		<factor>2</factor>
 		<axis>
 			<object-name>sidestick_2.x.axis</object-name>
@@ -5198,7 +5198,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>tiller</object-name>
-		<property>controls/flight/rudder</property>
+		<property>fdm/jsbsim/fbw/rudder-pedal</property>
 		<factor>-70</factor>
 		<axis>
 			<object-name>tiller.axis</object-name>
@@ -5207,7 +5207,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>tillerFo</object-name>
-		<property>controls/flight/rudder</property>
+		<property>fdm/jsbsim/fbw/rudder-pedal</property>
 		<factor>-70</factor>
 		<axis>
 			<object-name>tillerFo.axis</object-name>

Systems/a320-fcs.xml

@@ -451,8 +451,10 @@
 		
 		<switch name="fbw/roll/trigger">
 			<default value="0"/>
-			<test logic="OR" value="1">
+			<test value="-1">
 				fbw/roll/gain-switch gt 0
+			</test>
+			<test logic="OR" value="1">
 				fbw/roll/pid le -0.999
 				fbw/roll/pid ge 0.999
 			</test>
@@ -560,6 +562,11 @@
 				/systems/failures/aileron-right eq 1
 			</test>
 		</switch>
+		
+		<lag_filter name="fbw/aileron-sidestick">
+			<input>/controls/flight/aileron</input>
+			<c1>20</c1>
+		</lag_filter>
 	
 	</channel>
 	
@@ -891,8 +898,10 @@
 		
 		<switch name="fbw/pitch/trigger">
 			<default value="0"/>
-			<test logic="OR" value="1">
+			<test value="-1">
 				fbw/pitch/gain-switch gt 0
+			</test>
+			<test logic="OR" value="1">
 				fbw/pitch/pid le -0.999
 				fbw/pitch/pid ge 0.999
 			</test>
@@ -960,6 +969,11 @@
 			</test>
 		</switch>
 		
+		<lag_filter name="fbw/elevator-sidestick">
+			<input>/controls/flight/elevator</input>
+			<c1>20</c1>
+		</lag_filter>
+		
 		<switch name="fbw/pitch/autotrim-height">
 			<default value="50"/>
 			<test logic="AND" value="100">
@@ -1101,13 +1115,15 @@
 		
 		<switch name="fbw/yaw/trigger">
 			<default value="0"/>
-			<test logic="OR" value="1">
+			<test logic="OR" value="-1">
 				fbw/yaw/gain-switch gt 0
-				fbw/yaw/tc-pid le -0.199
-				fbw/yaw/tc-pid ge 0.199
 				/position/gear-agl-ft lt 50
 				fbw/yaw/autoland-switch eq 1
 			</test>
+			<test logic="OR" value="1">
+				fbw/yaw/tc-pid le -0.199
+				fbw/yaw/tc-pid ge 0.199
+			</test>
 		</switch>
 		
 		<pid name="fbw/yaw/tc-pid-v">
@@ -1161,6 +1177,11 @@
 			</test>
 			<output>/controls/flight/rudder-fbw</output>
 		</switch>
+		
+		<lag_filter name="fbw/rudder-pedal">
+			<input>/controls/flight/rudder</input>
+			<c1>20</c1>
+		</lag_filter>
 	
 	</channel>
 	

revision.txt

@@ -1 +1 @@
-4620
+4621