1
0
Fork 0
Commit graph

364 commits

Author SHA1 Message Date
mfranz
ebf9d23f54 Curtis R Anderson: another <name> 2005-11-24 07:54:36 +00:00
curt
f90fb056d1 Match version with source. 2005-11-06 02:41:27 +00:00
mfranz
ee860f3e88 Stuart Buchanan:
joystick configuration for a Wingman Force 3D USB.

mfranz:
This driver is supposed to work for the non-USB versions, too, so
I'm replacing the non-USB driver with this one, and add its <name>s
here. If it turns out that we need a separate driver, it's better to
derive it from this file, as this is adapted to the newest methods
(nasal wrappers, etc.), while the old driver was only partly functional.
2005-10-26 17:40:41 +00:00
ehofman
1a966210b9 Mathias Fröhlich:
Here is an other one to the data directory. It updates the carrier launchbar
command and catapult launch command to reset itself if the key is no longer
pressed. That fixes the odd behavour, that once a carrier launch happened, a
second lauch happens no longer immediately at arresing time.
2005-10-13 13:45:54 +00:00
ehofman
52a134fae6 Frederic Bouvier:
The proper file ( the one with axis assignment set correctly for all OSes ) was too quickly removed, certainly because of its -win suffix.

I merged the good things in one file, discarding the problematic ones.
2005-10-06 09:34:50 +00:00
ehofman
bc5ca304ed Joystick updates. Remove an ancient windows specific version of the wingman-extreme. 2005-10-04 08:06:32 +00:00
curt
55ae4801f7 Curt Olson:
Initial revision.  This is the only joystick that the Walmart next to my
house is selling.  (What are you going to do?)  Buttons 2 and 4 are still
unmapped awaiting any good suggestions.
2005-09-09 01:43:07 +00:00
ehofman
0341e43fd4 Windows fixes from Bass Pumped. 2005-08-25 17:21:39 +00:00
ehofman
02021216c2 Update to recognize the 'Saitek Cyborg Evo' 2005-08-22 17:55:40 +00:00
mfranz
d9cb887375 Juergen Tretthahn: s/stepFlaps/flapsDown/ 2005-07-01 05:20:24 +00:00
mfranz
17166921c0 - rename controls.stepFlaps() to controls.flapsDown(), because:
- to support "old-style" gear/flap control (operation as long as button
  pressed/lever pushed -> b29/hurricane), let bindings not only report
  up/down, but up (-1), stop (0), down (1).
- let controls.flapsDown() ignore "stop" so as to remain compatible with
  prior behavior
- adapt all joysticks/aircraft (sigh)
- some minor cosmetics in joystick configs, such as indentation fixes
2005-06-22 13:08:01 +00:00
mfranz
a943e01c6d Jim Campbell: another name; fixed <mac> axes 2005-06-20 17:12:16 +00:00
mfranz
6654497a78 cosmetics (only to annoy everybode) 2005-06-19 18:25:57 +00:00
mfranz
bc51a3df26 - exploit the nasal namespace feature, which simplifies matters a lot and
avoids the obscure and ugly "which" workaround

Note that the input subsystem sets variable "this" to this joystick's
base property path; This is useful to be able to access the driver's own
information from the property tree. Example:

   data = props.globals.getNode(this).getNode("data");

where "this" contains string "/input[0]/joysticks[0]/js[0]" if the js is
the first in the system
2005-06-19 17:29:56 +00:00
mfranz
94dc0aab8d another name ... 2005-06-18 12:21:11 +00:00
mfranz
8a2ba09c4a call controls.stepFlaps() wrapper to keep bindings functional with aircraft
that implement special flaps behavior; use controls.throttleAxis() where
safely possible to support arbitrary numbers of engines
2005-06-16 16:47:31 +00:00
mfranz
f4a90a615e add controls.gearToggle() convenience function; adapt all joystick files
to new controls function
2005-06-16 07:59:33 +00:00
mfranz
088f1e10c6 Vivian Meazza: js config for "Logitech Freedom 2.4" 2005-06-15 03:25:59 +00:00
mfranz
d432fe55d2 - one more <name>
- use nasal for throttle
- remove useless bindings
- description fix
2005-06-14 16:13:25 +00:00
mfranz
b104eef939 clean up, using the new possibilities of the input subsystem; preparation
for operation-modes; only one user visible change: the speed brake toggle
does now also show a popup like the thrust reverser and the parking brake;
I hope that this is seen as useful help rather than annoyance.
2005-06-13 06:41:30 +00:00
mfranz
e269ac696f The default joystick is now identified by name "default". It's very, very
unlikely, that some js producer uses this as product id.
2005-06-11 14:18:40 +00:00
mfranz
019cc557a6 currently "tailwheel-lock=true" means 'unlocked', which is
confusing and inconsistent with brake properties (where 1.0
means (b)locked) ==> reverse tailwheel-lock meaning
2005-05-10 10:58:28 +00:00
ehofman
b5a534d91f Melchior FRANZ:
The one hat axis should be 4 for Unix/Linux and 6 for windows (according
to someone on IRC), while the other hat axis is apparently 7 for all
systems. Changed the throttle to Nasal, too.

