From e8e877dfe5808ddfa55384edff4cba3625cb4235 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Mon, 5 Jun 2017 10:33:59 -0400
Subject: [PATCH] A3XX: Improve EIS2 ECAMS

IAE EPR now will show an EPR over 1.6, IAE and CFM EGT needles fixed
---
 .../Upper-ECAM-EIS2/Upper-ECAM-IAE.xml        | 78 ++++++++++---------
 .../Upper-ECAM-EIS2/resCFM/eicasCFM.ac        | 69 ++++++----------
 .../Upper-ECAM-EIS2/resIAE/eicasIAE.ac        | 51 ++++--------
 3 files changed, 83 insertions(+), 115 deletions(-)

diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
index d0686321..3e8f05cd 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml
@@ -1047,12 +1047,13 @@
     	<object-name>epr1</object-name>
     	<property>/engines/engine/epr-actual</property>
 		<interpolation>
-			<entry><ind>0.8</ind><dep>-18</dep></entry>
-			<entry><ind>1.0</ind><dep>-11</dep></entry>
-			<entry><ind>1.1</ind><dep> 28</dep></entry>
-			<entry><ind>1.2</ind><dep> 63</dep></entry>
-			<entry><ind>1.4</ind><dep>125</dep></entry>
-			<entry><ind>1.6</ind><dep>191</dep></entry>
+			<entry><ind>0.80</ind><dep>-18</dep></entry>
+			<entry><ind>1.00</ind><dep>-11</dep></entry>
+			<entry><ind>1.10</ind><dep> 28</dep></entry>
+			<entry><ind>1.20</ind><dep> 63</dep></entry>
+			<entry><ind>1.40</ind><dep>125</dep></entry>
+			<entry><ind>1.60</ind><dep>191</dep></entry>
+			<entry><ind>1.65</ind><dep>208</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1071,12 +1072,13 @@
     	<object-name>epr2</object-name>
     	<property>/engines/engine[1]/epr-actual</property>
 		<interpolation>
-			<entry><ind>0.8</ind><dep>-18</dep></entry>
-			<entry><ind>1.0</ind><dep>-11</dep></entry>
-			<entry><ind>1.1</ind><dep> 28</dep></entry>
-			<entry><ind>1.2</ind><dep> 63</dep></entry>
-			<entry><ind>1.4</ind><dep>125</dep></entry>
-			<entry><ind>1.6</ind><dep>191</dep></entry>
+			<entry><ind>0.80</ind><dep>-18</dep></entry>
+			<entry><ind>1.00</ind><dep>-11</dep></entry>
+			<entry><ind>1.10</ind><dep> 28</dep></entry>
+			<entry><ind>1.20</ind><dep> 63</dep></entry>
+			<entry><ind>1.40</ind><dep>125</dep></entry>
+			<entry><ind>1.60</ind><dep>191</dep></entry>
+			<entry><ind>1.65</ind><dep>208</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1095,12 +1097,13 @@
     	<object-name>eprlimy1</object-name>
     	<property>/controls/engines/epr-limit</property>
 		<interpolation>
-			<entry><ind>0.8</ind><dep>-18</dep></entry>
-			<entry><ind>1.0</ind><dep>-11</dep></entry>
-			<entry><ind>1.1</ind><dep> 28</dep></entry>
-			<entry><ind>1.2</ind><dep> 63</dep></entry>
-			<entry><ind>1.4</ind><dep>125</dep></entry>
-			<entry><ind>1.6</ind><dep>191</dep></entry>
+			<entry><ind>0.80</ind><dep>-18</dep></entry>
+			<entry><ind>1.00</ind><dep>-11</dep></entry>
+			<entry><ind>1.10</ind><dep> 28</dep></entry>
+			<entry><ind>1.20</ind><dep> 63</dep></entry>
+			<entry><ind>1.40</ind><dep>125</dep></entry>
+			<entry><ind>1.60</ind><dep>191</dep></entry>
+			<entry><ind>1.65</ind><dep>208</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1119,12 +1122,13 @@
     	<object-name>eprlimy2</object-name>
     	<property>/controls/engines/epr-limit</property>
 		<interpolation>
