From b504ed18a11e70b4652552becba12d59a81c9b86 Mon Sep 17 00:00:00 2001
From: Vladimir Jelovac <vladimir@jelovac.net>
Date: Wed, 17 Jun 2020 21:58:46 +0200
Subject: [PATCH] Using a single property for all gear chocks #151

---
 A320-main.xml                      |  4 +---
 AircraftConfig/autopush-config.xml |  2 +-
 AircraftConfig/groundservices.xml  | 25 +++++--------------------
 Models/A320-groundservices.xml     |  6 +++---
 Nasal/Libraries/libraries.nas      |  2 +-
 Nasal/Systems/brakesystem.nas      |  4 ++--
 Nasal/Systems/ground_services.nas  |  4 +---
 Systems/a320-fcs.xml               | 11 ++---------
 8 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 2726fd11..95919679 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -951,9 +951,7 @@
 	
 	<services n="0">
 		<chocks n="0">
-			<nose type="bool">0</nose>
-			<left type="bool">0</left>
-			<right type="bool">0</right>
+			<enable type="bool">0</enable>
 		</chocks>
 		<fuel-truck>
 			<connect type="bool">0</connect>
diff --git a/AircraftConfig/autopush-config.xml b/AircraftConfig/autopush-config.xml
index 0e9926c0..fbe49dbf 100644
--- a/AircraftConfig/autopush-config.xml
+++ b/AircraftConfig/autopush-config.xml
@@ -5,7 +5,7 @@
 	<pitch-deg type="float">0.0</pitch-deg>
 	<min-turn-radius-m type="float">15</min-turn-radius-m>
 	<stopping-distance-m type="float">5.0</stopping-distance-m>
-	<chocks	alias="/services/chocks/nose"/>
+	<chocks	alias="/services/chocks/enable"/>
 	<available type="int">1</available>
 	<enabled type="int"/>
 	<connected type="bool">false</connected>
diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml
index e1b3bde3..1598bb0e 100644
--- a/AircraftConfig/groundservices.xml
+++ b/AircraftConfig/groundservices.xml
@@ -57,18 +57,9 @@
                         <property>/gear/gear[2]/wow</property>
                     </and>
                 </enable>
-                <property>/services/chocks/nose</property>
+                <property>/services/chocks/enable</property>
                 <binding>
-                    <command>property-toggle</command>
-                    <property>/services/chocks/left</property>
-                </binding>
-                <binding>
-                    <command>property-toggle</command>
-                    <property>/services/chocks/right</property>
-                </binding>
-                <binding>
-                    <command>property-toggle</command>
-                    <property>/services/chocks/nose</property>
+                    <command>dialog-apply</command>
                 </binding>
                 <live>true</live>
             </checkbox>
@@ -136,9 +127,7 @@
                 <and>
                     <or>
                         <property>/controls/gear/brake-parking</property>
-                        <property>/services/chocks/nose</property>
-                        <property>/services/chocks/left</property>
-                        <property>/services/chocks/right</property>
+                        <property>/services/chocks/enable</property>
                     </or>
                     <less-than>
                         <property>/velocities/groundspeed-kt</property>
@@ -164,9 +153,7 @@
                 <and>
                     <or>
                         <property>/controls/gear/brake-parking</property>
-                        <property>/services/chocks/nose</property>
-                        <property>/services/chocks/left</property>
-                        <property>/services/chocks/right</property>
+                        <property>/services/chocks/enable</property>
                     </or>
                     <less-than>
                         <property>/velocities/groundspeed-kt</property>
@@ -192,9 +179,7 @@
                 <and>
                     <or>
                         <property>/controls/gear/brake-parking</property>
-                        <property>/services/chocks/nose</property>
-                        <property>/services/chocks/left</property>
-                        <property>/services/chocks/right</property>
+                        <property>/services/chocks/enable</property>
                     </or>
                     <less-than>
                         <property>/velocities/groundspeed-kt</property>
diff --git a/Models/A320-groundservices.xml b/Models/A320-groundservices.xml
index 321dd5e9..b964707f 100644
--- a/Models/A320-groundservices.xml
+++ b/Models/A320-groundservices.xml
@@ -132,7 +132,7 @@
 		<path>Aircraft/A320-family/Models/Services/Chocks/chock_nose.ac</path>
 		<condition>
 			<equals>
-				<property>services/chocks/nose</property>
+				<property>services/chocks/enable</property>
 				<value>1</value>
 			</equals>
 		</condition>
@@ -147,7 +147,7 @@
 		<path>Aircraft/A320-family/Models/Services/Chocks/chock_left.ac</path>
 		<condition>
 			<equals>
