Commit db0a2025c3de0e4dc7987d957eb12999ac3557ef
2020-12-12T23:48:02
Fixed bug 5241 - SDL on Linux needs a way to turn deadzones off pj5085 It occurred to me that my simple patch that comments out a few lines of code does not correctly remove the dead zone since the calculation presumably assumes the dead zone has been cut out of the range. Then, while looking into how to make it output the correct range of values, I realized SDL wasn't returning the correct range of values to begin with. This line of code was already present: printf("Values = { %d, %d, %d, %d, %d }\n", absinfo.value, absinfo.minimum, absinfo.maximum, absinfo.fuzz, absinfo.flat); For my joystick this yeilds: Values = { 0, -127, 127, 0, 15 } Then this code calculates the coefficients: In SDL1: joystick->hwdata->abs_correct[i].coef[0] = (absinfo.maximum + absinfo.minimum) / 2 - absinfo.flat; joystick->hwdata->abs_correct[i].coef[1] = (absinfo.maximum + absinfo.minimum) / 2 + absinfo.flat; t = ((absinfo.maximum - absinfo.minimum) / 2 - 2 * absinfo.flat); if ( t != 0 ) { joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t; } else { joystick->hwdata->abs_correct[i].coef[2] = 0; } In SDL2: joystick->hwdata->abs_correct[i].coef[0] = (absinfo.maximum + absinfo.minimum) - 2 * absinfo.flat; joystick->hwdata->abs_correct[i].coef[1] = (absinfo.maximum + absinfo.minimum) + 2 * absinfo.flat; t = ((absinfo.maximum - absinfo.minimum) - 4 * absinfo.flat); if (t != 0) { joystick->hwdata->abs_correct[i].coef[2] = (1 << 28) / t; } else { joystick->hwdata->abs_correct[i].coef[2] = 0; } Neither calculates the correct coefficients for the code in the AxisCorrect function. In SDL1: if ( value > correct->coef[0] ) { if ( value < correct->coef[1] ) { return 0; } value -= correct->coef[1]; } else { value -= correct->coef[0]; } value *= correct->coef[2]; value >>= 14; In SDL2: value *= 2; if (value > correct->coef[0]) { if (value < correct->coef[1]) { return 0; } value -= correct->coef[1]; } else { value -= correct->coef[0]; } In SDL1, the calculated coefficients are coef[0]=15, coef[1]=-15 and coef[2]=5534751. So with a full-scale input of 127, it calculates an output value of 37835, which is considerably out of range. In SDL2, the calculated coefficients are coef[0]=30, coef[1]=-30, and coef[2]=1383687. So with a full-scale input of 127, it calculates the same output value of 37835. I tested it with the 3 joysticks I have, and it produces out-of-range values for all of them. Anyway, since dead zones are garbage, I just deleted all of that junk and wrote some code that takes the absinfo.minimum and absinfo.maximum values and uses them to scale the axis range to -32767 through +32767. I also made it detect when a range doesn't have an integer center point, e.g. the center of -128 to + 127 is -0.5. In such cases, if either value to the side of the center is provided, it zeros it, but it otherwise doesn't implement any kind of dead zone. This seemed important with my gamepad which provides only the values of 0, 127, and 255, since without this hack it would never be centered. Also, the previous minimum output value was -32768, but as that creates an output range that has no true center, I changed the minimum value to -32767. I tested it with the 3 joystick devices I have and it seems to create correct values for all of them.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index c2ddaaf..eefe381 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -828,6 +828,7 @@ ConfigJoystick(SDL_Joystick *joystick, int fd)
unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
unsigned long relbit[NBITS(REL_MAX)] = { 0 };
unsigned long ffbit[NBITS(FF_MAX)] = { 0 };
+ SDL_bool use_deadzones = SDL_GetHintBoolean(SDL_HINT_LINUX_JOYSTICK_DEADZONES, SDL_FALSE);
/* See if this device uses the new unified event API */
if ((ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) >= 0) &&
@@ -863,7 +864,7 @@ ConfigJoystick(SDL_Joystick *joystick, int fd)
}
if (test_bit(i, absbit)) {
struct input_absinfo absinfo;
- SDL_bool hint_used = SDL_GetHintBoolean(SDL_HINT_LINUX_JOYSTICK_DEADZONES, SDL_TRUE);
+ struct axis_correct *correct = &joystick->hwdata->abs_correct[i];
if (ioctl(fd, EVIOCGABS(i), &absinfo) < 0) {
continue;
@@ -876,20 +877,25 @@ ConfigJoystick(SDL_Joystick *joystick, int fd)
#endif /* DEBUG_INPUT_EVENTS */
joystick->hwdata->abs_map[i] = joystick->naxes;
joystick->hwdata->has_abs[i] = SDL_TRUE;
- if (absinfo.minimum == absinfo.maximum) {
- joystick->hwdata->abs_correct[i].used = 0;
- } else {
- joystick->hwdata->abs_correct[i].used = hint_used;
- joystick->hwdata->abs_correct[i].coef[0] =
- (absinfo.maximum + absinfo.minimum) - 2 * absinfo.flat;
- joystick->hwdata->abs_correct[i].coef[1] =
- (absinfo.maximum + absinfo.minimum) + 2 * absinfo.flat;
- t = ((absinfo.maximum - absinfo.minimum) - 4 * absinfo.flat);
- if (t != 0) {
- joystick->hwdata->abs_correct[i].coef[2] =
- (1 << 28) / t;
+
+ correct->minimum = absinfo.minimum;
+ correct->maximum = absinfo.maximum;
+ if (correct->minimum != correct->maximum) {
+ if (use_deadzones) {
+ correct->use_deadzones = SDL_TRUE;
+ correct->coef[0] = (absinfo.maximum + absinfo.minimum) - 2 * absinfo.flat;
+ correct->coef[1] = (absinfo.maximum + absinfo.minimum) + 2 * absinfo.flat;
+ t = ((absinfo.maximum - absinfo.minimum) - 4 * absinfo.flat);
+ if (t != 0) {
+ correct->coef[2] = (1 << 28) / t;
+ } else {
+ correct->coef[2] = 0;
+ }
} else {
- joystick->hwdata->abs_correct[i].coef[2] = 0;
+ float value_range = (correct->maximum - correct->minimum);
+ float output_range = (SDL_JOYSTICK_AXIS_MAX - SDL_JOYSTICK_AXIS_MIN);
+
+ correct->scale = (output_range / value_range);
}
}
++joystick->naxes;
@@ -1109,26 +1115,53 @@ AxisCorrect(SDL_Joystick *joystick, int which, int value)
struct axis_correct *correct;
correct = &joystick->hwdata->abs_correct[which];
- if (correct->used) {
- value *= 2;
- if (value > correct->coef[0]) {
- if (value < correct->coef[1]) {
- return 0;
+ if (correct->minimum != correct->maximum) {
+ if (correct->use_deadzones) {
+ value *= 2;
+ if (value > correct->coef[0]) {
+ if (value < correct->coef[1]) {
+ return 0;
+ }
+ value -= correct->coef[1];
+ } else {
+ value -= correct->coef[0];
}
- value -= correct->coef[1];
+ value *= correct->coef[2];
+ value >>= 13;
} else {
- value -= correct->coef[0];
+ int new_value = (int)SDL_floorf((value - correct->minimum) * correct->scale + SDL_JOYSTICK_AXIS_MIN + 0.5f);
+
+ /* At least one gamepad has a minimum of 0 and a maximum is 255,
+ * which makes it's center point a non-integer, 127.5. Thus it
+ * must report either 127 or 128, neither of which is center.
+
+ * At least one analog controller with the same range returns 128
+ * easily when at center, but seems completely incapable of
+ * returning 127 no matter how carefully the stick is moved.
+
+ * So here we detect if the axis' range does not have a center
+ * point, and if so, and if the reported position is on either
+ * side of center, we report that it is actually at the center.
+ */
+ if ((correct->maximum - correct->minimum) & 1) {
+ int lower_center = (correct->maximum - correct->minimum - 1) / 2;
+ int higher_center = (correct->maximum - correct->minimum + 1) / 2;
+ if (value == lower_center || value == higher_center) {
+ new_value = 0;
+ }
+ }
+
+ value = new_value;
}
- value *= correct->coef[2];
- value >>= 13;
}
/* Clamp and return */
- if (value < -32768)
- return -32768;
- if (value > 32767)
- return 32767;
-
+ if (value < SDL_JOYSTICK_AXIS_MIN) {
+ return SDL_JOYSTICK_AXIS_MIN;
+ }
+ if (value > SDL_JOYSTICK_AXIS_MAX) {
+ return SDL_JOYSTICK_AXIS_MAX;
+ }
return value;
}
diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h
index bcbc255..dea9405 100644
--- a/src/joystick/linux/SDL_sysjoystick_c.h
+++ b/src/joystick/linux/SDL_sysjoystick_c.h
@@ -58,8 +58,15 @@ struct joystick_hwdata
struct axis_correct
{
- int used;
+ SDL_bool use_deadzones;
+
+ /* Deadzone coefficients */
int coef[3];
+
+ /* Raw coordinate scale */
+ int minimum;
+ int maximum;
+ float scale;
} abs_correct[ABS_MAX];
SDL_bool fresh;