From 581dd5a1f60127d96285f776eda0dc481d4cdd57 Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 24 Apr 2021 12:03:46 -0400
Subject: [PATCH] Control: Add mrev limits

---
 Models/Instruments/Upper-ECAM/Upper-ECAM.nas |  4 +-
 Systems/a320-cfm56-5b4-engine-fadec.xml      | 65 ++++++++++++++------
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 8f9108a0..67ba5947 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -254,7 +254,7 @@ var canvas_upperECAM = {
 					obj["N1Lim-XX2"].show();
 				}
 				
-				if ((val.fadecPower1 or val.fadecPower2 or val.fadecPowerStart) and val.thrustLimit != "MREV") {
+				if (val.fadecPower1 or val.fadecPower2 or val.fadecPowerStart) {
 					obj["N1Lim"].show();
 					obj["N1Lim-decpnt"].show();
 					obj["N1Lim-decimal"].show();
@@ -295,7 +295,7 @@ var canvas_upperECAM = {
 					obj["EPRLim-XX2"].show();
 				}
 				
-				if ((val.fadecPower1 or val.fadecPower2 or val.fadecPowerStart) and val.thrustLimit != "MREV") {
+				if (val.fadecPower1 or val.fadecPower2 or val.fadecPowerStart) {
 					obj["EPRLim"].show();
 					obj["EPRLim-decpnt"].show();
 					obj["EPRLim-decimal"].show();
diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index 1af7ecce..07623ba0 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -202,24 +202,7 @@
 			</function>
 		</fcs_function>
 		
-		<fcs_function name="fadec/limit/flex">
-			<function>
-				<quotient>
-					<integer>
-						<sum>
-							<product>
-								<property>fadec/limit/flex-ref</property>
-								<value>10</value>
-							</product>
-							<value>0.5</value> <!-- Make it round correctly -->
-						</sum>
-					</integer>
-					<value>10</value>
-				</quotient>
-			</function>
-		</fcs_function>
-		
-		<fcs_function name="fadec/limit/mct-ref"> <!-- Ref TOGA 104.0, Vs 99.7, 25C Corner, Limit 102.6 -->
+		<fcs_function name="fadec/limit/mct-ref"> <!-- Ref TOGA, Vs 99.7, 25C Corner, Limit 102.6 -->
 			<function>
 				<table>
 					<independentVar lookup="row">/position/altitude-ft</independentVar>
@@ -363,6 +346,49 @@
 				</table>
 			</function>
 		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mrev-ref"> <!-- Ref MCT, Vs 87 -->
+			<function>
+				<table>
+					<independentVar lookup="row">/position/altitude-ft</independentVar>
+					<independentVar lookup="column">propulsion/tat-c</independentVar>
+					<tableData>
+						      -65   -35   -5     25    55
+						    0  62.4  66.2  69.9  73.5  72.2
+						10000  70.6  74.2  77.6  80.2  79.7
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mrev">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/mrev-ref</property>
+								<value>10</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>10</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/mrev-norm">
+			<function>
+				<table>
+					<independentVar lookup="row">fadec/limit/mrev</independentVar>
+					<tableData>
+						 18.9  0
+						104.0  1
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
 	
 	</channel>
 	
@@ -934,6 +960,9 @@
 		
 		<switch name="fadec/limit/active-n1">
 			<default value="0"/>
+			<test value="fadec/limit/mrev">
+				fadec/limit/active-mode-int eq 4
+			</test>
 			<test value="fadec/limit/toga">
 				fadec/limit/active-mode-int eq 0
 			</test>