-				<property>services/chocks/left</property>
+				<property>services/chocks/enable</property>
 				<value>1</value>
 			</equals>
 		</condition>
@@ -163,7 +163,7 @@
 		<path>Aircraft/A320-family/Models/Services/Chocks/chock_right.ac</path>
 		<condition>
 			<equals>
-				<property>services/chocks/right</property>
+				<property>services/chocks/enable</property>
 				<value>1</value>
 			</equals>
 		</condition>
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index a7644a60..9c21a954 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -250,7 +250,7 @@ var systemsLoop = maketimer(0.1, func {
 	systems.APUController.loop();
 	systems.HFLoop();
 	
-	if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/electrical/ground-cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or (getprop("/controls/gear/brake-parking") == 0 and getprop("/services/chocks/nose") == 0 and getprop("/services/chocks/left") == 0 and getprop("/services/chocks/right") == 0))) {
+	if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/electrical/ground-cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or (getprop("/controls/gear/brake-parking") == 0 and getprop("/services/chocks/enable") == 0))) {
 		setprop("/controls/electrical/ground-cart", 0);
 		setprop("/controls/pneumatic/switches/groundair", 0);
 	}
diff --git a/Nasal/Systems/brakesystem.nas b/Nasal/Systems/brakesystem.nas
index 13aebae2..0e70979b 100755
--- a/Nasal/Systems/brakesystem.nas
+++ b/Nasal/Systems/brakesystem.nas
@@ -169,7 +169,7 @@ var BrakeSystem =
 				var V2_R = V1 - me.BrakeDecel * dt * RBrakeLevel;
 
 				LThermalEnergy += (Mass * getprop("gear/gear[1]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_L, 2)) / 2);
-				if (getprop("services/chocks/left")) {
+				if (getprop("services/chocks/enable")) {
 					if (!getprop("controls/gear/brake-parking")) {
 						# cooling effect: reduce thermal energy by (LnCoolFactor) * dt
 						LThermalEnergy = LThermalEnergy * math.exp(LnCoolFactor * dt);					
@@ -202,7 +202,7 @@ var BrakeSystem =
 				};
 
 				RThermalEnergy += (Mass * getprop("gear/gear[2]/compression-norm") * (math.pow(V1, 2) - math.pow(V2_R, 2)) / 2);
-				if (getprop("services/chocks/right")) {
+				if (getprop("services/chocks/enable")) {
 					if (!getprop("controls/gear/brake-parking")) {
 						# cooling effect: reduce thermal energy by (RnCoolFactor) * dt
 						RThermalEnergy = RThermalEnergy * math.exp(RnCoolFactor * dt);
diff --git a/Nasal/Systems/ground_services.nas b/Nasal/Systems/ground_services.nas
index 164e8919..88541e28 100644
--- a/Nasal/Systems/ground_services.nas
+++ b/Nasal/Systems/ground_services.nas
@@ -20,9 +20,7 @@ var ground_services = {
 		
 		# Set them all to 0 if the aircraft is not stationary
 		if (getprop("velocities/groundspeed-kt") >= 2) {
-			setprop("services/chocks/nose", 0);
-			setprop("services/chocks/left", 0);
-			setprop("services/chocks/right", 0);
+			setprop("services/chocks/enable", 0);
 			setprop("services/fuel-truck/enable", 0);
 			setprop("services/deicing_truck/enable", 0);
 			setprop("services/catering/enable", 0);
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index a3ddad8d..0d8af793 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -930,16 +930,10 @@
 			<c1>20</c1>
 		</lag_filter>
 		
-		<pure_gain name="/services/chocks/nose-half">
-			<input>/services/chocks/nose</input>
-			<gain>0.5</gain>
-		</pure_gain>
-		
 		<summer name="fcs/left-brake-summer">
 			<input>/controls/gear/brake-left</input>
 			<input>/controls/gear/brake-parking</input>
-			<input>/services/chocks/nose-half</input>
-			<input>/services/chocks/left</input>
+			<input>/services/chocks/enable</input>
 			<clipto>
 				<min>0</min>
 				<max>1</max>
@@ -957,8 +951,7 @@
 		<summer name="fcs/right-brake-summer">
 			<input>/controls/gear/brake-right</input>
 			<input>/controls/gear/brake-parking</input>
-			<input>/services/chocks/nose-half</input>
-			<input>/services/chocks/right</input>
+			<input>/services/chocks/enable</input>
 			<clipto>
 				<min>0</min>
 				<max>1</max>