From 996ed1a7170cfef58db07afc7a6e8ef8a4a42fe5 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Wed, 28 Apr 2004 08:23:38 +0000
Subject: [PATCH] Adjust the joystick configuration to match the new code
 changes.

---
 .../sidewinder-precision-pro-win.xml          | 259 ------------------
 .../Microsoft/sidewinder-precision-pro.xml    | 116 ++++----
 joysticks.xml                                 |   1 -
 3 files changed, 49 insertions(+), 327 deletions(-)
 delete mode 100644 Input/Joysticks/Microsoft/sidewinder-precision-pro-win.xml

diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro-win.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro-win.xml
deleted file mode 100644
index 8daf6d28f..000000000
--- a/Input/Joysticks/Microsoft/sidewinder-precision-pro-win.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-
-************************************************************************
-*
-* sidewinder-precision-pro.xml
-*
-* Bindings for Microsoft Sidewinder Precision Pro joystick.
-*
-* Axis 0: ailerons
-* Axis 1: elevator
-* Axis 2: throttle
-* Axis 3 (twist): rudder
-* Axes 6 (hat): view direction
-* Axes 7 (hat): view elevation
-*
-* Button 0 (trigger): not assigned
-* Button 1: all brakes
-* Button 2: elevator trim up
-* Button 3: elevator trim down
-* Button 4: right brake only
-* Button 5: flap up
-* Button 6: flap down
-* Button 7: left brade only
-* Button 10: not assigned
-*
-************************************************************************
-$Id: sidewinder-precision-pro-win.xml,v 1.7 2004/01/12
-17:49:44 curt Exp $
--->
-
-<PropertyList>
-
- <target-platform>Windows</target-platform>
-
- <name>Microsoft SideWinder Precision Pro</name>
- <name>Microsoft SideWinder Precision 2 Joystick</name>
- <name>Microsoft Microsoft SideWinder Precision Pro (USB)</name>
-
- <axis n="0">
-  <desc>Aileron</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/aileron</property>
-   <squared type="bool">true</squared>
-  </binding>
- </axis>
-
- <axis n="1">
-  <desc>Elevator</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/elevator</property>
-   <factor type="double">-1.0</factor>
-   <squared type="bool">true</squared>
-  </binding>
- </axis>
-
- <axis n="2">
-  <desc>Throttle</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[0]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[1]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[2]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[3]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[4]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[5]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[6]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[7]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
- </axis>
-
- <axis n="3">
-  <desc>Rudder</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/rudder</property>
-   <factor type="double">1.0</factor>
-  </binding>
- </axis>
-
- <axis n="6">
-  <desc>View Direction</desc>
-  <low>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>/sim/current-view/goal-heading-offset-deg</property>
-    <step type="double">1.0</step>
-   </binding>
-  </low>
-  <high>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>/sim/current-view/goal-heading-offset-deg</property>
-    <step type="double">-1.0</step>
-   </binding>
-  </high>
- </axis>
-
- <axis n="7">
-  <desc>View Elevation</desc>
-   <low>
-    <repeatable>true</repeatable>
-    <binding>
-     <command>property-adjust</command>
-     <property>/sim/current-view/goal-pitch-offset-deg</property>
-     <step type="double">1.0</step>
-    </binding>
-   </low>
-   <high>
-    <repeatable>true</repeatable>
-    <binding>
-     <command>property-adjust</command>
-     <property>/sim/current-view/goal-pitch-offset-deg</property>
-     <step type="double">-1.0</step>
-    </binding>
-   </high>
-  </axis>
-
- <button n="1">
-  <desc>Brakes</desc>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/brake-left</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/brake-right</property>
-   <value type="double">1.0</value>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>property-assign</command>
-   <property>/controls/gear/brake-left</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-   <property>/controls/gear/brake-right</property>
-    <value type="double">0.0</value>
-   </binding>
-  </mod-up>
- </button>
-
- <button n="2">
-  <desc>Elevator trim up</desc>
-  <repeatable type="bool">true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/elevator-trim</property>
-   <step type="double">0.001</step>
-  </binding>
- </button>
-
- <button n="3">
-  <desc>Elevator trim down</desc>
-  <repeatable type="bool">true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/elevator-trim</property>
-   <step type="double">-0.001</step>
-  </binding>
- </button>
-
- <button n="6">
-  <desc>Flaps down</desc>
-  <repeatable>false</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/flaps</property>
-   <step type="double">0.34</step>
-  </binding>
- </button>
-
- <button n="5">
-  <desc>Flaps up</desc>
-  <repeatable>false</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/flaps</property>
-   <step type="double">-0.34</step>
-  </binding>
- </button>
-
- <button n="4">
-  <desc>Right brake</desc>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/brake-right</property>
-   <value type="double">1.0</value>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/brake-right</property>
-    <value type="double">0.0</value>
-   </binding>
-  </mod-up>
- </button>
-
- <button n="7">
-  <desc>Left brake</desc>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/brake-left</property>
-   <value type="double">1.0</value>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/brake-left</property>
-    <value type="double">0.0</value>
-   </binding>
-  </mod-up>
- </button>
-
-</PropertyList>
diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
index 526afefc1..4d6ed804c 100644
--- a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
@@ -5,27 +5,25 @@
 * Bindings for Microsoft SideWinder Force Feed joystick.
 *
 *