I didn't nasalify the rest, because that's error-prone and I wouldn't
be able to test it.
2005-04-19 12:39:02 +00:00
ehofman
6b32b71eda Remove a duplicate name, assume it is not the Pro version after all. 2005-03-19 10:22:00 +00:00
ehofman
03d53595ef Add Mac support 2005-02-11 15:30:45 +00:00
ehofman
91cbe910a7 Small time fixes. 2005-02-06 08:55:59 +00:00
ehofman
f0830a44bb Paul Surgean: The rudder and throttle need swapping based on the OS just like the Sidewinder Precision Pro. 2005-01-23 09:01:27 +00:00
ehofman
72b38ddd26 Fix a mistake. 2005-01-18 15:32:43 +00:00
ehofman
ee92540597 Oliver C., Erik Hofman:
Fix the inverted view elevation setting for the
sidewinder precision pro joystick under windows.
2005-01-18 10:09:18 +00:00
ehofman
bf8a0efaa5 Some final changes to the carrier keyboard configuration. 2004-12-20 13:53:21 +00:00
ehofman
296dbf5e79 Add a keyboard bindings configurtion file for carrier capable aircraft 2004-12-20 12:52:18 +00:00
david
8503b293ee Decrease aileron/elevator/rudder sensitivity near the centre, again. 2004-12-17 16:29:49 +00:00
ehofman
f06b96f7ff Melchior FRANZ:
This file is in a rather bad state. Hence:

- remove doubled "rudder" settings
- fix & nasalify brake properties (/controls/gear/wheel[?]/brake, yet again)
- remove redundant index setting
- nasalify throttle (to allow more than 8 engines)
- nasalify flaps (to make flaps with more than 4 positions work)
- nasalify elevator trim (just for fun  :-)
- fix syntax
- remove lots of trailing spaces

File tested by Jon-Eirik Pettersen
2004-11-16 09:45:57 +00:00
ehofman
e332ad1568 Oliver C.:
i modified the joystick settings for the Sidewinder Precision Pro joystick.
Now all buttons and axis react the same way in unix and windows except for
the view elevation binding which is on axis 5 in unix and 7 in windows.
Here the windows axis is inverse, the unix version is not.
This means if you move the hat down in unix you will look down
if you move the hat down in windows you will look up.
To fix this we would need some sort of property to inverse the axis independly
for windows and unix. If you know a way to do this feel free to fix this.


I also added some more button bindings.
With button 1 you can now switch between the views,
The brakes where moved from button 1 to button 0 because this button was
unused and users who want to switch from MS Flight Simulator to FlightGear
will like that too because the buttons are now used the same way on both
sims. With the unused button 8 (shift button), you can now retract the gears.

I also fixed the arrangement for the 4 buttons called A, B, C and D left to
the stick.
With button B you can now turn the flaps up and with button A down.
With button C you can use the left brake and with button D the right brake.
Before those changes the windows and unix bindings were different and somehow
unordered (crossed).

