--- ./data/Input/Joysticks/Saitek/X52.xml	2007/01/30 14:57:46	1.1
+++ ./data/Input/Joysticks/Saitek/X52.xml	2007/01/31 14:50:02
@@ -1,135 +1,163 @@
 <?xml version="1.0"?>
 <!--
-Only a few stick controls have been mapped here:
- + "Rocker" switch:     Rudder
- + Top rotary dial:     Mixture
- + Bottom rotary dial:  Prop Advance
- + Top stick hat:       Elevator & Aileron trim
- + Bottom stick hat:    View direction
- + Top throttle hat:    Flaps & Rudder trim
- + Stick button "A":    Gear toggle
- + Stick button "C":    Reset view (hackish)
-
-Linux/Windows/Mac Axis Numbers:
-  0   	Roll (positive == right) 
-  1  	Pitch (positive == down/back/nose-up)
-  2/5/5 top "rotary dial" on the throttle (positive == CCW)
-  3   	Rocker switch ("rudder" control) on the throttle (positive == right)
-  4/2/2 Throttle (positive == back/down/idle)
-  5/4/4 Bottom "rotary dial" on the throttle (positive == CW)
-  	Strange this axis doesn't seem to exist on Mac OS X!
-  6/6/6 Lower right hat horizontal axis (positive == right)
-  7/7/7 Lower right hat vertical axis (positive == down (Mac positive is UP))
-
-Button Numbers (Identical b/w Linux/Windows/Mac):
- 0  Trigger
- 1  Stick top "A" switch
- 2  Stick top "B" switch
- 3  Stick top "launch/fire" switch
- 4  Throttle "D" switch
- 5  Throttle "mouse" switch (tiny black thumb button)
- 6  Stick "pinkie" switch
- 7  Stick front "C" switch
- 8  -+                                left position   ("M1")
- 9   +- Throttle "mode" 3-way switch: middle position ("M2")
-10  -+                                right position  ("M3")
-11  -+                                left position
-12   +- Throttle "Aux" 3-way switch:  middle position
-13  -+                                right position
-14  Upper left hat in "up" position
-15  Upper left hat in "right" position
-16  Upper left hat in "down" position
-17  Upper left hat in "left" position
-18  Throttle forefinger hat in "up/back" position
-19  Throttle forefinger hat in "right" position
-20  Throttle forefinger hat in "down/forward" position
-21  Throttle forefinger hat in "left" position
-22  Throttle thumb hat in "up" position
-23  Throttle thumb hat in "right" position
-24  Throttle thumb hat in "down" position
-25  Throttle thumb hat in "left" position
 
-$Id: X52.xml,cvs 1.1 2007/01/30 14:57:46 jsd Exp $
+This is X52.xml, the joystick config file for the Saitek X52 
+USB stick and throttle.
+
+For details on what this does and why, see the Docs/README.X52 file.
+
 -->
+
 <PropertyList>
- 
- <name>Saitek X52</name>
- <name>Saitek Saitek X52</name>
- <name>Saitek X52 Flight Controller USB</name>
- <name>Saitek X52 Flight Control Stick </name>
- <name>Saitek Saitek X52 Flight Control Stick </name>
- <name>Saitek X52 Flight Stick (USB)</name>
- <name>Saitek Saitek X52 Flight Stick (USB)</name>
- <name>Saitek Saitek X52 Flight Control System</name>
+<name>Saitek X52</name>
+<name>Saitek Saitek X52</name>
+<name>Saitek X52 Flight Controller USB</name>
+<name>Saitek X52 Flight Control Stick </name>
+<name>Saitek Saitek X52 Flight Control Stick </name>
+<name>Saitek X52 Flight Stick (USB)</name>
+<name>Saitek Saitek X52 Flight Stick (USB)</name>
+<name>Saitek Saitek X52 Flight Control System</name>
 
- <axis n="0">
+<axis>	<!-- 0/0/0 -->
   <desc>Aileron</desc>
+  <number>
+   <unix>0</unix>
+   <mac>0</mac>
+   <windows>0</windows>
+  </number>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/aileron</property>
-   <squared type="bool">true</squared>
+   <factor type="double">0.5</factor>
   </binding>
- </axis>
+</axis>
 
- <axis n="1">
+<axis>  <!-- 1/1/1 -->
   <desc>Elevator</desc>
