fly/fgdata
1
0
Fork 0
Code Activity

add controls.gearToggle() convenience function; adapt all joystick files

Browse source 
to new controls function
This commit is contained in:
mfranz 2005-06-16 07:59:33 +00:00
parent 7cc31829a3
commit f4a90a615e
8 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Input/Joysticks/CH/pro-yoke-usb.xml
View file

@ -208,18 +208,16 @@
<button n="4"> <button n="4">
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>nasal</command>
<property>/controls/gear/gear-down</property> <script>controls.gearDown(0)</script>
<value>false</value>
</binding> </binding>
</button> </button>
<button n="5"> <button n="5">
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>nasal</command>
<property>/controls/gear/gear-down</property> <script>controls.gearDown(1)</script>
<value>true</value>
</binding> </binding>
</button> </button>

10
Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
View file

@ -21,7 +21,7 @@
* Button 5: flap down Button A 0010 * Button 5: flap down Button A 0010
* Button 6: left brake only Button C 0040 * Button 6: left brake only Button C 0040
* Button 7: right brake only Button D 0080 * Button 7: right brake only Button D 0080
* Button 8(Unix)/9(Win): gear up Shift Button 0100(unix), 0200(Win) * Button 8(Unix)/9(Win): gear toggle Shift Button 0100(unix), 0200(Win)
************************************************************************ ************************************************************************
$Id$ $Id$
--> -->
@ -257,7 +257,7 @@ $Id$
</button> </button>
<button> <button>
<desc>Gear Up.</desc> <desc>Gear Toggle.</desc>
<number> <number>
<unix>8</unix> <unix>8</unix>
<mac>8</mac> <mac>8</mac>
@ -265,11 +265,9 @@ $Id$
</number> </number>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>nasal</command>
<property>/controls/gear/gear-down</property> <script>controls.gearToggle()</script>
<value type="double">0.0</value>
</binding> </binding>
</button> </button>
</PropertyList> </PropertyList>

4
Input/Joysticks/Saitek/Cyborg-Evo.xml
View file

@ -288,7 +288,7 @@ axis 5: (hat up-down) look u/d Trim Elevator Adj Propeller #
if (mod == nil or mod == 0) { if (mod == nil or mod == 0) {
controls.stepFlaps(-1); controls.stepFlaps(-1);
} elsif (mod == 1) { } elsif (mod == 1) {
setprop("/controls/gear/gear-down", 0); controls.gearDown(0);
} elsif (mod == 2) { } elsif (mod == 2) {
view.increase(); view.increase();
} elsif (mod == 3) { } elsif (mod == 3) {
@ -309,7 +309,7 @@ axis 5: (hat up-down) look u/d Trim Elevator Adj Propeller #
if (mod == nil or mod == 0) { if (mod == nil or mod == 0) {
controls.stepFlaps(1); controls.stepFlaps(1);
} elsif (mod == 1) { } elsif (mod == 1) {
setprop("/controls/gear/gear-down", 1); controls.gearDown(1);
} elsif (mod == 2) { } elsif (mod == 2) {
view.decrease(); view.decrease();
} elsif (mod == 3) { } elsif (mod == 3) {

4
Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
View file

@ -237,7 +237,7 @@ ________________________________________________________________________________
if (mod == 0) { if (mod == 0) {
controls.stepFlaps(-1); controls.stepFlaps(-1);
} elsif (mod == 1) { } elsif (mod == 1) {
setprop("/controls/gear/gear-down", 0); controls.gearDown(0);
} elsif (mod == 2) { } elsif (mod == 2) {
view.stepView(-1); view.stepView(-1);
} elsif (mod == 3) { } elsif (mod == 3) {
@ -282,7 +282,7 @@ ________________________________________________________________________________
if (mod == 0) { if (mod == 0) {
controls.stepFlaps(1); controls.stepFlaps(1);
} elsif (mod == 1) { } elsif (mod == 1) {
setprop("/controls/gear/gear-down", 1); controls.gearDown(1);
} elsif (mod == 2) { } elsif (mod == 2) {
view.stepView(1); view.stepView(1);
} elsif (mod == 3) { } elsif (mod == 3) {

4
Input/Joysticks/Saitek/X45.xml
View file

@ -227,8 +227,8 @@ $Id$
<button n="1"> <button n="1">
<desc>Landing Gear Up/Down Toggle</desc> <desc>Landing Gear Up/Down Toggle</desc>
<binding> <binding>
<command>property-toggle</command> <command>nasal</command>
<property>/controls/gear/gear-down</property> <script>controls.gearToggle()</script>
</binding> </binding>
</button> </button>

4
Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
View file

@ -271,7 +271,7 @@ ________________________________________________________________________________
if (mod == nil or mod == 0) { if (mod == nil or mod == 0) {
controls.stepFlaps(-1); controls.stepFlaps(-1);
} elsif (mod == 1) { } elsif (mod == 1) {
setprop("/controls/gear/gear-down", 0); controls.gearDown(0);
} elsif (mod == 2) { } elsif (mod == 2) {
view.stepView(-1); view.stepView(-1);
} elsif (mod == 3) { } elsif (mod == 3) {
@ -320,7 +320,7 @@ ________________________________________________________________________________
if (mod == nil or mod == 0) { if (mod == nil or mod == 0) {
controls.stepFlaps(1); controls.stepFlaps(1);
} elsif (mod == 1) { } elsif (mod == 1) {
setprop("/controls/gear/gear-down", 1); controls.gearDown(1);
} elsif (mod == 2) { } elsif (mod == 2) {
view.stepView(1); view.stepView(1);
} elsif (mod == 3) { } elsif (mod == 3) {

5
Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
View file

@ -128,9 +128,8 @@
<button n="2"> <button n="2">
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-assign</command> <command>nasal</command>
<property>/controls/gear/gear-down</property> <script>controls.gearToggle()</script>
<value>true</value>
</binding> </binding>
</button> </button>

1
Nasal/controls.nas
View file

@ -315,3 +315,4 @@ aileronTrimAxis = func { aileronTrim(cmdarg().getNode("value").getValue()); }
rudderTrimAxis = func { rudderTrim(cmdarg().getNode("value").getValue()); } rudderTrimAxis = func { rudderTrim(cmdarg().getNode("value").getValue()); }
gearDown = func { setprop("/controls/gear/gear-down", arg[0]); } gearDown = func { setprop("/controls/gear/gear-down", arg[0]); }
gearToggle = func { gearDown(!getprop("/controls/gear/gear-down")); }