-			<entry><ind>0.8</ind><dep>-18</dep></entry>
-			<entry><ind>1.0</ind><dep>-11</dep></entry>
-			<entry><ind>1.1</ind><dep> 28</dep></entry>
-			<entry><ind>1.2</ind><dep> 63</dep></entry>
-			<entry><ind>1.4</ind><dep>125</dep></entry>
-			<entry><ind>1.6</ind><dep>191</dep></entry>
+			<entry><ind>0.80</ind><dep>-18</dep></entry>
+			<entry><ind>1.00</ind><dep>-11</dep></entry>
+			<entry><ind>1.10</ind><dep> 28</dep></entry>
+			<entry><ind>1.20</ind><dep> 63</dep></entry>
+			<entry><ind>1.40</ind><dep>125</dep></entry>
+			<entry><ind>1.60</ind><dep>191</dep></entry>
+			<entry><ind>1.65</ind><dep>208</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1143,12 +1147,13 @@
     	<object-name>thrpos1</object-name>
     	<property>/engines/engine[0]/epr-cmd</property>
 		<interpolation>
-			<entry><ind>0.8</ind><dep>-18</dep></entry>
-			<entry><ind>1.0</ind><dep>-11</dep></entry>
-			<entry><ind>1.1</ind><dep> 28</dep></entry>
-			<entry><ind>1.2</ind><dep> 63</dep></entry>
-			<entry><ind>1.4</ind><dep>125</dep></entry>
-			<entry><ind>1.6</ind><dep>191</dep></entry>
+			<entry><ind>0.80</ind><dep>-18</dep></entry>
+			<entry><ind>1.00</ind><dep>-11</dep></entry>
+			<entry><ind>1.10</ind><dep> 28</dep></entry>
+			<entry><ind>1.20</ind><dep> 63</dep></entry>
+			<entry><ind>1.40</ind><dep>125</dep></entry>
+			<entry><ind>1.60</ind><dep>191</dep></entry>
+			<entry><ind>1.65</ind><dep>208</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
@@ -1167,12 +1172,13 @@
     	<object-name>thrpos2</object-name>
     	<property>/engines/engine[1]/epr-cmd</property>
 		<interpolation>
-			<entry><ind>0.8</ind><dep>-18</dep></entry>
-			<entry><ind>1.0</ind><dep>-11</dep></entry>
-			<entry><ind>1.1</ind><dep> 28</dep></entry>
-			<entry><ind>1.2</ind><dep> 63</dep></entry>
-			<entry><ind>1.4</ind><dep>125</dep></entry>
-			<entry><ind>1.6</ind><dep>191</dep></entry>
+			<entry><ind>0.80</ind><dep>-18</dep></entry>
+			<entry><ind>1.00</ind><dep>-11</dep></entry>
+			<entry><ind>1.10</ind><dep> 28</dep></entry>
+			<entry><ind>1.20</ind><dep> 63</dep></entry>
+			<entry><ind>1.40</ind><dep>125</dep></entry>
+			<entry><ind>1.60</ind><dep>191</dep></entry>
+			<entry><ind>1.65</ind><dep>208</dep></entry>
 		</interpolation>
     	<center>
     		<x-m>0</x-m>
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
index 1b1a01ac..7d3f2a79 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
+++ b/Models/Instruments/Upper-ECAM-EIS2/resCFM/eicasCFM.ac
@@ -4,36 +4,17 @@ MATERIAL "DefaultWhite.001" rgb 0 0 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 64
 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647  spec 0 0 0  shi 0  trans 0
 MATERIAL "Material.001" rgb 0.8 0.5614 0  amb 1 1 1  emis 0.8 0.8 0.8  spec 0.5 0.5 0.5  shi 50  trans 0
 OBJECT world
-kids 14
+kids 13
 OBJECT poly
 name "egt2"
-loc 0.000794735 0.027279 -0.0182949
+loc 0.000794735 0.027279 -0.0217698
 texture "symbols.png"
 crease 45.000000
 numvert 4
-0 0.000161324 0.00281896
-0 -0.00020624 0.00282831
-0 -0.000367407 -0.00281372
-0 0.000367753 -0.00283241
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
-name "egt1"
-loc 0.000794735 0.027279 0.0503317
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000367753 -0.00283241
-0 -0.000367407 -0.00281372
-0 -0.00020624 0.00282831
-0 0.000161324 0.00281896
+0 0.000367746 -0.00517167
+0 -0.00036741 -0.00513754
+0 -0.000206247 0.00516419
+0 0.00016132 0.00514711
 numsurf 1
 SURF 0x30
 mat 0
@@ -44,6 +25,25 @@ refs 4
 0 0.0771681 0.181706
 kids 0
 OBJECT poly
