From 84d50580fddaaec07eb702f2d5d1003d6867ac7e Mon Sep 17 00:00:00 2001
From: Philosopher <NasalMusician@gmail.com>
Date: Mon, 20 Jan 2014 11:11:07 -0600
Subject: [PATCH] Remove old references to /sim/auto-coordination.

Leave the alias code in aircraft.nas just to be safe.
---
 Aircraft/Citation-Bravo/Nasal/flightdirector.nas          | 2 +-
 Aircraft/CitationX/Nasal/flightdirector.nas               | 2 +-
 Aircraft/airwaveXtreme150/airwaveXtreme150-JSBSim-set.xml | 1 -
 Aircraft/pa22/Models/pa22.xml                             | 2 +-
 Aircraft/pa22/Nasal/pa22.nas                              | 4 ++--
 Input/Joysticks/Saitek/X52.xml                            | 2 +-
 Protocol/bintest.xml                                      | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Aircraft/Citation-Bravo/Nasal/flightdirector.nas b/Aircraft/Citation-Bravo/Nasal/flightdirector.nas
index f1ddaae..d15beaa 100644
--- a/Aircraft/Citation-Bravo/Nasal/flightdirector.nas
+++ b/Aircraft/Citation-Bravo/Nasal/flightdirector.nas
@@ -10,7 +10,7 @@ var Vertical = "autopilot/locks/altitude";
 var Vertical_arm = "autopilot/locks/altitude-arm";
 var AP = "autopilot/locks/AP-status";
 var NAVprop="autopilot/settings/nav-source";
-var AutoCoord="sim/auto-coordination";
+var AutoCoord="controls/flight/auto-coordination";
 var NAVSRC= getprop(NAVprop);
 var count=0;
 var Coord = 0;
diff --git a/Aircraft/CitationX/Nasal/flightdirector.nas b/Aircraft/CitationX/Nasal/flightdirector.nas
index b0ec9c1..b57eaa2 100644
--- a/Aircraft/CitationX/Nasal/flightdirector.nas
+++ b/Aircraft/CitationX/Nasal/flightdirector.nas
@@ -10,7 +10,7 @@ var Vertical = "autopilot/locks/altitude";
 var Vertical_arm = "autopilot/locks/altitude-arm";
 var AP = "autopilot/locks/AP-status";
 var NAVprop="autopilot/settings/nav-source";
-var AutoCoord="sim/auto-coordination";
+var AutoCoord="controls/flight/auto-coordination";
 var NAVSRC= getprop(NAVprop);
 var count=0;
 var Coord = 0;
diff --git a/Aircraft/airwaveXtreme150/airwaveXtreme150-JSBSim-set.xml b/Aircraft/airwaveXtreme150/airwaveXtreme150-JSBSim-set.xml
index 45155a4..ad16135 100644
--- a/Aircraft/airwaveXtreme150/airwaveXtreme150-JSBSim-set.xml
+++ b/Aircraft/airwaveXtreme150/airwaveXtreme150-JSBSim-set.xml
@@ -393,7 +393,6 @@ Last update: Nov 8, 2002 Michael Selig, m-selig@uiuc.edu
       <label>Toggle Pilot Animation Rotate + Yaw</label>
        <binding>
         <command>property-toggle</command>
-        <!-- <property>sim/auto-coordination</property> -->
         <property>controls/flight/auto-coordination</property>
         <value>0</value> 
        </binding>
diff --git a/Aircraft/pa22/Models/pa22.xml b/Aircraft/pa22/Models/pa22.xml
index f46655e..90517fc 100644
--- a/Aircraft/pa22/Models/pa22.xml
+++ b/Aircraft/pa22/Models/pa22.xml
@@ -1642,7 +1642,7 @@
   <animation>
     <type>translate</type>
     <object-name>interconnect</object-name>
-    <property>sim/auto-coordination</property>
+    <property>controls/flight/auto-coordination</property>
     <factor>0.05</factor>    
     <axis>
       <x>1.0</x>
diff --git a/Aircraft/pa22/Nasal/pa22.nas b/Aircraft/pa22/Nasal/pa22.nas
index b7c82c4..2559f3f 100644
--- a/Aircraft/pa22/Nasal/pa22.nas
+++ b/Aircraft/pa22/Nasal/pa22.nas
@@ -148,7 +148,7 @@ var autostart = func {
 # Auto Coordination
 
 var auto_coordination_switch = func (v = -1) {
-	toggle=getprop("sim/auto-coordination");
+	toggle=getprop("controls/flight/auto-coordination");
   
 	if(v == -1)
 	{
@@ -159,7 +159,7 @@ var auto_coordination_switch = func (v = -1) {
 		toggle = v;
 	}
 	
-	setprop("sim/auto-coordination",toggle);
+	setprop("controls/flight/auto-coordination",toggle);
   
 #	if(toggle == 1)
 #	{
diff --git a/Input/Joysticks/Saitek/X52.xml b/Input/Joysticks/Saitek/X52.xml
index dcaa633..95217a5 100644
--- a/Input/Joysticks/Saitek/X52.xml
+++ b/Input/Joysticks/Saitek/X52.xml
@@ -379,7 +379,7 @@ Bit  Binary     Hardware Function       Interpretation
    <binding>
     <command>nasal</command>
     <script>
-      setprop("/sim/auto-coordination", ! !getprop("/sim/gui/d-button"));
+      setprop("/controls/flight/auto-coordination", ! !getprop("/sim/gui/d-button"));
     </script>
    </binding>
 </button>
diff --git a/Protocol/bintest.xml b/Protocol/bintest.xml
index ca3e503..1ef43de 100644
--- a/Protocol/bintest.xml
+++ b/Protocol/bintest.xml
@@ -35,7 +35,7 @@
    <chunk>
     <name>autocoord</name>
     <type>bool</type>
-    <node>/sim/auto-coordination</node>
+    <node>/controls/flight/auto-coordination</node>
    </chunk>
 
    <!-- chunk>
-- 
2.1.4