kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix min/max/center values of USB joysticks

Browse source 
- Bump PORTREVISION

PR:		189006
Submitted by:	russo@bogodyn.org
This commit is contained in:
Rene Ladan 2014-07-21 13:23:26 +00:00
parent 7b01835678
commit 0dd6eaa107
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=362435
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x11-toolkits/plib/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= plib
PORTVERSION= 1.8.5
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= http://plib.sourceforge.net/dist/

47
x11-toolkits/plib/files/patch-src__js__jsBSD.cxx Normal file
View file

@ -0,0 +1,47 @@
--- ./src/js/jsBSD.cxx.orig 2014-07-21 15:11:30.000000000 +0200
+++ ./src/js/jsBSD.cxx 2014-07-21 15:11:30.000000000 +0200
@@ -99,6 +99,8 @@
// on every read of a USB device
int cache_buttons ;
float cache_axes [ _JS_MAX_AXES ] ;
+ float axes_minimum [ _JS_MAX_AXES ] ;
+ float axes_maximum [ _JS_MAX_AXES ] ;
};
// Idents lower than USB_IDENT_OFFSET are for analog joysticks.
@@ -196,9 +198,12 @@
case HUG_Z:
case HUG_RZ:
case HUG_SLIDER:
+ case HUG_DIAL:
if (*num_axes < _JS_MAX_AXES)
{
os->axes_usage[*num_axes] = usage;
+ os->axes_minimum[*num_axes] = h.logical_minimum;
+ os->axes_maximum[*num_axes] = h.logical_maximum;
(*num_axes)++;
}
break;
@@ -324,9 +329,6 @@
for ( int i = 0 ; i < _JS_MAX_AXES ; i++ )
{
- // We really should get this from the HID, but that data seems
- // to be quite unreliable for analog-to-USB converters. Punt for
- // now.
if ( os->axes_usage [ i ] == HUG_HAT_SWITCH )
{
max [ i ] = 1.0f ;
@@ -335,9 +337,9 @@
}
else
{
- max [ i ] = 255.0f ;
- center [ i ] = 127.0f ;
- min [ i ] = 0.0f ;
+ max [ i ] = os->axes_maximum [ i ];
+ min [ i ] = os->axes_minimum [ i ];
+ center [ i ] = (max [ i ] + min [ i ]) / 2.0 ;
}
dead_band [ i ] = 0.0f ;
saturate [ i ] = 1.0f ;