Merge branch 'master' into ECAM2

AircraftConfig/acconfig.nas

@@ -357,6 +357,8 @@ var beforestart_b = func {
 	setprop("/controls/radio/rmp[0]/on", 1);
 	setprop("/controls/radio/rmp[1]/on", 1);
 	setprop("/controls/radio/rmp[2]/on", 1);
+	setprop("/systems/fadec/power-avail", 1);
+	setprop("/systems/fadec/powered-time", -310);
 	settimer(func {
 		setprop("/controls/gear/brake-left", 0);
 		setprop("/controls/gear/brake-right", 0);
@@ -438,6 +440,8 @@ var taxi_b = func {
 	setprop("/controls/radio/rmp[0]/on", 1);
 	setprop("/controls/radio/rmp[1]/on", 1);
 	setprop("/controls/radio/rmp[2]/on", 1);
+	setprop("/systems/fadec/power-avail", 1);
+	setprop("/systems/fadec/powered-time", -310);
 	setprop("/controls/lighting/turnoff-light-switch", 1);
 	setprop("/controls/lighting/taxi-light-switch", 0.5);
 	setprop("/controls/switches/landing-lights-l", 0.5);

Nasal/it-fbw.nas

@@ -205,12 +205,12 @@ var update_loop = func {
 	}
 	
 	if (getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") > getprop("/it-fbw/speeds/vmo-mmo") + 6 and (law == 0 or law == 1)) {
-		if (getprop("/it-fbw/protections/overspeed") != 1) {
-			setprop("/it-fbw/protections/overspeed", 1);
-		}
 		if (getprop("/it-autoflight/input/ap1") == 1 or getprop("/it-autoflight/input/ap2") == 1) {
 			libraries.apOff("hard", 0);
 		}
+		if (getprop("/it-fbw/protections/overspeed") != 1) {
+			setprop("/it-fbw/protections/overspeed", 1);
+		}
 	} else {
 		if (getprop("/it-fbw/protections/overspeed") != 0) {
 			setprop("/it-fbw/protections/overspeed", 0);

Systems/a320-fcs.xml

@@ -25,6 +25,7 @@
 	<property value="0">fbw/fmgc/roll-cmd</property>
 	<property value="0">fbw/fmgc/pitch-cmd</property>
 	<property value="0">fbw/fmgc/yaw-cmd</property>
+	<property value="1">c1</property>
 	
 	<channel name="Libraries">
 		
@@ -197,6 +198,19 @@
 			</function>
 		</fcs_function>
 		
+		<pid name="fbw/pitch/vc-kts-rate">
+			<descripton>Use D only to calculate rate of IAS</descripton>
+			<input>velocities/vc-kts</input>
+			<kp>0.0</kp>
+			<ki>0.0</ki>
+			<kd>1.0</kd>
+		</pid>
+		
+		<lag_filter name="fbw/pitch/vc-kts-rate-lag">
+			<input>fbw/pitch/vc-kts-rate</input>
+			<c1>c1</c1>
+		</lag_filter>
+		
 	</channel>
 	
 	<channel name="FBW: Roll">
@@ -590,11 +604,23 @@
 	
 	<channel name="FBW: Pitch">
 		
+		<switch name="fbw/pitch/elevator-max"> <!-- Prevent pitch down -->
+			<default value="1"/>
+			<test logic="AND" value="0">
+				/it-fbw/law eq 0
+				/it-fbw/protections/overspeed eq 1
+			</test>
+		</switch>
+		
 		<switch name="fbw/pitch/e-i-f">
 			<default value="/controls/flight/elevator"/>
 			<test value="0">
 				fbw/fmgc/enabled eq 1
 			</test>
+			<clipto>
+				<min>-1.0</min>
+				<max>fbw/pitch/elevator-max</max>
+			</clipto>
 		</switch>
 		
 		<kinematic name="fbw/pitch/e-i-k">
@@ -689,6 +715,10 @@
 				fbw/fmgc/enabled eq 1
 				position/wow eq 1
 			</test>
+			<clipto>
+				<min>-1.0</min>
+				<max>fbw/pitch/elevator-max</max>
+			</clipto>
 		</switch>
 		
 		<kinematic name="fbw/pitch/e-i">
@@ -823,16 +853,18 @@
 				<sum>
 					<table>
 						<independentVar lookup="row">fbw/pitch/g-pi-switched</independentVar>
+						<independentVar lookup="column">fbw/pitch/vc-kts-rate-lag</independentVar>
 						<tableData>
-							-1.0  0.087266
+							     -2        -1
-							 0.0  0.026180
+							-1.0  0.087266  0.087266
+							 0.0  0.000000  0.026180
 						</tableData>
 					</table>
 					<table>
 						<independentVar lookup="row">attitude/pitch-rad</independentVar>
 						<independentVar lookup="column">fbw/pitch/g-pi-switched</independentVar>
 						<tableData>
-							          -1         0       
+							          -1         0
 							 0.436332 -0.026180  0.000000
 							 0.523599 -0.087266  0.000000
 						</tableData>
@@ -852,10 +884,12 @@
 			<function>
 				<table>
 					<independentVar lookup="row">fbw/pitch/g-pi-switched</independentVar>
+					<independentVar lookup="column">fbw/pitch/vc-kts-rate-lag</independentVar>
 					<tableData>
-						-1.0  0.087266
+						     -2        -1
-						 0.0  0.026180
+						-1.0  0.087266  0.087266
-						 1.0 -0.061086
+						 0.0  0.000000  0.026180
+						 1.0 -0.061086 -0.087266
 					</tableData>
 				</table>
 			</function>

revision.txt

@@ -1 +1 @@
-4772
+4773