1
0
Fork 0

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.
This commit is contained in:
ehofman 2003-06-29 08:33:59 +00:00
parent c300d98fc8
commit 6800b9728d
14 changed files with 481 additions and 5 deletions

View file

@ -11,6 +11,7 @@
* Axis 1 (right pedal): right brake
* Axis 2 (sliding both pedals): rudder (and nosewheel)
************************************************************************
$Id$
-->
<PropertyList>

View file

@ -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>

View file

@ -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">

View file

@ -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>

View file

@ -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">

View file

@ -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>

View file

@ -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>

View file

@ -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">

View file

@ -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">

View file

@ -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">

View file

@ -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">

View file

@ -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">

View file

@ -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">

View file

@ -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 -->