From 59b157ce98b7bad668e8979e5bade83eceebcee5 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sat, 10 Oct 2020 14:03:42 +0100
Subject: [PATCH] Slats animated

---
 Models/Instruments/Upper-ECAM/Upper-ECAM.nas  |  4 ++
 .../Instruments/Upper-ECAM/res/cfm-eis2.svg   | 14 +++++--
 .../Instruments/Upper-ECAM/res/iae-eis2.svg   |  8 ++++
 Systems/upper-ecam.xml                        | 42 ++++++++++++++++++-
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 126cfea1..884943d5 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -47,6 +47,8 @@ var slatXOffset = props.globals.getNode("/ECAM/Upper/SlatX", 1);
 var slatYOffset = props.globals.getNode("/ECAM/Upper/SlatY", 1);
 var flapXTranslate = props.globals.getNode("/ECAM/Upper/FlapXtrans", 1);
 var flapYTranslate = props.globals.getNode("/ECAM/Upper/FlapYtrans", 1);
+var slatXTranslate = props.globals.getNode("/ECAM/Upper/SlatXtrans", 1);
+var slatYTranslate = props.globals.getNode("/ECAM/Upper/SlatYtrans", 1);
 var ECAM_line1 = props.globals.getNode("/ECAM/msg/line1", 1);
 var ECAM_line2 = props.globals.getNode("/ECAM/msg/line2", 1);
 var ECAM_line3 = props.globals.getNode("/ECAM/msg/line3", 1);
@@ -321,6 +323,8 @@ var canvas_upperECAM_base = {
 		me["FlapIndicator"].setTranslation(flapXOffset.getValue(),flapYOffset.getValue());
 		me["SlatIndicator"].setTranslation(slatXOffset.getValue(),slatYOffset.getValue());
 		me["FlapLine"].setTranslation(flapXTranslate.getValue(),flapYTranslate.getValue());
+		me["SlatLine"].setTranslation(slatXTranslate.getValue(),slatYTranslate.getValue());
+		
 		# FOB
 		if (acconfig_weight_kgs.getValue())
 		{
diff --git a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
index 3c3573fa..58aa4589 100644
--- a/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/cfm-eis2.svg
@@ -41,9 +41,9 @@
      inkscape:window-height="705"
      id="namedview371"
      showgrid="true"
-     inkscape:zoom="11.313709"
-     inkscape:cx="1211.5956"
-     inkscape:cy="524.36594"
+     inkscape:zoom="1"
+     inkscape:cx="718.57047"
+     inkscape:cy="505.8628"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -1420,4 +1420,12 @@
      x="718.86694"
      y="594.42938"
      inkscape:label="#rect1023" />
+  <rect
+     inkscape:label="#rect1023"
+     y="594.05438"
+     x="554.93781"
+     height="48.089657"
+     width="137.63597"
+     id="SlatLine_clip"
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:3.34691048;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
 </svg>
diff --git a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
index 6f2ef4b5..a0a15cc2 100644
--- a/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
+++ b/Models/Instruments/Upper-ECAM/res/iae-eis2.svg
@@ -1788,4 +1788,12 @@
      x="718.86694"
      y="594.42938"
      inkscape:label="#rect1023" />
+  <rect
+     inkscape:label="#rect1023"
+     y="594.05438"
+     x="554.93781"
+     height="48.089657"
+     width="137.63597"
+     id="SlatLine_clip"
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:3.34691048;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
 </svg>
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index 58cb57c9..e9ab4fb0 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -502,7 +502,7 @@
 			<expression>
 				<table>
 					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
-					<entry><ind> 0.0</ind><dep>-198</dep></entry>
+					<entry><ind> 0.0</ind><dep>-200</dep></entry>
 					<entry><ind>10.0</ind><dep>-135</dep></entry>
 					<entry><ind>15.0</ind><dep>-95</dep></entry>
 					<entry><ind>20.0</ind><dep>-50</dep></entry>
@@ -520,7 +520,7 @@
 			<expression>
 				<table>
 					<property>/fdm/jsbsim/fcs/flap-pos-deg</property>
-					<entry><ind> 0.0</ind><dep>-198</dep></entry>
+					<entry><ind> 0.0</ind><dep>-200</dep></entry>
 					<entry><ind>10.0</ind><dep>-135</dep></entry>
 					<entry><ind>15.0</ind><dep>-95</dep></entry>
 					<entry><ind>20.0</ind><dep>-50</dep></entry>
@@ -614,4 +614,42 @@
 		<output>/ECAM/Upper/SlatY</output>
 	</filter>
 	
+	<filter>
+		<name>Slat Indicator</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/fdm/jsbsim/fcs/slat-pos-deg</property>
+					<entry><ind> 0.0</ind><dep>135</dep></entry>
+					<entry><ind>18.0</ind><dep>95</dep></entry>
+					<entry><ind>22.0</ind><dep>50</dep></entry>
+					<entry><ind>27.0</ind><dep>0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>0</input>
+		<output>/ECAM/Upper/SlatXtrans</output>
+	</filter>
+	
+	<filter>
+		<name>Slat Indicator</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/fdm/jsbsim/fcs/slat-pos-deg</property>
+					<entry><ind> 0.0</ind><dep>-43</dep></entry>
+					<entry><ind>18.0</ind><dep>-29</dep></entry>
+					<entry><ind>22.0</ind><dep>-15</dep></entry>
+					<entry><ind>27.0</ind><dep>0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>0</input>
+		<output>/ECAM/Upper/SlatYtrans</output>
+	</filter>
+	
 </PropertyList>