From d300b92b9dc09d839c0ae0b74e81b9395b5f854b Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Thu, 22 Sep 2011 23:01:01 +0200
Subject: [PATCH 1/2] warthog: gear; swap DMS/TMS (again); time based view
 reset

---
 .../ThrustMaster/Warthog/Warthog-Stick.xml    | 159 ++++++++++--------
 .../ThrustMaster/Warthog/Warthog-Throttle.xml |  19 ++-
 2 files changed, 107 insertions(+), 71 deletions(-)

diff --git a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
index c589a5a29..0ab91c505 100644
--- a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
@@ -18,7 +18,7 @@
 			var this = cmdarg().getParent();
 			var init = !contains(caller(0)[0], "init");
 			var popup = func gui.popupTip(call(sprintf, arg));
-			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
+			var is_helicopter = (func {(var n = props.globals.getNode("rotors", 0)) != nil and n.getAttribute("children")})();
 			var aircraft_type = getprop("/sim/type");
 			var overlay = getprop("/input/joysticks/overlay");
 
@@ -44,12 +44,13 @@
 
 			var mod = 0;
 			if (init) {
-				var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
-				setlistener(_, func(n) mod = n.getValue());
+				var n = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
+				setlistener(n, func(n) mod = n.getValue());
 			}
 
 			var trimstep = 0.75;
 			var viewstep = 0.5;
+			var button = { 18: { id: 0 }};
 
 			var reset_zoom = func setprop("/sim/current-view/field-of-view", 55);
 			var viewdir = props.globals.getNode("/sim").getChildren("view");
@@ -199,55 +200,7 @@
 
 	<button n="6">
 		<name>left black curosr (TMS) up</name>
-		<desc>zoom in,  +mod: reset zoom</desc>
-		<repeatable>true</repeatable>
-		<binding>
-			<command>nasal</command>
-			<script>
-				if (mod)
-					reset_zoom();
-				else
-					view.decrease(1);
-			</script>
-		</binding>
-	</button>
-
-	<button n="7">
-		<name>left black cursor (TMS) right</name>
-		<desc>next active view,  +mod: next view</desc>
-		<binding>
-			<command>nasal</command>
-			<script>view.stepView(1, mod)</script>
-		</binding>
-	</button>
-
-	<button n="8">
-		<name>left black cursor (TMS) down</name>
-		<desc>zoom out,  +mod: reset zoom</desc>
-		<repeatable>true</repeatable>
-		<binding>
-			<command>nasal</command>
-			<script>
-				if (mod)
-					reset_zoom();
-				else
-					view.increase(1);
-			</script>
-		</binding>
-	</button>
-
-	<button n="9">
-		<name>left black cursor (TMS) left</name>
-		<desc>previous active view,  +mod: previous view</desc>
-		<binding>
-			<command>nasal</command>
-			<script>view.stepView(-1, mod)</script>
-		</binding>
-	</button>
-
-	<button n="10">
-		<name>right black cursor (DMS) up</name>
-		<desc>brakes</desc>
+		<desc>brakes,  +mod: toggle parking brake</desc>
 		<binding>
 			<command>nasal</command>
 			<script>controls.applyBrakes(1)</script>
@@ -255,13 +208,20 @@
 		<mod-up>
 			<binding>
 				<command>nasal</command>
-				<script>controls.applyBrakes(0)</script>
+				<script>
+					if (mod) {
+						var i = controls.applyParkingBrake(1);
+						popup("Parking Brake %s", i ? "ON" : "OFF");
+						controls.applyBrakes(0);
+					}
+					controls.applyBrakes(0)
+				</script>
 			</binding>
 		</mod-up>
 	</button>
 
-	<button n="11">
-		<name>right black cursor (DMS) right</name>
+	<button n="7">
+		<name>left black cursor (TMS) right</name>
 		<desc>brakes right</desc>
 		<binding>
 			<command>nasal</command>
@@ -275,9 +235,9 @@
 		</mod-up>
 	</button>
 
-	<button n="12">
-		<name>right black cursor (DMS) down</name>
-		<desc>toggle parking brake</desc>
+	<button n="8">
+		<name>left black cursor (TMS) down</name>
+		<desc>brakes,  +mod: toggle parking brake</desc>
 		<binding>
 			<command>nasal</command>
 			<script>controls.applyBrakes(1)</script>
