From 8ce6031f23e982f85094491fa091d64a90d3746a Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Fri, 6 Aug 2004 08:49:31 +0000
Subject: [PATCH] Eric L. Hathaway:

The following patch updates the ThrustMaster FCS joystick configuration.  I have "Nasal-ized" the joystick bindings, drawing ideas from the Cyborg-Gold-3d-USB configuration file.  I also changed some of the bindings, so the joystick setup is more like the default four-axis-joystick config.  When I submitted the original config file, I had the hat switch bound to the rudder and elevator trim.  Since the vast majority (all?) of the other joystick configs use the hat switch to control view direction, I think it would be best for the defaults for this joystick to conform to the rest in order to obey the "principle of least surprise" for the unsuspecting user.
---
 Input/Joysticks/ThrustMaster/FCS.xml | 95 ++++++++++++++--------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/Input/Joysticks/ThrustMaster/FCS.xml b/Input/Joysticks/ThrustMaster/FCS.xml
index 11f5974ad..ac4e1cf73 100644
--- a/Input/Joysticks/ThrustMaster/FCS.xml
+++ b/Input/Joysticks/ThrustMaster/FCS.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 
 <!--
+
+$Id$
+
 ************************************************************************
 Setup for a Thrustmaster FCS-compatible joystick with
 one stick, one digital hat, and four buttons.
@@ -10,14 +13,21 @@ Layout:
   Axis 1: elevator
 
   Hat:
-    Axis 2: rudder
-    Axis 3: elevator trim
+    Axis 2: view direction
+    Axis 3: view elevation
 
   Button 0: brakes
-  Button 1: center rudder
-  Button 2: flaps up
-  Button 3: flaps down
+  Button 1: center view
+  Button 2: elevator trim up
+  Button 3: elevator trim down
 ************************************************************************
+
+30-Jul-2004
+Eric Hathaway <hathaway@uplink.net> : "Nasal-ized" the joystick configuration,
+   drawing ideas from the Cyborg-Gold-3d-USB configuration file.  Also changed
+   some of the bindings, so the joystick setup is more like the default
+   four-axis-joystick config.
+
 -->
 
 <PropertyList>
@@ -44,41 +54,37 @@ Layout:
  </axis>
 
  <axis n="2">
-  <desc>Rudder</desc>
+  <desc>View Direction</desc>
   <low>
    <repeatable type="bool">true</repeatable>
    <binding>
-    <command>property-adjust</command>
-    <property>/controls/flight/rudder</property>
-    <step type="double">-0.05</step>
+    <command>nasal</command>
+    <script>view.panViewDir(1)</script>
    </binding>
   </low>
   <high>
    <repeatable type="bool">true</repeatable>
    <binding>
-    <command>property-adjust</command>
-    <property>/controls/flight/rudder</property>
-    <step type="double">0.05</step>
+    <command>nasal</command>
+    <script>view.panViewDir(-1)</script>
    </binding>
   </high>
  </axis>
 
  <axis n="3">
-  <desc>Elevator trim</desc>
+  <desc>View Elevation</desc>
   <low>
    <repeatable type="bool">true</repeatable>
    <binding>
-    <command>property-adjust</command>
-    <property>/controls/flight/elevator-trim</property>
-    <step type="double">0.001</step>
+    <command>nasal</command>
+    <script>view.panViewPitch(-1)</script>
    </binding>
   </low>
   <high>
    <repeatable type="bool">true</repeatable>
    <binding>
-    <command>property-adjust</command>
-    <property>/controls/flight/elevator-trim</property>
-    <step type="double">-0.001</step>
+    <command>nasal</command>
+    <script>view.panViewPitch(1)</script>
    </binding>
   </high>
  </axis>
@@ -86,53 +92,46 @@ Layout:
  <button n="0">
   <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>
+   <command>nasal</command>
+   <script>
+           interpolate("/controls/gear/brake-left", 1, 0.075);
+           interpolate("/controls/gear/brake-right", 1, 0.075)
+   </script>
   </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>
+    <command>nasal</command>
+    <script>
+            interpolate("/controls/gear/brake-left", 0, 0.075);
+            interpolate("/controls/gear/brake-right", 0, 0.075)
+    </script>
    </binding>
   </mod-up>
  </button>
 
  <button n="1">
-  <desc>Center rudder</desc>
+  <desc>Center View</desc>
   <binding>
-   <command>property-assign</command>
-   <property>/controls/flight/rudder</property>
-   <value type="double">0.0</value>
+   <command>nasal</command>
+   <script>view.resetView()</script>
   </binding>
  </button>
 
  <button n="2">
-  <desc>Flaps up</desc>
+  <desc>Elevator Trim Up</desc>
+  <repeatable type="bool">true</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/flaps</property>
-   <step type="double">-0.34</step>
+   <command>nasal</command>
+   <script>controls.elevatorTrim(-1)</script>
   </binding>
  </button>
 
  <button n="3">
-  <desc>Flaps down</desc>
-   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/flaps</property>
-   <step type="double">0.34</step>
+  <desc>Elevator Trim Down</desc>
+  <repeatable type="bool">true</repeatable>
+  <binding>
+   <command>nasal</command>
+   <script>controls.elevatorTrim(1)</script>
   </binding>
  </button>