From ee860f3e88d889273ff8a9e696854d2954f6f65d Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Wed, 26 Oct 2005 17:40:41 +0000
Subject: [PATCH] Stuart Buchanan:

joystick configuration for a Wingman Force 3D USB.

mfranz:
This driver is supposed to work for the non-USB versions, too, so
I'm replacing the non-USB driver with this one, and add its <name>s
here. If it turns out that we need a separate driver, it's better to
derive it from this file, as this is adapted to the newest methods
(nasal wrappers, etc.), while the old driver was only partly functional.
---
 Input/Joysticks/Logitech/wingman-force-3d.xml | 249 ++++++++----------
 1 file changed, 116 insertions(+), 133 deletions(-)

diff --git a/Input/Joysticks/Logitech/wingman-force-3d.xml b/Input/Joysticks/Logitech/wingman-force-3d.xml
index 7c057f9fa..c65640e1e 100644
--- a/Input/Joysticks/Logitech/wingman-force-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-force-3d.xml
@@ -2,108 +2,113 @@
 
 <!--
 ************************************************************************
-* Bindings for Logitech WingMan Digital Extreme 3D joystick.
+* Bindings for Logitech WingMan Force 3D USB joystick.
 *
-* This joystick is dual-mode: it can connect either through the
-* gameport or through a USB port.  Bindings are as follow:
+* Bindings are as follow:
 *
 * Axis 0: ailerons
 * Axis 1: elevator
-* Axis 2 (twist): rudder
-* Axis 3 (slider): throttle
-* Axes 5 and 6 (hat): view direction
+* Axis 2 (slider): throttle
+* Axis 3 (twist): rudder
+* Axes 6 and 7 (hat): view direction
 *
 * Button 0 (trigger): all brakes
 * Button 1 (02): elevator trim up
 * Button 2 (03): elevator trim down
 * Button 3 (04): mixture richer
 * Button 4 (05): mixture leaner
-* Button 5 (06): left brake only
-* Button 6 (07): right brake only
+* Button 5 (06): flaps ups
+* Button 6 (07): flaps down
 ************************************************************************
-$Id$
 -->
 
 <PropertyList>
 
 	<name>Logitech Inc. WingMan Force 3D</name>
-        <name>Logitech Inc. WingMan Force 3d</name>
-	
+	<name>Logitech Inc. WingMan Force 3d</name>
+	<name>Logitech WingMan Force 3D USB</name>
+
 	<axis n="0">
 		<desc>Aileron</desc>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/aileron</property>
-			<squared>true</squared>
-			<factor type="double">5.0</factor>
+			<factor type="double">1.0</factor>
+			<dead-band type="double">0.02</dead-band>
+			<power type="double">2.0</power>
 		</binding>
 	</axis>
-	
+
 	<axis n="1">
 		<desc>Elevator</desc>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/elevator</property>
-			<factor type="double">-5.0</factor>
-			<squared>true</squared>
+			<factor type="double">-1.0</factor>
+			<dead-band type="double">0.02</dead-band>
+			<power type="double">2.0</power>
 		</binding>
 	</axis>
-	
-	<axis n="2">
+
+	<axis>
+		<desc>Throttle</desc>
+		<number>
+			<unix>3</unix>
+			<mac>2</mac>
+			<windows>2</windows>
+		</number>
+		<binding>
+			<command>nasal</command>
+			<script>controls.throttleAxis()</script>
+		</binding>
+	</axis>
+
+	<axis>
+		<desc>Rudder</desc>
+		<number>
+			<unix>2</unix>
+			<mac>3</mac>
+			<windows>3</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/rudder</property>
-			<factor type="double">3.0</factor>
-			<squared>true</squared>
+			<factor type="double">1.0</factor>
+			<dead-band type="double">0.2</dead-band>
+			<power type="double">2.0</power>
 		</binding>
 	</axis>