-* Axis 0: ailerons
-* Axis 1: elevator
-* Axis 2 (twist): rudder
-* Axis 3: throttle
-* Axes 6 and 7 (hat): view direction
+* Axis 0: 		ailerons
+* Axis 1: 		elevator
+* Axis 2 (twist):	rudder
+* Axis 3: 		throttle
+* Axes 6 and 7 (hat):	view direction
 *
-* Button 1: all brakes
-* Button 2: elevator trim up
-* Button 3: elevator trim down
-* Button 4: right brake only
-* Button 5: flap down
-* Button 6: left brake only
-* Button 7: flap up
+* Button 1:		all brakes
+* Button 2:		elevator trim up
+* Button 3:		elevator trim down
+* Button 4:		right brake only
+* Button 5:		flap down
+* Button 6:		left brake only
+* Button 7:		flap up
 ************************************************************************
 $Id$
 -->
 
 <PropertyList>
 
- <target-platform>UNIX</target-platform>
-
  <name>Microsoft SideWinder Precision Pro</name>
  <name>Microsoft SideWinder Precision 2 Joystick</name>
  <name>Microsoft Microsoft SideWinder Precision Pro (USB)</name>
@@ -49,8 +47,12 @@ $Id$
   </binding>
  </axis>
 
- <axis n="2">
+ <axis>
   <desc>Rudder</desc>
+  <number>
+   <unix>2</unix>
+   <windows>3</windows>
+  </number>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/rudder</property>
@@ -58,60 +60,24 @@ $Id$
   </binding>
  </axis>
 
- <axis n="3">
+ <axis>
   <desc>Throttle</desc>
+  <number>
+   <unix>3</unix>
+   <windows>2</windows>
+  </number>
   <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[0]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[1]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[2]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[3]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[4]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[5]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[6]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[7]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
+   <command>nasal</command>
+   <script>controls.throttleAxis()</script>
   </binding>
  </axis>
 
-  <axis n="4">
+  <axis>
    <desc>View Direction</desc>
+   <number>
+    <unix>4</unix>
+    <windows>6</windows>
+   </number>
    <low>
     <repeatable>true</repeatable>
     <binding>
@@ -130,8 +96,12 @@ $Id$
    </high>
   </axis>
 
-  <axis n="5">
+  <axis>
    <desc>View Elevation</desc>
+   <number>
+    <unix>5</unix>
+    <windows>7</windows>
+   </number>
    <low>
     <repeatable>true</repeatable>
     <binding>
@@ -196,8 +166,12 @@ $Id$
   </binding>
  </button>
 
- <button n="5">
+ <button>
   <desc>Flaps down</desc>
+  <number>
+    <unix>5</unix>
+    <windows>6</windows>
+   </number>
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -206,8 +180,12 @@ $Id$
   </binding>
  </button>
 
- <button n="7">
+ <button>
   <desc>Flaps up</desc>
+  <number>
+    <unix>7</unix>
+    <windows>5</windows>
+   </number>
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -232,8 +210,12 @@ $Id$
   </mod-up>
  </button>
 
- <button n="6">
+ <button>
   <desc>Left brake</desc>
+  <number>
+    <unix>6</unix>
+    <windows>7</windows>
+   </number>
   <binding>
    <command>property-assign</command>
    <property>/controls/gear/brake-left</property>
diff --git a/joysticks.xml b/joysticks.xml
index 1f48ae8ae..2d8399588 100644
--- a/joysticks.xml
+++ b/joysticks.xml
@@ -33,7 +33,6 @@ Joystick binding definitions.
  <js-named include="Input/Joysticks/Microsoft/sidewinder-force-feed.xml"/>
  <js-named include="Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml"/>
  <js-named include="Input/Joysticks/Microsoft/sidewinder-precision-pro.xml"/>
- <js-named include="Input/Joysticks/Microsoft/sidewinder-precision-pro-win.xml"/>
  <js-named include="Input/Joysticks/Microsoft/sidewinder-3d-pro.xml"/>
 
  <!-- Saitek devices -->