From e67bd958f29ad1cc80645e04f258158ef457d377 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 24 Aug 2018 09:13:37 -0400
Subject: [PATCH] Sim: Autopush tweaks and cleanup

---
 A320-100-CFM.xml            |  1 -
 A320-200-CFM.xml            |  1 -
 A320-200-IAE.xml            |  1 -
 A320-main.xml               | 29 +++++++++++++++--------------
 A320neo-CFM.xml             |  1 -
 A320neo-PW.xml              |  1 -
 AircraftConfig/acconfig.nas |  1 +
 AircraftConfig/autopush.xml | 23 ++++++++++-------------
 Systems/pushback.xml        | 36 ------------------------------------
 revision.txt                |  2 +-
 10 files changed, 27 insertions(+), 69 deletions(-)
 delete mode 100644 Systems/pushback.xml

diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml
index dfde4253..e68416c8 100644
--- a/A320-100-CFM.xml
+++ b/A320-100-CFM.xml
@@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 	</propulsion>
 	
-	<system file="pushback"/>
 	<system file="fuel"/>
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index d794782a..cc5c783c 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 	</propulsion>
 	
-	<system file="pushback"/>
 	<system file="fuel"/>
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 1b491710..ddbdc62d 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 	</propulsion>
 	
-	<system file="pushback"/>
 	<system file="fuel"/>
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
diff --git a/A320-main.xml b/A320-main.xml
index 033a8503..d4bbe64d 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -28,7 +28,7 @@
 
 		<model>
 			<pushback>
-				<position-norm>0</position-norm>
+				<position-norm type="double">0</position-norm>
 				<enabled type="int"/>
 				<available type="int">1</available>
 				<chocks alias="/controls/gear/wheel-chocks"/>
@@ -244,8 +244,7 @@
 						<binding>
 							<command>nasal</command>
 							<script>
-							var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/announce/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml");
-							autopush_dlg.open();
+							acconfig.autopush_dlg.open();
 							</script>
 						</binding>
 					</item>
@@ -398,6 +397,18 @@
 		</fuel>
 	</consumables>
 	
+	<fdm>
+		<jsbsim>
+			<external_reactions>
+				<tractor>
+					<magnitude alias="/sim/model/pushback/force-lbf"/>
+					<x alias="/sim/model/pushback/force-x"/>
+					<y alias="/sim/model/pushback/force-y"/>
+				</tractor>
+			</external_reactions>
+		</jsbsim>
+	</fdm>
+	
 	<payload>
 		<weight n="0">
 			<name>Cockpit Crew</name>
@@ -1537,15 +1548,5 @@
 			<file>Nasal/autopush_route.nas</file>
 		</autopush_route>
 	</nasal>
-	<fdm>
-		<jsbsim>
-			<external_reactions>
-				<tractor>
-					<magnitude alias="/sim/model/pushback/force-lbf"/>
-					<x alias="/sim/model/pushback/force-x"/>
-					<y alias="/sim/model/pushback/force-y"/>
-				</tractor>
-			</external_reactions>
-		</jsbsim>
-	</fdm>
+
 </PropertyList>
diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml
index 653d89d0..828ec642 100644
--- a/A320neo-CFM.xml
+++ b/A320neo-CFM.xml
@@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 	</propulsion>
 	
-	<system file="pushback"/>
 	<system file="fuel"/>
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index f14833a7..0f7cdc24 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -137,7 +137,6 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		</tank>
 	</propulsion>
 	
-	<system file="pushback"/>
 	<system file="fuel"/>
 	<system file="glass-effect1"/>
 	<system file="a320-fcs"/>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 93648790..d829028f 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -109,6 +109,7 @@ var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Air
 var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml");
 var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml");
 var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml");
+var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/autopush/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml");
 spinning.start();
 init_dlg.open();
 
diff --git a/AircraftConfig/autopush.xml b/AircraftConfig/autopush.xml
index a9c880c0..ef031d33 100644
--- a/AircraftConfig/autopush.xml
+++ b/AircraftConfig/autopush.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0"?>
 
 <!--
-
-AUTOPUSH
-Pushback dialog.
-
-Copyright (c) 2018 Autopush authors:
+ AUTOPUSH
+Waypoint model.
+ Copyright (c) 2018 Autopush authors:
  Michael Danilov <mike.d.ft402 -eh- gmail.com>
  Joshua Davidson http://github.com/it0uchpods
- Merspieler http://gitlab.com/merspieler
-Original code (c) FlightGear
+ Merspieler http://github.com/merspieler
 Distribute under the terms of GPLv2.
-
--->
+ -->
 
 <PropertyList>
 
@@ -33,9 +29,9 @@ Distribute under the terms of GPLv2.
 
 		<button>
 			<halign>right</halign>
-			<pref-width>16</pref-width>
-			<pref-height>16</pref-height>
-			<legend/>
+			<pref-width>20</pref-width>
+			<pref-height>20</pref-height>
+			<legend>X</legend>
 			<key>Esc</key>
 			<binding>
 				<command>dialog-close</command>
@@ -284,7 +280,8 @@ Distribute under the terms of GPLv2.
 				<row>1</row>
 				<col>3</col>
 				<halign>left</halign>
-				<label>Show</label>
+				<label>Always Show</label>
+				<live>true</live>
 				<property>/sim/model/pushback/route/show</property>
 				<binding>
 					<command>dialog-apply</command>
diff --git a/Systems/pushback.xml b/Systems/pushback.xml
deleted file mode 100644
index a47b1b20..00000000
--- a/Systems/pushback.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!--
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
--->
-
-<system name="pushback">
- <property>/sim/model/pushback/target-speed-fps</property>
- <channel name="Pushback">
-
-   <switch name="systems/pushback/linked">
-     <default value="-1"/>
-     <test value="0">
-       /sim/model/pushback/position-norm gt 0.95
-       /gear/gear/wow == 1
-       gear/unit[0]/wheel-speed-fps lt 50
-     </test>
-   </switch>
-
-   <summer name="systems/pushback/speed-error">
-     <input>/sim/model/pushback/target-speed-fps</input>
-     <input>-gear/unit[0]/wheel-speed-fps</input>
-   </summer>
-
-   <switch name="systems/pushback/force-output">
-     <default value="0"/>
-     <test value="systems/pushback/force">
-       systems/pushback/linked == 0
-     </test>
-     <output>external_reactions/pushback/magnitude</output>
-   </switch>
-
- </channel>
-</system>
diff --git a/revision.txt b/revision.txt
index c30bc7d5..ea53445d 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4625
\ No newline at end of file
+4626
\ No newline at end of file