From 6800b9728d7897d632ff92536ffb5a96b43a458e Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sun, 29 Jun 2003 08:33:59 +0000
Subject: [PATCH] Melchior FRANZ: here's the promised patch:

- make throttle work for 8 engines (b52)
- resolve multiple property bindings (simply stating
  more than one property per binding doesn't do anything;
  this has to be written as two bindings; didn't touch
  "Reset View" button in X45, though)
- add $Id$ lines
- adjust step size in "my" joystick file (X8-30) to
  work best on a 2.4GHz computer  :->

I didn't add entries for propeller related properties, such as mixture, prop-pitch, and I didn't change the boost property. These are still for at most two engines.
---
 Input/Joysticks/CH/pro-pedals-usb.xml         |  1 +
 Input/Joysticks/CH/pro-yoke-usb.xml           | 39 +++++++++++++++-
 Input/Joysticks/Default/joystick.xml          | 39 +++++++++++++++-
 .../RC-transmitter-hitecLaser4.xml            | 37 +++++++++++++++
 .../wingman-extreme-digital-3d-win.xml        | 37 +++++++++++++++
 .../Logitech/wingman-extreme-digital-3d.xml   | 45 +++++++++++++++++++
 Input/Joysticks/Logitech/wingman-force.xml    | 45 +++++++++++++++++++
 .../Logitech/wingman-rumblepad-usb.xml        | 25 +++++++++++
 .../Microsoft/sidewinder-force-feed.xml       | 37 +++++++++++++++
 .../Microsoft/sidewinder-precision-pro.xml    | 37 +++++++++++++++
 .../Saitek/Cyborg-3d-Rumble-Force.xml         | 25 +++++++++++
 Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml | 37 +++++++++++++++
 Input/Joysticks/Saitek/X45.xml                | 38 ++++++++++++++++
 Input/Joysticks/Saitek/X8-30.xml              | 44 ++++++++++++++++--
 14 files changed, 481 insertions(+), 5 deletions(-)

diff --git a/Input/Joysticks/CH/pro-pedals-usb.xml b/Input/Joysticks/CH/pro-pedals-usb.xml
index 03c463aaa..7c666e745 100644
--- a/Input/Joysticks/CH/pro-pedals-usb.xml
+++ b/Input/Joysticks/CH/pro-pedals-usb.xml
@@ -11,6 +11,7 @@
 * Axis 1 (right pedal): right brake
 * Axis 2 (sliding both pedals): rudder (and nosewheel)
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
index b81ac3fce..32ed40195 100644
--- a/Input/Joysticks/CH/pro-yoke-usb.xml
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -23,6 +23,7 @@
 * Button 9 (bottom red button): decrease boost
 * Buttons 10 and 11 (left rocker): elevator trim
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -63,6 +64,42 @@
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <axis n="3">
@@ -209,7 +246,7 @@
     <property>/controls/engines/engine[1]/boost</property>
     <step type="double">+0.01</step>
    </binding>
- </button> 
+ </button>
 
  <button n="9">
   <repeatable>true</repeatable>
diff --git a/Input/Joysticks/Default/joystick.xml b/Input/Joysticks/Default/joystick.xml
index 0e2224118..a472aed7a 100644
--- a/Input/Joysticks/Default/joystick.xml
+++ b/Input/Joysticks/Default/joystick.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 
-<!-- 
+<!--
 ************************************************************************
 Default joystick bindings.
 
 Assume that we have a conventional, three-axis, three-button
 joystick, and that the first button is the trigger.
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -44,6 +45,42 @@ joystick, and that the first button is the trigger.
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <button n="0">
diff --git a/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml b/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml
index 3ec9a775f..1feda9039 100644
--- a/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml
+++ b/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml
@@ -29,6 +29,7 @@
 * stick throws in FlightGear.
 *
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -80,6 +81,42 @@
    <offset type="double">1.0</offset>
    <factor type="double">0.6</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">1.0</offset>
+   <factor type="double">0.6</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">1.0</offset>
+   <factor type="double">0.6</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">1.0</offset>
+   <factor type="double">0.6</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">1.0</offset>
+   <factor type="double">0.6</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">1.0</offset>
+   <factor type="double">0.6</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">1.0</offset>
+   <factor type="double">0.6</factor>
+  </binding>
  </axis>
 
 
diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
index 45ec41e25..b91292442 100644
--- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
+++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
@@ -19,6 +19,7 @@
 * Button 5: left brake only
 * Button 6: right brake only
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -58,6 +59,42 @@
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <axis n="3">
diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
index 9d54108c8..e90fca1a5 100644
--- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
@@ -21,6 +21,7 @@
 * Button 5 (06): left brake only
 * Button 6 (07): right brake only
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -68,6 +69,42 @@
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <!-- The next two axes are the view hat -->
@@ -145,6 +182,10 @@
   <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>
@@ -155,6 +196,10 @@
   <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>