@@ -286,16 +246,19 @@
 			<binding>
 				<command>nasal</command>
 				<script>
-					var i = controls.applyParkingBrake(1);
-					popup("Parking Brake %s", i ? "ON" : "OFF");
-					controls.applyBrakes(0);
+					if (mod) {
+						var i = controls.applyParkingBrake(1);
+						popup("Parking Brake %s", i ? "ON" : "OFF");
+						controls.applyBrakes(0);
+					}
+					controls.applyBrakes(0)
 				</script>
 			</binding>
 		</mod-up>
 	</button>
 
-	<button n="13">
-		<name>right black cursor (DMS) left</name>
+	<button n="9">
+		<name>left black cursor (TMS) left</name>
 		<desc>brakes left</desc>
 		<binding>
 			<command>nasal</command>
@@ -309,6 +272,54 @@
 		</mod-up>
 	</button>
 
+	<button n="10">
+		<name>right black cursor (DMS) up</name>
+		<desc>zoom in,  +mod: reset zoom</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>
+				if (mod)
+					reset_zoom();
+				else
+					view.decrease(1);
+			</script>
+		</binding>
+	</button>
+
+	<button n="11">
+		<name>right black cursor (DMS) right</name>
+		<desc>next active view,  +mod: next view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>view.stepView(1, mod)</script>
+		</binding>
+	</button>
+
+	<button n="12">
+		<name>right black cursor (DMS) down</name>
+		<desc>zoom out,  +mod: reset zoom</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>
+				if (mod)
+					reset_zoom();
+				else
+					view.increase(1);
+			</script>
+		</binding>
+	</button>
+
+	<button n="13">
+		<name>right black cursor (DMS) left</name>
+		<desc>previous active view,  +mod: previous view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>view.stepView(-1, mod)</script>
+		</binding>
+	</button>
+
 	<button n="14">
 		<name>grey cursor (CMS) up</name>
 		<desc>view up</desc>
@@ -351,14 +362,28 @@
 
 	<button n="18">
 		<name>grey cursor (CMS) push</name>
-		<desc>center view,  +mod: centered cockpit view</desc>
+		<desc>short: center view,  long (&gt;0.5 sec): centered cockpit view</desc>
 		<binding>
 			<command>nasal</command>
 			<script>
-				if (mod)
-					setprop("/sim/current-view/view-number", 0);
-				view.resetView();
+				(func(id) {
+					settimer(func {
+						if (id == button[18].id) {
+							setprop("/sim/current-view/view-number", 0);
+							view.resetView();
+						}
+					}, 0.5, 1);
+				})(button[18].id += 1);
 			</script>
 		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					view.resetView();
+					button[18].id += 1;
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 </PropertyList>
diff --git a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
index 79dc23f2f..dd00d33d9 100644
--- a/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
@@ -14,7 +14,7 @@
 			var this = cmdarg().getParent();
 			var init = !contains(caller(0)[0], "init");
 			var popup = func gui.popupTip(call(sprintf, arg));
-			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
+			var is_helicopter = (func {(var n = props.globals.getNode("rotors", 0)) != nil and n.getAttribute("children")})();
 			var aircraft_type = getprop("/sim/type");
 			var overlay = getprop("/input/joysticks/overlay");
 
@@ -40,8 +40,8 @@
 
 			var mod = 0;
 			if (init) {
-				var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
-				setlistener(_, func(n) mod = n.getValue());
+				var n = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
+				setlistener(n, func(n) mod = n.getValue());
 			}
 
 			var left_engines = [0, 2, 4, 6, 8, 10];
@@ -328,7 +328,18 @@
 	</button>
 
 	<button n="20">