-	
-	<axis n="3">
-		<desc>Throttle</desc>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/engines/engine[0]/throttle</property>
-			<offset type="double">-.3</offset>
-			<factor type="double">-1.0</factor>
-		</binding>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/engines/engine[1]/throttle</property>
-			<offset type="double">-.3</offset>
-			<factor type="double">-1.0</factor>
-		</binding>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/engines/engine[2]/throttle</property>
-			<offset type="double">-.3</offset>
-			<factor type="double">-1.0</factor>
-		</binding>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/engines/engine[3]/throttle</property>
-			<offset type="double">-.3</offset>
-			<factor type="double">-1.0</factor>
-		</binding>
-	</axis>
-	
+
 	<!-- The next two axes are the view hat -->
-	
-	<axis n="4">
+
+	<axis>
+		<desc>Lat-Hat</desc>
+		<number>
+			<unix>4</unix>
+			<mac>4</mac>
+			<windows>6</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/sim/current-view/axes/lat</property>
 		</binding>
 	</axis>
-	
-	<axis n="5">
+
+	<axis>
+		<desc>Long-Hat</desc>
+		<number>
+			<unix>5</unix>
+			<mac>5</mac>
+			<windows>7</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/sim/current-view/axes/long</property>
 		</binding>
 	</axis>
-	
+
 	<button n="0">
-	<desc>Brakes</desc>
+		<desc>Brakes</desc>
 		<binding>
 			<command>property-assign</command>
 			<property>/controls/gear/brake-left</property>
@@ -116,92 +121,70 @@ $Id$
 		</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="1">
-	<repeatable>true</repeatable>
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/flight/elevator-trim</property>
-		<step>0.005</step>
-	</binding>
-	</button>
-	
-	<button n="2">
-	<repeatable>true</repeatable>
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/flight/elevator-trim</property>
-		<step>-0.005</step>
-	</binding>
-	</button>
-	
-	<button n="3">
-	<repeatable>true</repeatable>
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/engines/engine[0]/mixture</property>
-		<step>0.01</step>
-	</binding>
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/engines/engine[1]/mixture</property>
-		<step>0.01</step>
-	</binding>
-	</button>
-	
-	<button n="4">
-	<repeatable>true</repeatable>
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/engines/engine[0]/mixture</property>
-		<step>-0.01</step>
-	</binding>
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/engines/engine[1]/mixture</property>
-		<step>-0.01</step>
-	</binding>
-	</button>
-	
-	<button n="5">
-	<binding>
-		<command>property-adjust</command>
-		<property>/controls/gear/brake-left</property>
-		<value type="double">1.0</value>
-		<mod-up>
-			<binding>
-				<command>property-adjust</command>
+				<command>property-assign</command>
 				<property>/controls/gear/brake-left</property>
 				<value type="double">0.0</value>
 			</binding>
-		</mod-up>
-	</binding>
-	</button>
-	
-	<button n="6">
-		<binding>
-			<command>property-adjust</command>
-			<property>/controls/gear/brake-right</property>
-			<value type="double">1.0</value>
-		</binding>
-		<mod-up>
 			<binding>
-				<command>property-adjust</command>
+				<command>property-assign</command>
 				<property>/controls/gear/brake-right</property>
 				<value type="double">0.0</value>
 			</binding>
 		</mod-up>
 	</button>
 
+	<button n="1">
+		<desc>Elevator trim up</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>controls.elevatorTrim(0.75)</script>
+		</binding>
+	</button>
+
+	<button n="2">
+		<desc>Elevator trim down</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>controls.elevatorTrim(-0.75)</script>
+		</binding>
+	</button>
+
+	<button n="3">
+		<desc>Mixture richer</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>controls.adjMixture(1)</script>
+		</binding>
+	</button>
+
+	<button n="4">
+		<desc>Mixture leaner</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>controls.adjMixture(-1)</script>
+		</binding>
+	</button>
+
+	<button n="5">
+		<desc>Flaps down</desc>
+		<repeatable>false</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>controls.flapsDown(1)</script>
+		</binding>
+	</button>
+
+	<button n="6">
+		<desc>Flaps up</desc>
+		<repeatable>false</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>controls.flapsDown(-1)</script>
+		</binding>
+	</button>
+
 </PropertyList>