diff --git a/Input/Joysticks/Logitech/wingman-force.xml b/Input/Joysticks/Logitech/wingman-force.xml
index f3a661d7e..8429cfd9d 100644
--- a/Input/Joysticks/Logitech/wingman-force.xml
+++ b/Input/Joysticks/Logitech/wingman-force.xml
@@ -20,6 +20,7 @@
 * Button 6 (06): left brake only
 * Button 7 (07): right brake only
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -59,6 +60,42 @@
    <offset type="double">+1.0</offset>
    <factor type="double">+0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">+1.0</offset>
+   <factor type="double">+0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">+1.0</offset>
+   <factor type="double">+0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">+1.0</offset>
+   <factor type="double">+0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">+1.0</offset>
+   <factor type="double">+0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">+1.0</offset>
+   <factor type="double">+0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">+1.0</offset>
+   <factor type="double">+0.5</factor>
+  </binding>
  </axis>
 
  <!-- The next two axes are the view hat -->
@@ -136,6 +173,10 @@
   <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>
@@ -146,6 +187,10 @@
   <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>
diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
index 0a0cdc6be..e1c64129c 100644
--- a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
+++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
@@ -24,6 +24,7 @@
 * Button 7 (right trigger): right wheel brake
 * Button 8 (S): cycle view
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -75,6 +76,30 @@
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <axis n="3">
diff --git a/Input/Joysticks/Microsoft/sidewinder-force-feed.xml b/Input/Joysticks/Microsoft/sidewinder-force-feed.xml
index 7522414e2..c6c754434 100644
--- a/Input/Joysticks/Microsoft/sidewinder-force-feed.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-force-feed.xml
@@ -19,6 +19,7 @@
 * Button 6: left brake only
 * Button 7: flap up
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -58,6 +59,42 @@
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <axis n="3">
diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
index b0a1c2dd3..19090f466 100644
--- a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
@@ -19,6 +19,7 @@
 * Button 6: left brake only
 * Button 7: flap up
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -67,6 +68,42 @@
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
   <axis n="4">
diff --git a/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml b/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml
index a04667d06..dfd6f7ce4 100644
--- a/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml
+++ b/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml
@@ -29,6 +29,7 @@ three-axis, three-button joystick, as follow:
   hat forward             look forward
   hat diagonal            look diagonal
 
+$Id$
 -->
 
 <PropertyList>
@@ -80,6 +81,30 @@ three-axis, three-button joystick, as follow:
 <offset type="double">-1.0</offset>
 <factor type="double">-0.5</factor>
 </binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[4]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[5]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[6]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[7]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
 </axis>
 
 <axis n="3">
diff --git a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
index 39b4f0b6c..268bda3a0 100644
--- a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
@@ -30,6 +30,7 @@ three-axis, three-button joystick, as follow:
   hat forward             look forward
   hat diagonal            look diagonal
 
+$Id$
 -->
 
 <PropertyList>
@@ -79,6 +80,42 @@ three-axis, three-button joystick, as follow:
 <offset type="double">-1.0</offset>
 <factor type="double">-0.5</factor>
 </binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[2]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[3]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[4]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[5]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[6]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
+<binding>
+<command>property-scale</command>
+<property>/controls/engines/engine[7]/throttle</property>
+<offset type="double">-1.0</offset>
+<factor type="double">-0.5</factor>
+</binding>
 </axis>
 
 <axis n="4">
diff --git a/Input/Joysticks/Saitek/X45.xml b/Input/Joysticks/Saitek/X45.xml
index f17c7c89e..0633de34d 100644
--- a/Input/Joysticks/Saitek/X45.xml
+++ b/Input/Joysticks/Saitek/X45.xml
@@ -47,6 +47,8 @@ Button Numbers:
 23 Throttle thumb hat in "right" position
 24 Throttle thumb hat in "down" position
 25 Throttle thumb hat in "left" position
+
+$Id$
 -->
 <PropertyList>
  <name>Saitek Saitek X45</name>
@@ -111,6 +113,42 @@ Button Numbers:
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <axis n="2">
diff --git a/Input/Joysticks/Saitek/X8-30.xml b/Input/Joysticks/Saitek/X8-30.xml
index b3ac32ffe..fa9eb3f5c 100644
--- a/Input/Joysticks/Saitek/X8-30.xml
+++ b/Input/Joysticks/Saitek/X8-30.xml
@@ -18,7 +18,9 @@ Layout:
   Button 1: center rudder
   Button 2: flaps up
   Button 3: flaps down
+
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
@@ -59,6 +61,42 @@ Layout:
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
  </axis>
 
  <axis n="3">
@@ -69,7 +107,7 @@ Layout:
    <binding>
     <command>property-adjust</command>
     <property>/controls/flight/rudder</property>
-    <step type="double">-0.05</step>
+    <step type="double">-0.02</step>
    </binding>
   </low>
   <high>
@@ -77,7 +115,7 @@ Layout:
    <binding>
     <command>property-adjust</command>
     <property>/controls/flight/rudder</property>
-    <step type="double">0.05</step>
+    <step type="double">0.02</step>
    </binding>
   </high>
  </axis>
@@ -171,4 +209,4 @@ Layout:
 
 </PropertyList>
 
-<!-- end of chf.xml -->
+<!-- end of X8-30.xml -->