-		<name>Landing Gear Horn Silence Button</name>
+		<name>Landing Gear Horn Silence</name>
+		<desc>gear up,  +mod: gear down</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.gearDown(mod ? 1 : -1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.gearDown(0)</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="21">

From e0a05f052d29d21045d881340a18d65f6cd00891 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Sun, 25 Sep 2011 10:59:30 +0100
Subject: [PATCH 2/2] New joystick by Erik Streb del Toro

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
---
 .../Logitech/wingman-interceptor.xml          | 251 ++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 Input/Joysticks/Logitech/wingman-interceptor.xml

diff --git a/Input/Joysticks/Logitech/wingman-interceptor.xml b/Input/Joysticks/Logitech/wingman-interceptor.xml
new file mode 100644
index 000000000..49ead4db4
--- /dev/null
+++ b/Input/Joysticks/Logitech/wingman-interceptor.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" ?>
+<!-- created by Erik Streb del Toro -->
+<!--
+************************************************************************
+* Bindings for Logitech WingMan Interceptor joystick (gameport).
+*
+*
+* Axis 0: ailerons
+* Axis 1: elevator
+* Axis 2 (slider): throttle
+* Axes 6 (left-right) and 7 (down-up) (hat): view direction
+*
+* Buttons according to the numbers printed in game controller properties:
+* Button 1: all brakes
+* Button 2: Scroll through views
+* Button 4: elevator trim up
+* Button 5: elevator trim down
+* Button 7: flap down
+* Button 6: flap up
+* Button 3: Gear up
+* Button 8: left brake only
+* Button 9: right brake only
+*
+* If you have no rudder pedals you could use this as a workaround
+* (you have to uncomment the definitions in this file):
+* Button 8: rudder left
+* Button 9: rudder right
+************************************************************************
+$Id$
+-->
+
+<PropertyList>
+
+ <name>Logitech WingMan Interceptor</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>nasal</command>
+   <script>controls.throttleAxis()</script>
+  </binding>
+ </axis>
+
+ <axis>
+  <desc>View Direction</desc>
+  <number>
+   <unix>4</unix>
+   <windows>6</windows>
+   <mac>4</mac>
+  </number>
+  <low>
+   <repeatable>true</repeatable>
+   <binding>
+    <command>property-adjust</command>
+    <property>/sim/current-view/goal-heading-offset-deg</property>
+    <step type="double">2.5</step>
+   </binding>
+  </low>
+  <high>
+   <repeatable>true</repeatable>
+   <binding>
+    <command>property-adjust</command>
+    <property>/sim/current-view/goal-heading-offset-deg</property>
+    <step type="double">-2.5</step>
+   </binding>
+  </high>
+ </axis>
+
+ <axis>
+  <desc>View Elevation</desc>
+  <number>
+   <unix>5</unix>
+   <windows>7</windows>
+   <mac>5</mac>
+  </number>
+  <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="0">
+  <desc>Brakes</desc>
+  <binding>
+   <command>nasal</command>
+   <script>controls.applyBrakes(1)</script>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>nasal</command>
+    <script>controls.applyBrakes(0)</script>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="1">
+  <desc>Scroll through views</desc>
+  <binding>
+   <command>nasal</command>
+   <script>view.stepView(1)</script>
+  </binding>
+ </button>
+
+ <button n="4">
+  <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>
+  <binding>
+   <command>nasal</command>
+   <script>controls.flapsDown(1)</script>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>nasal</command>
+    <script>controls.flapsDown(0)</script>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="5">
+  <desc>Flaps up</desc>
+  <repeatable>false</repeatable>
+  <binding>
+   <command>nasal</command>
+   <script>controls.flapsDown(-1)</script>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>nasal</command>
+    <script>controls.flapsDown(0)</script>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="2">
+  <desc>Gear up</desc>
+  <repeatable>false</repeatable>
+  <binding>
+   <command>nasal</command>
+   <script>controls.gearDown(-1)</script>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>nasal</command>
+    <script>controls.gearDown(0)</script>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="7">
+  <desc>Left brake</desc>
+  <binding>
+   <command>nasal</command>
+   <script>controls.applyBrakes(1, -1)</script>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>nasal</command>
+    <script>controls.applyBrakes(0, -1)</script>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="8">
+  <desc>Right brake</desc>
+  <binding>
+   <command>nasal</command>
+   <script>controls.applyBrakes(1, 1)</script>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>nasal</command>
+    <script>controls.applyBrakes(0, 1)</script>
+   </binding>
+  </mod-up>
+ </button>
+
+<!-- I have no rudder, so I need those "buttons" to move the rudder
+ <button n="7">
+  <desc>Rudder trim adjustment left</desc>
+  <repeatable type="bool">true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/flight/rudder</property>
+   <step type="double">-0.01</step>
+  </binding>
+ </button>
+
+ <button n="8">
+  <desc>Rudder trim adjustment right</desc>
+  <repeatable type="bool">true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/flight/rudder</property>
+   <step type="double">0.01</step>
+  </binding>
+ </button>
+-->
+
+</PropertyList>
+
+