+  <number>
+   <unix>1</unix>
+   <mac>1</mac>
+   <windows>1</windows>
+  </number>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/elevator</property>
-   <factor type="double">-1.0</factor>
-   <squared type="bool">true</squared>
+   <factor type="double">-0.5</factor>
   </binding>
- </axis>
+</axis>
 
-<!--<axis n="3">
-  <desc>Rudder</desc>
+<axis>  <!-- 2/2/2 -->
+  <desc>Throttle</desc>
+  <number>
+   <unix>2</unix>
+   <mac>2</mac>
+   <windows>2</windows>
+  </number>
   <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/rudder</property>
+   <command>nasal</command>
+   <script>controls.throttleAxis()</script>
   </binding>
+</axis>
 
+<axis>  <!-- 3/5/5 -->
+  <desc>Mixture</desc>
+  <number>
+   <unix>3</unix>
+   <mac>5</mac>
+   <windows>5</windows>
+  </number>
   <binding>
    <command>nasal</command>
-   <script><![CDATA[
-    # In mode 3 (taxiing), map the wheelbrakes
-    if(getprop("/input/joysticks/js[0]/saitek-x45-mode") == 3) {
-        val = cmdarg().getNode("setting").getValue();
-        setprop("/controls/gear/brake-left", 0);
-        setprop("/controls/gear/brake-right", 0);
-        if(val > 0) { setprop("/controls/gear/brake-right", val); }
-        else        { setprop("/controls/gear/brake-left", -val); }
-    }
-   ]]></script>
+   <script>controls.mixtureAxis(-1)</script>
   </binding>
- </axis>-->
+</axis>
 
- <!-- View Direction Hat -->
+<!-- Alternate Prop RPM :: throttle upper rotary -->
+<axis>  <!-- 4/8/8 -->
+  <desc>Propeller RPM</desc>
+  <number>
+   <unix>4</unix>
+   <mac>8</mac>
+   <windows>8</windows>
+  </number>
+  <binding>
+   <command>nasal</command>
+   <script>
+     controls.propellerAxis(-1)
+   </script>
+  </binding>
+</axis>
+
+<!-- Rudder :: stick twist -->
+<axis>  <!-- 5/3/3 -->
+    <desc>Rudder</desc>
+    <number>
+	<unix>5</unix>
+	<mac>3</mac>
+	<windows>3</windows>
+    </number>
+    <binding>
+	<command>property-scale</command>
+	<property>/controls/flight/rudder</property>
+	<factor type="double">1.0</factor>
+    </binding>
+</axis>
+
+<!-- Propeller RPM :: throttle thumb slider --> 
+<axis>  <!-- 6/4/4 -->
+  <desc>Propeller RPM</desc>
+  <number>
+   <unix>6</unix>
+   <mac>4</mac>
+   <windows>4</windows>
+  </number>
+  <binding>
+   <command>nasal</command>
+   <script>controls.propellerAxis(-1)</script>
+  </binding>
+</axis>
 
- <axis n="6">
+
+<!-- View Direction :: stick lower hat -->
+<axis>  <!-- 7/6/6 -->
+  <desc>View Pan Left/Right (D-shift: move PoV)</desc>
   <number>
    <unix>7</unix>
    <mac>6</mac>
    <windows>6</windows>
   </number>
-  <desc>View Direction</desc>
   <low>
    <repeatable>true</repeatable>
    <binding>
     <command>nasal</command>
-    <script>view.panViewDir(1)</script>
+    <script>
+      if (getprop("/sim/gui/d-button")){
+        setprop("/sim/current-view/x-offset-m", 
+	  -0.01 + getprop("/sim/current-view/x-offset-m"));
+      } else {
+	view.panViewDir(1)
+      }
+    </script>
    </binding>
   </low>
   <high>
    <repeatable>true</repeatable>
    <binding>
     <command>nasal</command>
-    <script>view.panViewDir(-1)</script>
+    <script>
+      if (getprop("/sim/gui/d-button")){
+        setprop("/sim/current-view/x-offset-m", 
+	  0.01 + getprop("/sim/current-view/x-offset-m"));
+      } else {
+	view.panViewDir(-1)
+      }
+    </script>
    </binding>
   </high>
- </axis>
+</axis>
 
- <axis>
-  <desc>View Elevation</desc>
+<axis> <!-- 8/7/7 -->
+  <desc>View Tilt Up/Down (D-shift: move PoV)</desc>
   <number>
    <unix>8</unix>
    <mac>7</mac>
