From c3c246c3da1e2f72b29470252d6a41bc33fcaf0b Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 25 Jan 2016 17:01:18 -0600
Subject: [PATCH] Modernise view-direction axes for Logitech

- replace deprecated axes/long,lat with modern goal-offset properties.
---
 Input/Joysticks/Logitech/wingman-force-3d.xml | 51 ++++++++++++-------
 Input/Joysticks/Logitech/wingman-force.xml    | 48 +++++++++++++----
 .../Logitech/wingman-rumblepad-usb.xml        | 45 ++++++++++++----
 .../Logitech/wingman-strike-force-3d.xml      | 37 +++++++++++---
 4 files changed, 134 insertions(+), 47 deletions(-)

diff --git a/Input/Joysticks/Logitech/wingman-force-3d.xml b/Input/Joysticks/Logitech/wingman-force-3d.xml
index f394e185c..8c1e8d4c3 100644
--- a/Input/Joysticks/Logitech/wingman-force-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-force-3d.xml
@@ -80,31 +80,44 @@
 	</axis>
 
 	<!-- The next two axes are the view hat -->
-
-	<axis>
-		<desc>Lat-Hat</desc>
-		<number>
-			<unix>4</unix>
-			<mac>4</mac>
-			<windows>6</windows>
-		</number>
+	<axis n="4">
+	 <desc>View Direction</desc>
+	 <low>
+		<repeatable>true</repeatable>
 		<binding>
-			<command>property-scale</command>
-			<property>/sim/current-view/axes/lat</property>
+		 <command>property-adjust</command>
+		 <property>/sim/current-view/goal-heading-offset-deg</property>
+		 <step type="double">5.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">-5.0</step>
+		</binding>
+	 </high>
 	</axis>
 
-	<axis>
-		<desc>Long-Hat</desc>
-		<number>
-			<unix>5</unix>
-			<mac>5</mac>
-			<windows>7</windows>
-		</number>
+	<axis n="5">
+	 <desc>View Elevation</desc>
+	 <low>
+		<repeatable>true</repeatable>
 		<binding>
-			<command>property-scale</command>
-			<property>/sim/current-view/axes/long</property>
+		 <command>property-adjust</command>
+		 <property>/sim/current-view/goal-pitch-offset-deg</property>
+		 <step type="double">5.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">-5.0</step>
+		</binding>
+	 </high>
 	</axis>
 
 	<button n="0">
diff --git a/Input/Joysticks/Logitech/wingman-force.xml b/Input/Joysticks/Logitech/wingman-force.xml
index cb26a58d6..09716f3a1 100644
--- a/Input/Joysticks/Logitech/wingman-force.xml
+++ b/Input/Joysticks/Logitech/wingman-force.xml
@@ -99,23 +99,49 @@ $Id$
  </axis>
 
  <!-- The next two axes are the view hat -->
-
  <axis n="3">
-  <desc>View left/right</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/sim/current-view/axes/lat</property>
-  </binding>
+  <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">5.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">-5.0</step>
+   </binding>
+  </high>
  </axis>
 
  <axis n="4">
-  <desc>View up/down</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/sim/current-view/axes/long</property>
-  </binding>
+  <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">5.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">-5.0</step>
+   </binding>
+  </high>
  </axis>
 
+
+
+
  <button n="0">
   <desc>Brakes</desc>
   <binding>
diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
index 4e6c5c522..7d200273e 100644
--- a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
+++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
@@ -80,20 +80,45 @@ $Id$
   </binding>
  </axis>
 
+<!-- view direction -->
  <axis n="5">
-  <desc>View left/right</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/sim/current-view/axes/lat</property>
-  </binding>
+  <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">5.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">-5.0</step>
+   </binding>
+  </high>
  </axis>
 
  <axis n="6">
-  <desc>View up/down</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/sim/current-view/axes/long</property>
-  </binding>
+  <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">5.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">-5.0</step>
+   </binding>
+  </high>
  </axis>
 
  <button n="0">
diff --git a/Input/Joysticks/Logitech/wingman-strike-force-3d.xml b/Input/Joysticks/Logitech/wingman-strike-force-3d.xml
index 56c54b659..6db45905c 100644
--- a/Input/Joysticks/Logitech/wingman-strike-force-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-strike-force-3d.xml
@@ -72,21 +72,44 @@ $Id$
 	</axis>
 
 	<!-- The next two axes are the view hat -->
-
 	<axis n="4">
-		<desc>View left</desc>
+	 <desc>View Direction</desc>
+	 <low>
+		<repeatable>true</repeatable>
 		<binding>
-			<command>property-scale</command>
-			<property>/sim/current-view/axes/lat</property>
+		 <command>property-adjust</command>
+		 <property>/sim/current-view/goal-heading-offset-deg</property>
+		 <step type="double">5.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">-5.0</step>
+		</binding>
+	 </high>
 	</axis>
 
 	<axis n="5">
-		<desc>View right</desc>
+	 <desc>View Elevation</desc>
+	 <low>
+		<repeatable>true</repeatable>
 		<binding>
-			<command>property-scale</command>
-			<property>/sim/current-view/axes/long</property>
+		 <command>property-adjust</command>
+		 <property>/sim/current-view/goal-pitch-offset-deg</property>
+		 <step type="double">5.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">-5.0</step>
+		</binding>
+	 </high>
 	</axis>
 
 	<button n="3">