From 1a4fa0b16fd2079bc0380e19ad33f0610a208fe6 Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Sun, 11 Sep 2011 19:26:40 +0200
Subject: [PATCH] warthog: fix trimming; more bindings (similar to cougar)

---
 .../Joysticks/ThrustMaster/Warthog-Stick.xml  | 137 +++++++++++++++++-
 .../ThrustMaster/Warthog-Throttle.xml         |  90 ++++++------
 .../ThrustMaster/Warthog/Throttle/harrier.xml |   4 +-
 3 files changed, 176 insertions(+), 55 deletions(-)

diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
index 416f43c6f..4b47100ff 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
@@ -39,6 +39,14 @@
 			setlistener(_, func(n) mod = n.getValue());
 
 			var trimstep = 0.75;
+			var viewstep = 0.5;
+
+			var reset_zoom = func setprop("/sim/current-view/field-of-view", 55);
+			var viewdir = props.globals.getNode("/sim").getChildren("view");
+			forindex (var i; viewdir) {
+				var t = viewdir[i].getNode("type");
+				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
+			}
 
 			load_overlay("generic.xml");
 			if (is_helicopter)
@@ -77,9 +85,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.aileronTrim(-trimstep);
-					else
 						setprop("/controls/flight/aileron-trim", 0);
+					else
+						controls.aileronTrim(-trimstep);
 				</script>
 			</binding>
 		</low>
@@ -89,9 +97,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.aileronTrim(trimstep);
-					else
 						setprop("/controls/flight/aileron-trim", 0);
+					else
+						controls.aileronTrim(trimstep);
 				</script>
 			</binding>
 		</high>
@@ -106,9 +114,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.elevatorTrim(trimstep);
-					else
 						setprop("/controls/flight/elevator-trim", 0);
+					else
+						controls.elevatorTrim(trimstep);
 				</script>
 			</binding>
 		</low>
@@ -118,9 +126,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.elevatorTrim(-trimstep);
-					else
 						setprop("/controls/flight/elevator-trim", 0);
+					else
+						controls.elevatorTrim(-trimstep);
 				</script>
 			</binding>
 		</high>
@@ -187,53 +195,166 @@
 
 	<button n="6">
 		<name>Target Management Switch (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>Target Management Switch (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>Target Management Switch (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>Target Management Switch (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>Data Management Switch (DMS) up</name>
+		<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="11">
 		<name>Data Management Switch (DMS) right</name>
+		<desc>brakes right</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="12">
 		<name>Data Management Switch (DMS) down</name>
+		<desc>toggle parking brake</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.applyBrakes(1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var i = controls.applyParkingBrake(1);
+					popup("Parking Brake %s", i ? "ON" : "OFF");
+					controls.applyBrakes(0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="13">
 		<name>Data Management Switch (DMS) left</name>
+		<desc>brakes left</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="14">
 		<name>Countermeasures Management Switch (CMS) up</name>
+		<desc>view up</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewPitch(viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="15">
 		<name>Countermeasures Management Switch (CMS) right</name>
+		<desc>view right</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewDir(viewdir[view.index] * viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="16">
 		<name>Countermeasures Management Switch (CMS) down</name>
+		<desc>view down</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewPitch(-viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="17">
 		<name>Countermeasures Management Switch (CMS) left</name>
+		<desc>view left</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewDir(-viewdir[view.index] * viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="18">
 		<name>Countermeasures Management Switch (CMS) push</name>
+		<desc>center view,  +mod: centered cockpit view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				if (mod)
+					setprop("/sim/current-view/view-number", 0);
+				view.resetView();
+			</script>
+		</binding>
 	</button>
 </PropertyList>
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
index c535f1589..8b5dbc672 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
@@ -40,12 +40,6 @@
 
 			var left_engines = [0, 2, 4, 6, 8, 10];
 			var right_engines = [1, 3, 5, 7, 9, 11];
-			var viewstep = 0.5;
-			var viewdir = props.globals.getNode("/sim").getChildren("view");
-			forindex (var i; viewdir) {
-				var t = viewdir[i].getNode("type");
-				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
-			}
 
 			load_overlay("generic.xml");
 			if (is_helicopter)
@@ -56,40 +50,10 @@
 
 	<axis n="0">
 		<name>Mouse Horizontal</name>
-		<desc>mouse horizontal</desc>
-		<low>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewDir(-viewdir[view.index] * viewstep)</script>
-			</binding>
-		</low>
-		<high>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewDir(viewdir[view.index] * viewstep)</script>
-			</binding>
-		</high>
 	</axis>
 
 	<axis n="1">
 		<name>Mouse Vertical</name>
-		<desc>mouse vertical</desc>
-		<low>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewPitch(viewstep)</script>
-			</binding>
-		</low>
-		<high>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewPitch(-viewstep)</script>
-			</binding>
-		</high>
 	</axis>
 
 	<axis n="2">
@@ -129,58 +93,60 @@
 			<command>property-scale</command>
 			<property>/controls/flight/rudder-trim</property>
 			<factor type="double">-1</factor>
+			<power type="int">2</power>
 		</binding>
 	</axis>
 
 	<axis n="5">
 		<name>Coolie Switch Horizontal</name>
+		<desc>adjust mixture: left = leaner, right = fatter</desc>
 		<number>
 			<unix>5</unix>
 			<mac>5</mac>
 			<windows>3</windows>
 		</number>
 		<low>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch left")</script>
+				<script>controls.adjMixture(-1)</script>
 			</binding>
 		</low>
 		<high>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch right")</script>
+				<script>controls.adjMixture(1)</script>
 			</binding>
 		</high>
 	</axis>
 
 	<axis n="6">
 		<name>Coolie Switch Vertical</name>
+		<desc>adjust propeller pitch: forward = increase, backward = decrease</desc>
 		<number>
 			<unix>6</unix>
 			<mac>6</mac>
 			<windows>4</windows>
 		</number>
 		<low>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch up")</script>
+				<script>controls.adjPropeller(1)</script>
 			</binding>
 		</low>
 		<high>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch down")</script>
+				<script>controls.adjPropeller(-1)</script>
 			</binding>
 		</high>
 	</axis>
 
 	<button n="0">
 		<name>Mouse Button</name>
-		<desc>reset view</desc>
-		<binding>
-			<command>nasal</command>
-			<script>view.resetView()</script>
-		</binding>
 	</button>
 
 	<button n="1">
@@ -427,10 +393,44 @@
 
 	<button n="28">
 		<name>Right Throttle Idle Switch</name>
+		<desc>right engines cutoff</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; right_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; right_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="29">
 		<name>Left Throttle Idle Switch</name>
+		<desc>left engines cutoff</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; left_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; left_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="30">
diff --git a/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml b/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
index 2d1921b70..c938dd19e 100644
--- a/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
@@ -6,8 +6,8 @@
 	<nasal>
 		<script>
 			var thrust_display = func {
-				var thv = getprop("/controls/engines/engine[0]/mixture");
-				popup("Thrust vector " ~ int(thv * 120 - 20 + 0.5));
+				var thv = getprop("/controls/engines/engine/mixture");
+				popup("Thrust vector %d", thv * 120 - 20 + 0.5);
 			}
 		</script>
 	</nasal>