From 38312a8166cbd729e0580ecd16e7e57a61075902 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 24 Oct 2017 13:25:19 -0400
Subject: [PATCH] A32X: Improve gear AGL calc

---
 Nasal/libraries.nas   | 12 ------------
 Systems/libraries.xml | 40 ++++++++++++++++++++++++++++++++++++++--
 revision.txt          |  2 +-
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 5619ef5c..8bf5971b 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -249,18 +249,6 @@ setlistener("/options/steep-ils", func {
 	}
 });
 
-var aglgears = func {
-    var agl = getprop("/position/altitude-agl-ft") or 0;
-    var aglft = agl - 14.001;  # is the position from the Airbus A320 above ground
-    var aglm = aglft * 0.3048;
-    setprop("/position/gear-agl-ft", aglft);
-    setprop("/position/gear-agl-m", aglm);
-
-    settimer(aglgears, 0.01);
-}
-
-aglgears();
-
 canvas.Text._lastText = canvas.Text["_lastText"];
 canvas.Text.setText = func (text) {
 	if (text == me._lastText) {return me;}
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 964a62f2..605f249d 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -8,6 +8,42 @@
 
 <PropertyList>
 
+	<filter>
+		<name>Gear AGL Altitude FT</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
+				<dif>
+					<property>/position/altitude-agl-ft</property>
+					<value>15.001</value>
+				</dif>
+			</expression>
+		</input>
+		<output>/position/gear-agl-ft</output>
+		<min>0</min>
+		<max>50000</max>
+	</filter>
+	
+	<filter>
+		<name>Gear AGL Altitude M</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input> 
+			<expression>
+				<product>
+					<property>/position/gear-agl-ft</property>
+					<value>0.3048</value>
+				</product>
+			</expression>
+		</input>
+		<output>/position/gear-agl-m</output>
+		<min>0</min>
+		<max>50000</max>
+	</filter>
+
 	<predict-simple>
 		<name>Gear AGL Altitude</name>
 		<debug>false</debug>
@@ -429,7 +465,7 @@
 					<entry><ind>24000</ind><dep> 5.70000</dep></entry>
 					<entry><ind>26000</ind><dep> 5.20000</dep></entry>
 					<entry><ind>28000</ind><dep> 4.70000</dep></entry>
-                    <entry><ind>30000</ind><dep> 4.40000</dep></entry>
+					<entry><ind>30000</ind><dep> 4.40000</dep></entry>
 					<entry><ind>32000</ind><dep> 4.00000</dep></entry>
 					<entry><ind>34000</ind><dep> 3.60000</dep></entry>
 					<entry><ind>36000</ind><dep> 3.30000</dep></entry>
@@ -697,7 +733,7 @@
 					<entry><ind>24000</ind><dep> -52.5</dep></entry>
 					<entry><ind>26000</ind><dep> -50.5</dep></entry>
 					<entry><ind>28000</ind><dep> -48.5</dep></entry>
-                    <entry><ind>30000</ind><dep> -46.5</dep></entry>
+					<entry><ind>30000</ind><dep> -46.5</dep></entry>
 					<entry><ind>32000</ind><dep> -44.5</dep></entry>
 					<entry><ind>34000</ind><dep> -38.9</dep></entry>
 					<entry><ind>36000</ind><dep> -33.3</dep></entry>
diff --git a/revision.txt b/revision.txt
index 5528a3ea..cfdc48c4 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-3005
\ No newline at end of file
+3006
\ No newline at end of file