+name "egt1"
+loc 0.000794735 0.027279 0.0467833
+texture "symbols.png"
+crease 45.000000
+numvert 4
+0 0.00016132 0.00514711
+0 -0.000206247 0.00516419
+0 -0.00036741 -0.00513754
+0 0.000367746 -0.00517167
+numsurf 1
+SURF 0x30
+mat 0
+refs 4
+0 0.343129 0.181706
+1 0.343129 0.146419
+2 0.0771681 0.146419
+3 0.0771681 0.181706
+kids 0
+OBJECT poly
 name "n12"
 loc 0.000794735 0.0565868 -0.0269054
 texture "symbols.png"
@@ -1813,25 +1813,6 @@ refs 3
 0 0.5 0.5
 kids 0
 OBJECT poly
-name "egt1"
-loc 0.000794735 0.027279 0.0503317
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000161324 0.00281896
-0 -0.00020624 0.00282831
-0 -0.000367407 -0.00281372
-0 0.000367753 -0.00283241
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
 name "n11"
 loc 0.000794735 0.0565868 0.0416832
 texture "symbols.png"
diff --git a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
index ec178b92..a3f4e045 100644
--- a/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
+++ b/Models/Instruments/Upper-ECAM-EIS2/resIAE/eicasIAE.ac
@@ -4,17 +4,17 @@ MATERIAL "DefaultWhite.001" rgb 0 0 0  amb 0 0 0  emis 0 0 0  spec 0 0 0  shi 64
 MATERIAL "ac3dmat9" rgb 0 0.356863 0.717647  amb 0 0 0  emis 0 0.356863 0.717647  spec 0 0 0  shi 0  trans 0
 MATERIAL "Material.001" rgb 0.8 0.5614 0  amb 1 1 1  emis 0.8 0.8 0.8  spec 0.5 0.5 0.5  shi 50  trans 0
 OBJECT world
-kids 18
+kids 17
 OBJECT poly
 name "egt2"
-loc 0.000794735 0.027279 -0.0182949
+loc 0.000794735 0.027279 -0.0217698
 texture "symbols.png"
 crease 45.000000
 numvert 4
-0 0.000161324 0.00281896
-0 -0.00020624 0.00282831
-0 -0.000367407 -0.00281372
-0 0.000367753 -0.00283241
+0 0.000161324 0.00514711
+0 -0.00020624 0.00516419
+0 -0.000367407 -0.00513754
+0 0.000367753 -0.00517167
 numsurf 1
 SURF 0x30
 mat 0
@@ -26,14 +26,14 @@ refs 4
 kids 0
 OBJECT poly
 name "egt1"
-loc 0.000794735 0.027279 0.0503317
+loc 0.000794735 0.027279 0.0467833
 texture "symbols.png"
 crease 45.000000
 numvert 4
-0 0.000367753 -0.00283241
-0 -0.000367407 -0.00281372
-0 -0.00020624 0.00282831
-0 0.000161324 0.00281896
+0 0.000367753 -0.00517167
+0 -0.000367407 -0.00513754
+0 -0.00020624 0.00516419
+0 0.000161324 0.00514711
 numsurf 1
 SURF 0x30
 mat 0
@@ -1851,34 +1851,15 @@ refs 4
 0 0.0771681 0.181706
 kids 0
 OBJECT poly
-name "egt1"
-loc 0.000794735 0.027279 0.0503317
-texture "symbols.png"
-crease 45.000000
-numvert 4
-0 0.000161324 0.00281896
-0 -0.00020624 0.00282831
-0 -0.000367407 -0.00281372
-0 0.000367753 -0.00283241
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-0 0.343129 0.181706
-1 0.343129 0.146419
-2 0.0771681 0.146419
-3 0.0771681 0.181706
-kids 0
-OBJECT poly
 name "epr1"
-loc 0.000794735 0.0565868 0.0416832
+loc 0.000794735 0.0563719 0.0422057
 texture "symbols.png"
 crease 45.000000
 numvert 4
-0 0.00356107 -0.00715186
-0 0.00215133 -0.00765084
-0 -0.00320914 0.00749853
-0 -0.00252993 0.00773323
+0 0.00377597 -0.00767436
+0 0.00236623 -0.00817334
+0 -0.00299424 0.00697603
+0 -0.00231503 0.00721074
 numsurf 1
 SURF 0x30
 mat 0