I tested this new Joystick settings in Windows Millenium and
Linux Slackware 10 with Flightgear 0.9.6 for windows and the newest cvs
version from today for Linux.
2004-11-08 17:35:17 +00:00
ehofman
73054589dc Dave Perry:
I use both Linux and Win XP with my CH yoke and pedals and noted that I have two different versions of the yoke xml with the mixture and prop axis reversed.  Here is an edit that works for me with both Win XP and Linux.
2004-10-31 15:02:29 +00:00
ehofman
1abbb76777 Make a distinction between UNIX and Windows and add the nasal version of flap stepping (again). 2004-10-16 08:44:19 +00:00
ehofman
870d7181c5 Haim GERON:
I had some problems with CH flight sim yoke usb. After some experiments, I modified the xml file and now it works fine.
2004-10-10 11:35:45 +00:00
ehofman
8844cb13ec Use a Nasal script instead of a fixed number of flap settings. 2004-08-15 09:19:36 +00:00
ehofman
8ce6031f23 Eric L. Hathaway:
The following patch updates the ThrustMaster FCS joystick configuration.  I have "Nasal-ized" the joystick bindings, drawing ideas from the Cyborg-Gold-3d-USB configuration file.  I also changed some of the bindings, so the joystick setup is more like the default four-axis-joystick config.  When I submitted the original config file, I had the hat switch bound to the rudder and elevator trim.  Since the vast majority (all?) of the other joystick configs use the hat switch to control view direction, I think it would be best for the defaults for this joystick to conform to the rest in order to obey the "principle of least surprise" for the unsuspecting user.
2004-08-06 08:49:31 +00:00
ehofman
016238f66a Dave Perry:
This is an edit of this file that should work with either Windows or Linux.  As of a few days ago, the CVS file did not work at all.
2004-08-06 08:44:14 +00:00
ehofman
81e992e56f Add another name for the same device. 2004-07-21 06:55:15 +00:00
ehofman
af17319f36 Updated file. left/right break doesn't work yet, b
ut the previous file didn't work at all. Thanks Damon Toal-Rossi.
2004-07-16 20:17:36 +00:00
ehofman
c752dc927d Add the Cyborg Evo from Phillip Jones. 2004-05-13 14:45:27 +00:00
ehofman
3654ccb65f Add the Top-Gun-Fox2-Pro USB joystick, modify the Macally iStick USB joystick and update axis bindings to allow the Saitek X45 to work under Max OSX. 2004-05-06 16:12:32 +00:00
ehofman
1cf6ed49ed Add support for the Macally iStick USB 2004-05-03 19:02:16 +00:00
andy
5edd104b6b Add windows name for the device, and a note about the mode switch. 2004-04-30 15:31:10 +00:00
andy
7babf42a23 Oops, include the windows driver name string too. 2004-04-30 15:26:55 +00:00
andy
cda071eac3 Fix a few windows issues with the axis mappings 2004-04-30 15:24:04 +00:00
ehofman
796354421d Update the header to match the configuration file. 2004-04-29 09:18:57 +00:00
ehofman
efaab2be2a Fix the UNIX/Windows axis mismatch. 2004-04-29 09:14:14 +00:00
ehofman
b67ef3b275 Make it work on windows and unix. 2004-04-28 09:05:57 +00:00
ehofman
996ed1a717 Adjust the joystick configuration to match the new code changes. 2004-04-28 08:23:38 +00:00
ehofman
483b300774 Add support for a Windows version of the SideWinder Precision Pro joystick. 2004-04-27 08:45:01 +00:00
ehofman
e4fd2a455a Sync. with the functions of the Cyborg-Gold-3d-USB 2004-04-09 09:06:30 +00:00
ehofman
c055153de5 Melchior FRANZ:
Add harrier/vtol support:

