From 3a0bac5940d7d726032efde844207466c16efc7f Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 30 Dec 2018 16:28:02 -0500
Subject: [PATCH] Control: Nose Gear refactored, autopush updated/fixed, Sim:
 UI changes

---
 A320-main.xml                        | 229 +++++++++++++--------------
 Models/Services/Pushback/Douglas.xml |  17 --
 Nasal/libraries.nas                  |   8 +
 Systems/a320-fcs.xml                 |  32 ++--
 gui/dialogs/autopush.xml             |   2 +
 revision.txt                         |   2 +-
 6 files changed, 144 insertions(+), 146 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 63e481f0..3ba61688 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -24,12 +24,13 @@
 
 		<model>
 			<pushback>
+				<connected type="bool">0</connected>
 				<position-norm type="double">0</position-norm>
 				<enabled type="int"/>
 				<available type="int">1</available>
-				<chocks alias="/controls/gear/wheel-chocks"/>
-				<steer-cmd-norm alias="/controls/flight/rudder"/>
-				<yaw alias="/gear/gear[0]/steering-norm"/>
+				<chocks alias="/services/chokes/nose"/>
+				<steer-cmd-norm alias="/fdm/jsbsim/hydraulics/tiller/autopush-cmd"/>
+				<yaw alias="/fdm/jsbsim/fcs/steer-deg"/>
 				<yaw-mult type="float">1.0</yaw-mult>
 				<target-speed-km_h type="float">0.0</target-speed-km_h>
 				<K_p type="float">0.5</K_p>
@@ -179,39 +180,12 @@
 
 		<menubar>
 			<default>
-				<!-- Force disable Route Manager dialogs, bindings are changed just in case the item is not grayed out properly -->
-				<!-- Uncomment when route manager can be replaced by MCDU -->
-				<!--menu n="3">
-					<item n="1">
-						<enabled type="bool" n="0">false</enabled>
-						<binding n="0">
-							<command n="0">nasal</command>
-							<script n="0">
-							gui.popupTip("You must use the MCDU to manage your route.");
-							</script>
-						</binding>
-					</item>
-					<item n="2">
-						<enabled type="bool" n="0">false</enabled>
-						<binding n="0">
-							<command n="0">nasal</command>
-							<script n="0">
-							gui.popupTip("You must use the MCDU to manage your route.");
-							</script>
-						</binding>
-					</item>
-					<item n="3">
-						<enabled type="bool" n="0">false</enabled>
-						<binding n="0">
-							<command n="0">nasal</command>
-							<script n="0">
-							gui.popupTip("You must use the MCDU to manage your route.");
-							</script>
-						</binding>
-					</item>
-				</menu-->
 				<menu n="100">
-					<label>IDG-A32X</label>
+					<label>|</label>
+					<enabled type="bool">false</enabled>
+				</menu>
+				<menu n="101">
+					<label>System</label>
 					<enabled type="bool">true</enabled>
 					<item>
 						<label>Aircraft Config</label>
@@ -232,9 +206,109 @@
 						</binding>
 					</item>
 				</menu>
-				<menu n="101">
+				<menu n="102">
+					<label>FMGC</label>
+					<item>
+						<label>FCU Autoflight</label>
+						<binding>
+							<command>dialog-show</command>
+							<dialog-name>autopilot</dialog-name>
+						</binding>
+					</item>
+					<item>
+						<label>Route Manager</label>
+						<binding>
+							<command>dialog-show</command>
+							<dialog-name>route-manager</dialog-name>
+						</binding>
+					</item>
+				</menu>
+				<menu n="103">
+					<label>DU</label>
+					<item>
+						<label>Captain's PFD</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_pfd.showPFD1();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>First Officer's PFD</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_pfd.showPFD2();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>Captain's ND</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_nd.showNd();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>First Officer's ND</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_nd.showNd('right');
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>Upper ECAM</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_ecam.showUpperECAM();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>Lower ECAM</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_ecam.showLowerECAM();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>IESI</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_iesi.showIESI();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>Left MCDU</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_mcdu.showMCDU1();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>Right MCDU</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_mcdu.showMCDU2();
+							</script>
+						</binding>
+					</item>
+				</menu>
+				<menu n="104">
 					<label>Utilities</label>
-					<enabled type="bool">true</enabled>
 					<item>
 						<label>Select Livery</label>
 						<binding>
@@ -287,87 +361,6 @@
 							<value>1</value>
 						</binding>
 					</item>
