diff --git a/Input/Joysticks/Logitech/extreme-3d-pro.xml b/Input/Joysticks/Logitech/extreme-3d-pro.xml index 737d0d842..885c7c93a 100644 --- a/Input/Joysticks/Logitech/extreme-3d-pro.xml +++ b/Input/Joysticks/Logitech/extreme-3d-pro.xml @@ -29,6 +29,7 @@ $Id$ <name>Logitech Logitech Extreme 3D Pro</name> <name>Logitech Extreme 3D Pro</name> <name>Logitech Extreme 3D Pro USB</name> + <name>Logitech Extreme 3D Pro USB</name> <axis n="0"> <desc>Aileron</desc> diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml deleted file mode 100644 index 2c0d0a005..000000000 --- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml +++ /dev/null @@ -1,278 +0,0 @@ -<?xml version="1.0" ?> - -<!-- -************************************************************************ -* Bindings for Logitech WingMan Extreme Digital 3D (USB) joystick. -* -* -* Axis 0: ailerons -* Axis 1: elevator -* Axis 2 (slider): throttle -* Axis 3 (twist): rudder -* Axes 6 and 7 (hat): view direction -* -* Button 0: all brakes -* Button 1: flap down -* Button 2: flap up -* Button 3: elevator trim up -* Button 4: elevator trim down -* Button 5: left brake only -* Button 6: right brake only -************************************************************************ -$Id$ ---> - -<PropertyList> - - <name>Logitech WingMan Extreme Digital 3D (USB)</name> - - <axis> - <desc>Aileron</desc> - <number> - <unix>0</unix> - <mac>0</mac> - <windows>0</windows> - </number> - <binding> - <command>property-scale</command> - <property>/controls/flight/aileron</property> - <squared type="bool">true</squared> - </binding> - </axis> - - <axis> - <desc>Elevator</desc> - <number> - <unix>1</unix> - <mac>1</mac> - <windows>1</windows> - </number> - <binding> - <command>property-scale</command> - <property>/controls/flight/elevator</property> - <factor type="double">-1.0</factor> - <squared type="bool">true</squared> - </binding> - </axis> - - <axis> - <desc>Throttle</desc> - <number> - <unix>3</unix> - <mac>3</mac> - <windows>2</windows> - </number> - <binding> - <command>nasal</command> - <script>controls.throttleAxis()</script> - </binding> - </axis> - - <axis> - <desc>Rudder</desc> - <number> - <unix>2</unix> - <mac>2</mac> - <windows>3</windows> - </number> - <binding> - <command>property-scale</command> - <property>/controls/flight/rudder</property> - <factor type="double">1.0</factor> - </binding> - </axis> - - <axis n="6"> - <desc>View Direction</desc> - <number> - <unix>4</unix> - <mac>4</mac> - <windows>6</windows> - </number> - <low> - <repeatable>true</repeatable> - <binding> - <command>property-adjust</command> - <property>/sim/current-view/goal-heading-offset-deg</property> - <step type="double">1.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">-1.0</step> - </binding> - </high> - </axis> - - <axis> - <desc>View Elevation</desc> - <number> - <unix>5</unix> - <mac>5</mac> - <windows>7</windows> - </number> - <low> - <repeatable>true</repeatable> - <binding> - <command>property-adjust</command> - <property>/sim/current-view/goal-pitch-offset-deg</property> - <step type="double">1.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">-1.0</step> - </binding> - </high> - </axis> - - <button> - <desc>Brakes</desc> - <number> - <unix>0</unix> - <mac>0</mac> - <windows>0</windows> - </number> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-left</property> - <value type="double">1.0</value> - </binding> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-right</property> - <value type="double">1.0</value> - </binding> - <mod-up> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-left</property> - <value type="double">0.0</value> - </binding> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-right</property> - <value type="double">0.0</value> - </binding> - </mod-up> - </button> - - <button> - <desc>Elevator trim up</desc> - <number> - <unix>3</unix> - <mac>3</mac> - <windows>3</windows> - </number> - <repeatable type="bool">true</repeatable> - <binding> - <command>property-adjust</command> - <property>/controls/flight/elevator-trim</property> - <step type="double">0.001</step> - </binding> - </button> - - <button> - <desc>Elevator trim down</desc> - <number> - <unix>4</unix> - <mac>4</mac> - <windows>4</windows> - </number> - <repeatable type="bool">true</repeatable> - <binding> - <command>property-adjust</command> - <property>/controls/flight/elevator-trim</property> - <step type="double">-0.001</step> - </binding> - </button> - - <button> - <desc>Flaps down</desc> - <number> - <unix>1</unix> - <mac>1</mac> - <windows>1</windows> - </number> - <repeatable>false</repeatable> - <binding> - <command>nasal</command> - <script>controls.flapsDown(-1)</script> - </binding> - <mod-up> - <binding> - <command>nasal</command> - <script>controls.flapsDown(0)</script> - </binding> - </mod-up> - </button> - - <button> - <desc>Flaps up</desc> - <number> - <unix>2</unix> - <mac>2</mac> - <windows>2</windows> - </number> - <repeatable>false</repeatable> - <binding> - <command>nasal</command> - <script>controls.flapsDown(1)</script> - </binding> - <mod-up> - <binding> - <command>nasal</command> - <script>controls.flapsDown(0)</script> - </binding> - </mod-up> - </button> - - <button> - <desc>Right brake</desc> - <number> - <unix>6</unix> - <mac>6</mac> - <windows>6</windows> - </number> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-right</property> - <value type="double">1.0</value> - </binding> - <mod-up> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-right</property> - <value type="double">0.0</value> - </binding> - </mod-up> - </button> - - <button> - <desc>Left brake</desc> - <number> - <unix>5</unix> - <mac>5</mac> - <windows>5</windows> - </number> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-left</property> - <value type="double">1.0</value> - </binding> - <mod-up> - <binding> - <command>property-assign</command> - <property>/controls/gear/brake-left</property> - <value type="double">0.0</value> - </binding> - </mod-up> - </button> - -</PropertyList> diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml index a6d9fc245..61ca3ccb7 100644 --- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml +++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml @@ -28,6 +28,7 @@ $Id$ <name>Logitech Inc. WingMan Extreme Digital 3D</name> <name>Logitech Logitech Extreme 3D</name> + <name>Logitech WingMan Extreme Digital 3D (USB)</name> <axis n="0"> <desc>Aileron</desc>