@@ -139,179 +167,171 @@
    <repeatable>true</repeatable>
    <binding>
     <command>nasal</command>
-    <script>view.panViewPitch(1)</script>
+    <script>
+      if (getprop("/sim/gui/d-button")){
+        setprop("/sim/current-view/y-offset-m", 
+	  0.01 + getprop("/sim/current-view/y-offset-m"));
+      } else {
+        view.panViewPitch(1)
+      }
+    </script>
    </binding>
   </low>
   <high>
    <repeatable>true</repeatable>
    <binding>
     <command>nasal</command>
-    <script>view.panViewPitch(-1)</script>
+    <script>
+      if (getprop("/sim/gui/d-button")){
+        setprop("/sim/current-view/y-offset-m", 
+	  -0.01 + getprop("/sim/current-view/y-offset-m"));
+      } else {
+        view.panViewPitch(-1)
+      }
+    </script>
    </binding>
   </high>
- </axis>
+</axis>
 
- <axis>
-  <desc>Throttle</desc>
-  <number>
-   <unix>2</unix>
-   <mac>2</mac>
-   <windows>2</windows>
-  </number>
-  <binding>
-   <command>nasal</command>
-   <script>controls.throttleAxis()</script>
-  </binding>
- </axis>
 
- <axis>
-  <desc>Mixture</desc>
-  <number>
-   <unix>3</unix>
-   <mac>5</mac>
-   <windows>5</windows>
-  </number>
-  <binding>
-   <command>nasal</command>
-   <script>controls.mixtureAxis()</script>
-  </binding>
- </axis>
+<!-- End of axes;  now on to buttons -->
 
- <axis>
-  <desc>Propeller Advance</desc>
-  <number>
-   <unix>4</unix>
-   <mac>4</mac>
-   <windows>4</windows>
-  </number>
-  <binding>
-   <command>nasal</command>
-   <script>controls.propellerAxis(-1)</script>
-  </binding>
- </axis>
+<button n="1">
+   <desc>(FIRE) : Auto-Coordination off (D-shift: on)</desc>
+   <binding>
+    <command>nasal</command>
+    <script>
+      setprop("/sim/auto-coordination", ! !getprop("/sim/gui/d-button"));
+    </script>
+   </binding>
+</button>
 
- <button n="4">
-  <desc>Reset View</desc>
-  <binding>
-   <command>nasal</command>
-   <script>view.resetView()</script>
-  </binding>
- </button>
 
-<!-- <button n="0">
-  <desc>Brakes</desc>
-  <binding>
-   <command>nasal</command>
-   <script>controls.applyBrakes(1)</script>
-  </binding>
-  <mod-up>
+<button n="3">
+   <desc>(B) : Zoom out i.e. increase field of view (D-shift: zoom in)</desc>
+   <repeatable type="bool">true</repeatable>
    <binding>
     <command>nasal</command>
-    <script>controls.applyBrakes(0)</script>
+    <script>
+      if ( getprop("/sim/gui/d-button") ) {
+        view.decrease(0.5)		# zoom in
+      } else {
+        view.increase(0.5)		# zoom out
+      }
+    </script>
    </binding>
-  </mod-up>
- </button> -->
-
- <!-- Gear down on button T2 -->
+</button>
 
- <button n="9">
-  <desc>Landing Gear Down</desc>
+<button n="4">
+  <desc>(C) : Reset View</desc>
   <binding>
    <command>nasal</command>
-   <script>controls.gearDown(1)</script>
+   <script>
+     view.resetView();		# only resets tilt/pan/zoom:
+				# must reset x/y/z view point separately
+     vn = getprop("/sim/current-view/view-number");
+     conf = sprintf("/sim/view[%d]/config", vn);
+     foreach (parm ; ["x-offset-m", "y-offset-m", "z-offset-m"]) {
+       setprop("/sim/current-view/", parm, getprop(conf, parm));
+     }
+   </script>
+  </binding>
+</button>
+
+<!-- Main brakes (not parking brakes) :: pinky subtrigger -->
+<button n="5">
+  <desc>(Pinky) : Brakes</desc>
+  <binding>
+   <command>nasal</command>
+   <script>controls.applyBrakes(1)</script>
   </binding>
   <mod-up>
    <binding>
     <command>nasal</command>
-    <script>controls.gearDown(0)</script>
+    <script>controls.applyBrakes(0)</script>
    </binding>
   </mod-up>
