diff --git a/Input/Joysticks/Default/four-axis-joystick.xml b/Input/Joysticks/Default/four-axis-joystick.xml index e5c8cca8c..30cb841b9 100644 --- a/Input/Joysticks/Default/four-axis-joystick.xml +++ b/Input/Joysticks/Default/four-axis-joystick.xml @@ -51,25 +51,13 @@ joystick, and that the first button is the trigger. diff --git a/Input/Joysticks/Default/joystick.xml b/Input/Joysticks/Default/joystick.xml index f23992b4a..af65b20a2 100644 --- a/Input/Joysticks/Default/joystick.xml +++ b/Input/Joysticks/Default/joystick.xml @@ -44,25 +44,13 @@ $Id$ diff --git a/Input/Joysticks/Logitech/attack-3.xml b/Input/Joysticks/Logitech/attack-3.xml index cd4a0d057..86397b721 100644 --- a/Input/Joysticks/Logitech/attack-3.xml +++ b/Input/Joysticks/Logitech/attack-3.xml @@ -44,25 +44,13 @@ @@ -113,39 +101,35 @@ - - - + + + @@ -198,34 +186,30 @@ $Id$ - - diff --git a/Input/Joysticks/Logitech/freedom2-4.xml b/Input/Joysticks/Logitech/freedom2-4.xml index 221415865..574305e4c 100644 --- a/Input/Joysticks/Logitech/freedom2-4.xml +++ b/Input/Joysticks/Logitech/freedom2-4.xml @@ -135,25 +135,13 @@ 0 - property-assign - /controls/gear/brake-left - 1.0 - - - property-assign - /controls/gear/brake-right - 1.0 + nasal + - property-assign - /controls/gear/brake-left - 0.0 - - - property-assign - /controls/gear/brake-right - 0.0 + nasal + @@ -242,26 +230,6 @@ - - + + diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml index 0628bf709..8f20746f8 100644 --- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml +++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml @@ -142,25 +142,13 @@ $Id$ 0 - property-assign - /controls/gear/brake-left - 1.0 - - - property-assign - /controls/gear/brake-right - 1.0 + nasal + - property-assign - /controls/gear/brake-left - 0.0 - - - property-assign - /controls/gear/brake-right - 0.0 + nasal + @@ -241,15 +229,13 @@ $Id$ 5 - property-assign - /controls/gear/brake-left - 1.0 + nasal + - property-assign - /controls/gear/brake-left - 0.0 + nasal + @@ -262,15 +248,13 @@ $Id$ 6 - property-assign - /controls/gear/brake-right - 1.0 + nasal + - property-assign - /controls/gear/brake-right - 0.0 + nasal + diff --git a/Input/Joysticks/Logitech/wingman-force-3d.xml b/Input/Joysticks/Logitech/wingman-force-3d.xml index c65640e1e..f394e185c 100644 --- a/Input/Joysticks/Logitech/wingman-force-3d.xml +++ b/Input/Joysticks/Logitech/wingman-force-3d.xml @@ -110,25 +110,13 @@ diff --git a/Input/Joysticks/Logitech/wingman-force.xml b/Input/Joysticks/Logitech/wingman-force.xml index 9b230aedd..c429f979c 100644 --- a/Input/Joysticks/Logitech/wingman-force.xml +++ b/Input/Joysticks/Logitech/wingman-force.xml @@ -117,25 +117,13 @@ $Id$ @@ -187,31 +175,29 @@ $Id$ diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml index 68eceff1b..183118416 100644 --- a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml +++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml @@ -165,33 +165,29 @@ $Id$ diff --git a/Input/Joysticks/Macally/istick-usb.xml b/Input/Joysticks/Macally/istick-usb.xml index adc134172..b739fb089 100644 --- a/Input/Joysticks/Macally/istick-usb.xml +++ b/Input/Joysticks/Macally/istick-usb.xml @@ -160,25 +160,13 @@ Layout: diff --git a/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml b/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml index 9f8692800..5c2a81841 100644 --- a/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml +++ b/Input/Joysticks/MegaWorld/USB-Game-Controllers.xml @@ -81,18 +81,12 @@ Brakes nasal - + nasal - + diff --git a/Input/Joysticks/Microsoft/sidewinder-3d-pro.xml b/Input/Joysticks/Microsoft/sidewinder-3d-pro.xml index b88dbed47..b29ffd535 100644 --- a/Input/Joysticks/Microsoft/sidewinder-3d-pro.xml +++ b/Input/Joysticks/Microsoft/sidewinder-3d-pro.xml @@ -105,25 +105,13 @@ @@ -196,15 +184,13 @@ @@ -212,15 +198,13 @@ diff --git a/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml b/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml index 1dca0f951..fe409ea59 100644 --- a/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml +++ b/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml @@ -126,25 +126,13 @@ $Id: @@ -202,15 +190,13 @@ $Id: @@ -218,15 +204,13 @@ $Id: diff --git a/Input/Joysticks/Microsoft/sidewinder-force-feed.xml b/Input/Joysticks/Microsoft/sidewinder-force-feed.xml index 396f7f50e..c295c49ea 100644 --- a/Input/Joysticks/Microsoft/sidewinder-force-feed.xml +++ b/Input/Joysticks/Microsoft/sidewinder-force-feed.xml @@ -105,25 +105,13 @@ $Id$ @@ -181,15 +169,13 @@ $Id$ @@ -197,15 +183,13 @@ $Id$ diff --git a/Input/Joysticks/Microsoft/sidewinder-force-feed2.xml b/Input/Joysticks/Microsoft/sidewinder-force-feed2.xml index 8fb2479f4..c4707a068 100644 --- a/Input/Joysticks/Microsoft/sidewinder-force-feed2.xml +++ b/Input/Joysticks/Microsoft/sidewinder-force-feed2.xml @@ -136,25 +136,13 @@ @@ -162,15 +150,13 @@ @@ -178,15 +164,13 @@ diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml index 1f1f6b82e..4ee916296 100644 --- a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml +++ b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml @@ -4,7 +4,7 @@ ************************************************************************ * Bindings for Microsoft SideWinder Precision Pro joystick. * -* +* * Axis 0: ailerons * Axis 1: elevator * Axis 2(Unix)/3(Win) (twist): rudder @@ -152,25 +152,13 @@ $Id$ @@ -237,31 +225,27 @@ $Id$ - - @@ -269,10 +253,10 @@ $Id$ @@ -84,15 +72,13 @@ $Id$ @@ -100,15 +86,13 @@ $Id$ diff --git a/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml b/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml index 8b91fe9de..8025dca55 100644 --- a/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml +++ b/Input/Joysticks/Saitek/Cyborg-3d-Rumble-Force.xml @@ -116,25 +116,13 @@ $Id$ @@ -151,15 +139,13 @@ $Id$ @@ -167,15 +153,13 @@ $Id$ diff --git a/Input/Joysticks/Saitek/ST290-Pro.xml b/Input/Joysticks/Saitek/ST290-Pro.xml index 0ec6adc45..438481113 100644 --- a/Input/Joysticks/Saitek/ST290-Pro.xml +++ b/Input/Joysticks/Saitek/ST290-Pro.xml @@ -133,25 +133,13 @@ $Id$ diff --git a/Input/Joysticks/Saitek/X45.xml b/Input/Joysticks/Saitek/X45.xml index d6fa69047..e49496d73 100644 --- a/Input/Joysticks/Saitek/X45.xml +++ b/Input/Joysticks/Saitek/X45.xml @@ -197,25 +197,13 @@ $Id$ diff --git a/Input/Joysticks/Saitek/X8-30.xml b/Input/Joysticks/Saitek/X8-30.xml index 129772fce..4a723f685 100644 --- a/Input/Joysticks/Saitek/X8-30.xml +++ b/Input/Joysticks/Saitek/X8-30.xml @@ -102,25 +102,13 @@ $Id$ diff --git a/Input/Joysticks/ThrustMaster/Attack-Throttle.xml b/Input/Joysticks/ThrustMaster/Attack-Throttle.xml index 374977ad3..a879f660d 100644 --- a/Input/Joysticks/ThrustMaster/Attack-Throttle.xml +++ b/Input/Joysticks/ThrustMaster/Attack-Throttle.xml @@ -47,52 +47,8 @@ Throttle - property-scale - /controls/engines/engine[0]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[1]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[2]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[3]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[4]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[5]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[6]/throttle - 1.0 - 0.5 - - - property-scale - /controls/engines/engine[7]/throttle - 1.0 - 0.5 + nasal + @@ -148,25 +104,13 @@ @@ -224,15 +168,13 @@ @@ -240,15 +182,13 @@ diff --git a/Input/Joysticks/ThrustMaster/FCS.xml b/Input/Joysticks/ThrustMaster/FCS.xml index ac4e1cf73..63fab585c 100644 --- a/Input/Joysticks/ThrustMaster/FCS.xml +++ b/Input/Joysticks/ThrustMaster/FCS.xml @@ -93,18 +93,12 @@ Eric Hathaway : "Nasal-ized" the joystick configuration, Brakes nasal - + nasal - + diff --git a/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml b/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml index cb7d517d0..8c199cddd 100644 --- a/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml +++ b/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml @@ -102,25 +102,13 @@