From 83b6127405c6da0b7f6a615f8ae94dd764428739 Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 7 Feb 2021 20:17:26 -0500
Subject: [PATCH] System: Further refinements and integrations to engine cfm

---
 Systems/a320-cfm56-5b4-engine-fadec.xml | 22 ++++++++++++++--
 Systems/fadec-cfm.xml                   | 35 +++++--------------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index 449648d7..38bb0200 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -6,6 +6,7 @@
 <system name="A320: CFM56 Engine">
 	
 	<property value="45">fadec/limit/rated-temp</property>
+	<property value="30">fadec/limit/flex-rated-temp</property>
 	<property value="27000">fadec/limit/rated-thrust</property>
 	
 	<channel name="Thrust Limits">
@@ -162,7 +163,7 @@
 		</fcs_function>
 		
 		<summer name="fadec/limit/flex-temp-input"> <!-- (Rated - Flex) + TAT -->
-			<input>fadec/limit/rated-temp</input>
+			<input>fadec/limit/flex-rated-temp</input> <!-- Fix the calculations -->
 			<input>-/FMGC/internal/flex</input>
 			<input>propulsion/tat-c</input>
 		</summer>
@@ -173,7 +174,7 @@
 					<property>fadec/limit/toga-ref</property>
 					<table> <!-- TODO: Figure out how to integrate FCOM table with this one -->
 						<independentVar lookup="row">/position/altitude-ft</independentVar>
-						<independentVar lookup="column">propulsion/tat-c</independentVar>
+						<independentVar lookup="column">fadec/limit/flex-temp-input</independentVar>
 						<tableData>
 							      -45   -15    15    45     75
 							    0  79.5  84.6  89.2   93.8  89.1
@@ -185,6 +186,23 @@
 			</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>
+		
 		<!--
 		TODO: need to figure out how to make MCT work, 24370lbs
 		<switch name="fadec/limit/mct-final-ref">
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index 7bef2308..55a2d526 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -14,10 +14,9 @@
 		<input>
 			<expression>
 				<table>
-					<property>/environment/temperature-degc</property>
-					<entry><ind> 70</ind><dep>0.788</dep></entry>
-					<entry><ind> 40</ind><dep>0.813</dep></entry>
-					<entry><ind>-60</ind><dep>1.000</dep></entry>
+					<property>/fdm/jsbsim/fadec/limit/toga</property>
+					<entry><ind> 18.9</ind><dep>0</dep></entry>
+					<entry><ind>104.0</ind><dep>1</dep></entry>
 				</table>
 			</expression>
 		</input>
@@ -32,7 +31,7 @@
 		<input>
 			<expression>
 				<table>
-					<property>/FMGC/internal/flex</property>
+					<property>/fdm/jsbsim/fadec/limit/flex</property>
 					<entry><ind> 70</ind><dep>0.788</dep></entry>
 					<entry><ind> 40</ind><dep>0.813</dep></entry>
 					<entry><ind>-60</ind><dep>1.000</dep></entry>
@@ -1058,18 +1057,7 @@
 		<type>gain</type>
 		<gain>1.0</gain>
 		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<product>
-						<value>0.99</value>
-						<property>/controls/engines/throttle-scale</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
+		<input>/fdm/jsbsim/fadec/limit/toga</input>
 		<output>/systems/thrust/n1/toga-lim</output>
 	</filter>
 	
@@ -1098,18 +1086,7 @@
 		<type>gain</type>
 		<gain>1.0</gain>
 		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<product>
-						<value>0.99</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 18.9</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
+		<input>/fdm/jsbsim/fadec/limit/flex</input>
 		<output>/systems/thrust/n1/flx-lim</output>
 	</filter>