- </button>
-
- <!-- Gear up on button T1 -->
+</button>
 
- <button n="8">
-  <desc>Landing Gear Up</desc>
+<!-- Shift :: (D) button -->
+<button n="6">
+  <desc>(D) : Shift Key</desc>
   <binding>
    <command>nasal</command>
-   <script>controls.gearDown(-1)</script>
+   <script>
+     setprop("/sim/gui/d-button", 1);
+   </script>
   </binding>
   <mod-up>
    <binding>
     <command>nasal</command>
-    <script>controls.gearDown(0)</script>
+    <script>
+      setprop("/sim/gui/d-button", 0);
+    </script>
    </binding>
   </mod-up>
- </button>
+</button>
 
-<!-- mode switch (buttons 23-25) -->
 
- <button n="23">
-  <desc>Mode 1</desc>
-  <binding>
-   <command>nasal</command>
-   <script>setprop("/input/joysticks/js[0]/saitek-x52-mode", 1)</script>
-  </binding>
- </button>
+  <!-- gear handle up/down :: button T1/T2 -->
+  <button n="8">
+   <desc>(T1) : Landing Gear Handle Up</desc>
+    <binding>
+     <command>nasal</command>
+      <script>
+       controls.gearDown(-1)
+     </script>
+    </binding>
+  </button>
+  <button n="9">
+    <desc>(T2) : Landing Gear Handle Down</desc>
+    <binding>
+     <command>nasal</command>
+     <script>
+       controls.gearDown(1)
+     </script>
+    </binding>
+  </button>
 
- <button n="24">
-  <desc>Mode 2</desc>
-  <binding>
-   <command>nasal</command>
-   <script>setprop("/input/joysticks/js[0]/saitek-x52-mode", 2)</script>
-  </binding>
- </button>
 
- <button n="25">
-  <desc>Mode 3</desc>
-  <binding>
-   <command>nasal</command>
-   <script>setprop("/input/joysticks/js[0]/saitek-x52-mode", 3)</script>
-  </binding>
- </button>
-
- <!-- Trim (upper) hat on the stick -->
-
- <button n="15">
+<!-- Pitch trim :: stick upper hat -->
+<button n="15">
   <desc>Elevator trim down</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>nasal</command>
-   <script>controls.elevatorTrim(0.5)</script>
+   <script>controls.elevatorTrim(0.3)</script>
   </binding>
- </button>
-
- <button n="16">
-  <desc>Aileron trim right</desc>
+</button>
+<button n="17">
+  <desc>Elevator trim up</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>nasal</command>
-   <script>controls.aileronTrim(0.5)</script>
+   <script>controls.elevatorTrim(-0.3)</script>
   </binding>
- </button>
+</button>
 
- <button n="17">
-  <desc>Elevator trim up</desc>
+<button n="16">
+  <desc>Aileron trim right</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>nasal</command>
-   <script>controls.elevatorTrim(-0.5)</script>
+   <script>controls.aileronTrim(0.2)</script>
   </binding>
- </button>
-
- <button n="18">
+</button>
+<button n="18">
   <desc>Aileron trim left</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>nasal</command>
-   <script>controls.aileronTrim(-0.5)</script>
+   <script>controls.aileronTrim(-0.2)</script>
   </binding>
- </button>
+</button>
 
- <!-- Flap control on the T3/T4 -->
-
- <button n="10">
-  <desc>Decrease flaps</desc>
+<!-- Flap control :: T3/T4 -->
+<button n="10">
+  <desc>(T3) : Decrease flaps</desc>
   <binding>
    <command>nasal</command>
    <script>controls.flapsDown(-1)</script>
@@ -322,10 +342,9 @@
     <script>controls.flapsDown(0)</script>
    </binding>
   </mod-up>
- </button>
-
- <button n="11">
-  <desc>Increase flaps</desc>
+</button>
+<button n="11">
+  <desc>(T4) : Increase flaps</desc>
   <binding>
    <command>nasal</command>
    <script>controls.flapsDown(1)</script>
@@ -336,57 +355,121 @@
     <script>controls.flapsDown(0)</script>
    </binding>
   </mod-up>
- </button>
-
- <!-- Rudder trim on the flap hat -->
+</button>
 