-					<item>
-						<label>Show Captain's PFD</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_pfd.showPFD1();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show First Officer's PFD</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_pfd.showPFD2();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show Captain's ND</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_nd.showNd();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show First Officer's ND</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_nd.showNd('right');
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show Upper ECAM</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_ecam.showUpperECAM();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show Lower ECAM</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_ecam.showLowerECAM();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show IESI</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_iesi.showIESI();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show Left MCDU</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_mcdu.showMCDU1();
-							</script>
-						</binding>
-					</item>
-					<item>
-						<label>Show Right MCDU</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							canvas_mcdu.showMCDU2();
-							</script>
-						</binding>
-					</item>
 				</menu>
 			</default>
 		</menubar>
diff --git a/Models/Services/Pushback/Douglas.xml b/Models/Services/Pushback/Douglas.xml
index f872f582..ab6207d6 100644
--- a/Models/Services/Pushback/Douglas.xml
+++ b/Models/Services/Pushback/Douglas.xml
@@ -90,23 +90,6 @@
 			<z>1</z>
 		</axis>
 	</animation>
-
-	<animation>
-		<type>rotate</type>
-		<property>gear/gear[0]/steering-norm</property>
-		<factor>-70</factor>
-		<center>
-			<x-m>0</x-m>
-			<y-m>0</y-m>
-			<z-m>0</z-m>
-		</center>
-		<axis>
-			<x>0</x>
-			<y>0</y>
-			<z>1</z>
-		</axis>
-	</animation>
-
 	
 	<!-- compensate for pitch of aircraft, keep pushback level -->
 	<animation>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index fb8fa513..29266255 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -9,6 +9,14 @@ print("-------------------------------------------------------------------------
 
 setprop("/sim/replay/was-active", 0);
 
+setprop("/sim/menubar/default/menu[0]/item[0]/enabled", 0);
+setprop("/sim/menubar/default/menu[2]/item[0]/enabled", 0);
+setprop("/sim/menubar/default/menu[2]/item[2]/enabled", 0);
+setprop("/sim/menubar/default/menu[3]/enabled", 0);
+setprop("/sim/menubar/default/menu[5]/item[9]/enabled", 0);
+setprop("/sim/menubar/default/menu[5]/item[10]/enabled", 0);
+setprop("/sim/menubar/default/menu[5]/item[11]/enabled", 0);
+
 # Dimmers
 setprop("/controls/lighting/ndl-norm", 1);
 setprop("/controls/lighting/ndr-norm", 1);
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 4123cf3e..efd1bf0c 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -1870,15 +1870,27 @@
 		
 		<fcs_function name="hydraulics/tiller/function">
 			<function>
-				<table>
-					<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
-					<independentVar lookup="column">hydraulics/tiller/switch</independentVar>
-					<tableData>
-						       -1     0  1
-						30.000 -70.0  0  70.0
-						30.001 -10.0  0  10.0
-					</tableData>
-				</table>
+				<ifthen>
+					<eq>
+						<property>/sim/model/pushback/connected</property>
+						<value>1</value>
+					</eq>
+					<product>
+						<property>hydraulics/tiller/autopush-cmd</property>
+						<value>70</value>
+					</product>
+					<table>
+						<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
+						<independentVar lookup="column">hydraulics/tiller/switch</independentVar>
+						<tableData>
+								   -1     0    1
+							 0.500  00.0  0.0  00.0
+							 1.000 -70.0  0.0  70.0
+							30.000 -70.0  0.0  70.0
+							30.001 -10.0  0.0  10.0
+						</tableData>
+					</table>
+				</ifthen>
 			</function>
 		</fcs_function>
 		
@@ -1891,7 +1903,7 @@
 		<switch name="fcs/pushback-steer-deg">
 			<default value="0"/>
 			<test value="fcs/steer-deg">
-				/sim/model/pushback/position-norm gt 0.999
+				/sim/model/pushback/connected eq 1
 			</test>
 		</switch>
 	
diff --git a/gui/dialogs/autopush.xml b/gui/dialogs/autopush.xml
index ef031d33..02632b5d 100644
--- a/gui/dialogs/autopush.xml
+++ b/gui/dialogs/autopush.xml
@@ -90,6 +90,7 @@ Distribute under the terms of GPLv2.
 				<col>2</col>
 				<min>-1.0</min>
 				<max>1.0</max>
+				<step>0.1</step>
 				<property>/sim/model/pushback/steer-cmd-norm</property>
 				<live>true</live>
 				<binding>
@@ -155,6 +156,7 @@ Distribute under the terms of GPLv2.
 				<min>-25</min>
 				<max>25</max>
 				<property>/sim/model/pushback/target-speed-km_h</property>
+				<step>1.0</step>
 				<live>true</live>
 				<binding>
 					<command>dialog-apply</command>
diff --git a/revision.txt b/revision.txt
index d9c2ba3e..3084ff19 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4723
\ No newline at end of file
+4724
\ No newline at end of file