Display the Harrier's thrust vector setting.
0=vertical, 100=max forward flight, -20=max backward
2004-04-06 16:47:57 +00:00
curt
03eaf08ea2 Update brake properties. (These were changed a while back when we did
the braking setup, but these commits were missed due to permission problems.)
2004-03-24 00:46:14 +00:00
ehofman
e91fbf2beb Use the nasal flap selection mechanism 2004-03-18 14:50:04 +00:00
ehofman
edf25a4e82 Fix two typo's 2004-03-04 12:18:34 +00:00
ehofman
60663a001a Adjust to modern times 2004-03-04 12:17:21 +00:00
ehofman
db14caea2d Add support for a Logitech Extreme 3D Pro and a thrustmaster top gun afterburner USB joystick 2004-03-04 10:37:44 +00:00
ehofman
6f8a6bd045 Further refinements 2004-02-26 14:51:04 +00:00
ehofman
20d0cb3623 Melchior FRANZ:
- add zoom out/zoom in (F4 + F1/F2)
- make brakes a bit more effective
- fix references
2004-02-26 09:39:24 +00:00
ehofman
557737666f Add a more advanced configuration file for the Cyborg-Gold-3d-USB 2004-02-19 14:16:23 +00:00
ehofman
b40819bdac Add support for the Logitech Logitech Extreme 3D Pro joystick 2004-02-08 18:59:05 +00:00
curt
f7c276944e Attempt #1 to sort out confusion between left / right / parking brake
controls in the cockpit vs. which wheels they apply to.  FlightGear now
sets /controls/gear/brake-left, /controls/gear/brake-right, and
/controls/gear/brake-parking.  It should be up to the FDM to sort out
which wheels under which circumstances are affected by these controls
and ultimately what happens to the physical motion of the aircraft.
2004-01-12 17:49:33 +00:00
curt
08378e88f0 Doug Beattie:
First, I've attached a copy of the Logitech WingMan Force 3D XML
file "wingman-force-3d.xml" I put together after getting one of
these for Christmas.  (It would be nice if the force feedback worked,
but I haven't had time to play with it that much. Come to think about
it I'm not even sure forece feedback works under Linux in general.)

Besides providing the new file I also edited the higher-level
/FlightGear/joysticks.xml file to add the description for this joystick
as follows:

diff -n joysticks.xml_orig joysticks.xml
a22 1
 <js-named include="Input/Joysticks/Logitech/wingman-force-3d.xml"/>
2004-01-05 20:48:00 +00:00
curt
94f4ccf998 Harold Roberts:
Add a joystick config for the Logitech Extreme 3D Pro USB.
2003-12-30 16:48:57 +00:00
andy
4396fe8157 Convert to Nasal bindings. 2003-12-26 19:53:22 +00:00
andy
35ec004c5f Nasal bindings for Saitek X45.
Misc. fixes to Nasal command bindings.
2003-12-23 17:31:08 +00:00
ehofman
d47f83ebc9 Update the four axis joystick to the new controlls layout and fix a mistake in the X8-30 configuration file 2003-12-22 14:57:53 +00:00
ehofman
0abab4423f Melchior FRANZ:
I'm using a different Joystick now, but these changes
were on my harddisk for a while and should be in CVS:
replace "squared" by "power 3" (the X8-30 is of rather
bad quality, and the 3 help to avoid jitter). Add
"interval-sec" settings.
2003-11-28 10:33:15 +00:00
ehofman
1afef5b03e Add support for the 'Microsoft SideWinder 3D Pro' joystick 2003-11-28 09:22:52 +00:00
ehofman
adf13de3ee Add support for a joystick which calls itself 'Microsoft Microsoft SideWinder Precision Pro (USB)' 2003-11-28 09:16:06 +00:00
ehofman
d92d080236 Update joystick bindings 2003-11-03 10:23:47 +00:00
david
2f19468e0d Don't make axes exponential. 2003-10-17 01:22:41 +00:00
ehofman
6fdb74ea5a Fix a typo 2003-09-16 08:18:40 +00:00
ehofman
61327741bf Alex Perry:
Since several people on the list have been asking questions about this Saitek joystick and the comments at the top of this xml file in cvs were wrong and confusing, I am posting this update with the following changes:
1.  Removed the confusing/wrong comments.
2.  Added throttle bindings for engines 2 thru 7 (required for the b52).
3.  Changed the hat axis to rotate the view continuously (required to see the mag switch in the p51d and just a lot nicer with any 3d cockpit).

This last change makes the hat point the line of sight more like moving your head.  This is the way the CH pro-yoke-USB is set up.

If you are not used to this set up and you use aircraft with 2d pannels, you will likely need to use shift-nuberpad-8 to get the original forward view once you look arround.
2003-07-31 14:54:46 +00:00
ehofman
43fd209d1e Add support for the SideWinder Precision Pro joystick 2003-07-27 07:43:56 +00:00
ehofman
b31faae314 Ad an Analog 4-axis 4-button joystick configuration 2003-07-23 08:45:04 +00:00
ehofman
16660ed513 Add two ThrustMaster input devices 2003-07-12 11:38:12 +00:00
david
4f14c7a9f4 Square axes instead of cubing them. 2003-07-08 18:35:51 +00:00
ehofman
33c874d90e Back out the interval patch 2003-07-02 07:40:37 +00:00
ehofman
a351eed684 Add an interval timer to repeatable joystick buttons 2003-07-01 19:19:09 +00:00
ehofman
ce8cb1e03a Add the Microsoft Sidewindows Force Feedback Pro joystick 2003-06-29 19:09:33 +00:00
ehofman
dd0090a765 Add bindings for up to 8 engines 2003-06-29 17:47:28 +00:00
ehofman
acb9f1db90 Add WillyB's Microsoft Sidewinder joystick configuration file 2003-06-29 17:39:15 +00:00
ehofman
6800b9728d 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.
2003-06-29 08:33:59 +00:00
david
351277ba5f Minor adjustments.
Return to old view arrangement.
2003-05-13 10:27:19 +00:00
ehofman
f963e50054 Add the Saitek Cyborg-3d-Rumble-Force game pad 2003-05-03 12:21:59 +00:00
ehofman
4094f22fbd Add engine boost selection 2003-04-07 08:11:46 +00:00
david
8118e6a482 Fix to use renamed /control properties. 2003-04-01 15:46:50 +00:00
ehofman
759d86d947 Updates to refelect the controls update of FlightGear. It could be there are a few unupdated controls left. To simplify the transisition there is a file called README.properties in the docs-mini directory of FlightGear that explains the new controls layout. 2003-04-01 12:41:12 +00:00
david
47a2481cf0 Square the control inputs, again. 2003-03-29 14:14:45 +00:00
mselig
8a024313ac Adding RC joystick support for Hitec Laser 4 transmitter used in conjunction with RCJOY USB box. MSS 2003-03-25 22:14:30 +00:00
david
ffe5b6a0c4 Remove the power property to make the yoke more sensitive. 2003-03-11 03:50:40 +00:00
david
be55a4b566 Remove the squared property to make the pedals more sensitive. 2003-03-11 03:48:36 +00:00
david
9a97610837 View hat pans smoothly. 2003-03-02 14:18:33 +00:00
david
02c8bbadd6 Have the hat scroll the view around instead of snapping to fixed
detents.
2003-02-18 16:53:41 +00:00
jimw
57bac4eac0 Added bindings for mode switch. Rudder control to differential braking in
Mode 3 only.  View reset now works with viewer configuration data.
2003-02-16 01:25:46 +00:00
david
dad91e6e70 Patch from Sergey V. Udaltsov:
I've got nice joystick Logitech WingMan Force and found no file for it
in FG 0.8. If anyone interested, I offer it here. It is based on
Logitech WingMan Extreme configuration, but there are less axes (no
rudder:() and more (9!) buttons (actually, I don't use them all). Hope
it is useful.
2002-10-13 10:56:59 +00:00
j4strngs
7657789ee8 remove foreign language names 2002-09-27 22:20:08 +00:00
david
566ed04458 Toggling button 6 up raises the flaps all the way. 2002-09-14 18:34:53 +00:00
j4strngs
b01a8cc475 Fred Bouvier sez: > here is the profile for the Logitech WingMan Extreme Digital 3D (USB).
> It has more or less the same layout than the one for the MS Sidewinder
> Force.
>
> There is already a profile for this joystick in the base package but
> it differs in the axes layout : axes 2 & 3 are inverted and the hat is
> at 6&7 instead of 5&6. I think this is a Linux/Windows difference.
> As the reported name is different, the two profiles can coexist.
2002-09-12 23:54:47 +00:00
j4strngs
6e36129be4 > attached find the two files including my entries for the CH Virtual Pilot
> USB/USB CH Pedals. I've just tested them to work. These are based on recent
> files fetched from the base CVS.
2002-09-11 20:45:01 +00:00
j4strngs
a191dff43b Remove excess name tags 2002-09-09 00:48:08 +00:00
david
4aed2a0239 Added configuration for Saitek Cyborg Gold 3D USB from Dave Perry. 2002-09-07 11:10:04 +00:00
jimw
2e38afe1a8 Added support for non FF sidewinder precision 2 usb. This should also work
with Sidewinder Pro 3d but I do not have a string.  Also I do not have the
non-English strings for the USB stick.  Note that this config is similar to
the Force feedback stick, except the axes for the rudder and throttle are
different on the Precision 2 USB and Pro 3d sticks.
2002-09-04 01:43:40 +00:00
j4strngs
3795200ae6 Updated preconfigured joystick files 2002-09-01 21:33:31 +00:00
david
213d9f71e2 Patch from William Earnest to correct variant device name. 2002-08-04 17:11:48 +00:00
david
9f556c6d07 Added Saitek X8-30 joystick bindings from Melchior Franz. 2002-08-04 16:38:16 +00:00
david
2063ed48c6 Add variant name reported by William Earnest. 2002-07-31 15:35:28 +00:00
aross
1608cf13ef Saitek X45 configuration 2002-07-10 17:52:49 +00:00
david
cd175b943f Added custom configuration for Microsoft SideWinder Force Feedback
from Frederic Bouvier.
2002-07-04 20:42:10 +00:00
david
95683a640c Customized joystick bindings for various devices. 2002-07-04 15:52:15 +00:00