- <button n="20">
-  <desc>Rudder trim right</desc>
+  <!-- Speed brake control :: T6/T5 -->
+  <button n="12">
+    <desc>(T5) : Increase speedbrake</desc>
+    <binding>
+     <command>property-assign</command>
+     <property>/controls/flight/speedbrake</property>
+     <value>1</value>
+    </binding>
+  </button>
+  <button n="13">
+    <desc>(T6) : Decrease speedbrake</desc>
+    <binding>
+     <command>property-assign</command>
+     <property>/controls/flight/speedbrake</property>
+     <value>0</value>
+    </binding>
+  </button>
+
+<!-- Rudder trim :: throttle rocker -->
+<button n="20">
+  <desc>(Throttle Rocker) : Rudder trim right</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>nasal</command>
    <script>controls.rudderTrim(1)</script>
   </binding>
- </button>
-
- <button n="22">
-  <desc>Rudder trim left</desc>
+</button>
+<button n="22">
+  <desc>(Throttle Rocker) : Rudder trim left</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>nasal</command>
    <script>controls.rudderTrim(-1)</script>
   </binding>
- </button>
+</button>
 
- <!-- Fire button -->
- <button n="0">
-   <desc>Toggle parking brake on or off</desc>
-   <binding>
-     <!--<command>nasal</command>
-     <script>controls.applyParkingBrake4444(1)</script>-->
-     <command>property-toggle</command>
-     <property>/controls/gear/brake-parking</property>
-   </binding>
- </button>
+<!-- What does this do ???? -->
+<!-- mode switch (buttons 23-25) -->
+<button n="23">
+  <desc>Mode 1</desc>
+  <binding>
+   <command>nasal</command>
+   <script>setprop("/input/joysticks/js[0]/saitek-x52-mode",
+1)</script>
+  </binding>
+</button>
+<button n="24">
+  <desc>Mode 2</desc>
+  <binding>
+   <command>nasal</command>
+   <script>setprop("/input/joysticks/js[0]/saitek-x52-mode",
+2)</script>
+  </binding>
+</button>
+<button n="25">
+  <desc>Mode 3</desc>
+  <binding>
+   <command>nasal</command>
+   <script>setprop("/input/joysticks/js[0]/saitek-x52-mode",
+3)</script>
+  </binding>
+</button>
 
- <!-- Speed brake control on the T6/T5 -->
+<button n="26">
+  <desc>(MFD Func) : Stopwatch timer becomes clock again</desc>
+  <binding>
+   <command>nasal</command>
+   <script>
+      props.globals.getNode("/instrumentation/clock/offset-sec", 1).setValue(0);
+   </script>
+  </binding>
+</button>
 
- <button n="13">
-  <desc>Decrease speedbrake</desc>
+<button n="28">
+  <desc>(MFD Reset) : Stopwatch timer reset</desc>
   <binding>
-   <command>property-assign</command>
-   <property>/controls/flight/speedbrake</property>
-   <value>0</value>
+   <command>nasal</command>
+   <script>
+   <!-- Note that the "indicated-sec" variable is a large number,
+     probably seconds since midnight ... *not* modulo 60. -->
+      ttt = props.globals.getNode("/instrumentation/clock/indicated-sec", 1).getValue();
+      node = props.globals.getNode("/instrumentation/clock/offset-sec", 1);
+      off = node.getValue();
+      node.setValue(off-ttt);
+   </script>
   </binding>
- </button>
+</button>
 
- <button n="12">
-  <desc>Increase speedbrake</desc>
+<!-- (i) button -->
+<button n="29">
+  <desc>(i) : Dump Information to Console</desc>
   <binding>
-   <command>property-assign</command>
-   <property>/controls/flight/speedbrake</property>
-   <value>1</value>
+   <command>nasal</command>
+   <script>
+      #props.dump(props.globals.getNode("/engines", 1));
+      #props.dump(props.globals.getNode("/instrumentation", 1));
+      #props.dump(props.globals.getNode("/sim", 1));
+      #props.dump(props.globals.getNode("/controls", 1));
+      #props.dump(props.globals);
+      #props.dump(props.globals.getNode("/sim/presets", 1));
+      props.dump(props.globals.getNode("/gear"));
+
+   </script>
   </binding>
- </button>
+</button>
+
+<!-- Parking brake :: unbound -->
+<button n="666">
+   <desc>Toggle parking brake on or off</desc>
+   <binding>
+     <command>property-toggle</command>
+     <property>/controls/gear/brake-parking</property>
+   </binding>
+</button>
 
 </PropertyList>