Android: Don't use square stick calibration

This essentially reverts d9c78d5. Thanks to the previous commit,
the touch controls issue which was fixed by d9c78d5 is still fixed.
The behavior for gamepads is reverted, bringing back the ability
to run diagonally in games that had trouble with it after d9c78d5.
This commit is contained in:
JosJuice 2020-06-28 23:39:26 +02:00
parent db75509ec5
commit f8e0ececb9
4 changed files with 1 additions and 77 deletions

View File

@ -14,14 +14,10 @@ Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12` Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13` Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14` Main Stick/Right = `Axis 14`
Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Main Stick/Center = 0,00 0,00
C-Stick/Up = `Axis 16` C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17` C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18` C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19` C-Stick/Right = `Axis 19`
C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
C-Stick/Center = 0,00 0,00
Triggers/L = `Axis 20` Triggers/L = `Axis 20`
Triggers/R = `Axis 21` Triggers/R = `Axis 21`
Triggers/L-Analog = `Axis 20` Triggers/L-Analog = `Axis 20`
@ -44,14 +40,10 @@ Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12` Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13` Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14` Main Stick/Right = `Axis 14`
Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Main Stick/Center = 0,00 0,00
C-Stick/Up = `Axis 16` C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17` C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18` C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19` C-Stick/Right = `Axis 19`
C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
C-Stick/Center = 0,00 0,00
Triggers/L = `Axis 20` Triggers/L = `Axis 20`
Triggers/R = `Axis 21` Triggers/R = `Axis 21`
Triggers/L-Analog = `Axis 20` Triggers/L-Analog = `Axis 20`
@ -74,14 +66,10 @@ Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12` Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13` Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14` Main Stick/Right = `Axis 14`
Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Main Stick/Center = 0,00 0,00
C-Stick/Up = `Axis 16` C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17` C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18` C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19` C-Stick/Right = `Axis 19`
C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
C-Stick/Center = 0,00 0,00
Triggers/L = `Axis 20` Triggers/L = `Axis 20`
Triggers/R = `Axis 21` Triggers/R = `Axis 21`
Triggers/L-Analog = `Axis 20` Triggers/L-Analog = `Axis 20`
@ -104,14 +92,10 @@ Main Stick/Up = `Axis 11`
Main Stick/Down = `Axis 12` Main Stick/Down = `Axis 12`
Main Stick/Left = `Axis 13` Main Stick/Left = `Axis 13`
Main Stick/Right = `Axis 14` Main Stick/Right = `Axis 14`
Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Main Stick/Center = 0,00 0,00
C-Stick/Up = `Axis 16` C-Stick/Up = `Axis 16`
C-Stick/Down = `Axis 17` C-Stick/Down = `Axis 17`
C-Stick/Left = `Axis 18` C-Stick/Left = `Axis 18`
C-Stick/Right = `Axis 19` C-Stick/Right = `Axis 19`
C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
C-Stick/Center = 0,00 0,00
Triggers/L = `Axis 20` Triggers/L = `Axis 20`
Triggers/R = `Axis 21` Triggers/R = `Axis 21`
Triggers/L-Analog = `Axis 20` Triggers/L-Analog = `Axis 20`

View File

@ -43,8 +43,6 @@ Nunchuk/Stick/Up = `Axis 203`
Nunchuk/Stick/Down = `Axis 204` Nunchuk/Stick/Down = `Axis 204`
Nunchuk/Stick/Left = `Axis 205` Nunchuk/Stick/Left = `Axis 205`
Nunchuk/Stick/Right = `Axis 206` Nunchuk/Stick/Right = `Axis 206`
Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Nunchuk/Stick/Center = 0,00 0,00
Nunchuk/Swing/Up = `Axis 208` Nunchuk/Swing/Up = `Axis 208`
Nunchuk/Swing/Down = `Axis 209` Nunchuk/Swing/Down = `Axis 209`
Nunchuk/Swing/Left = `Axis 210` Nunchuk/Swing/Left = `Axis 210`
@ -77,14 +75,10 @@ Classic/Left Stick/Up = `Axis 314`
Classic/Left Stick/Down = `Axis 315` Classic/Left Stick/Down = `Axis 315`
Classic/Left Stick/Left = `Axis 316` Classic/Left Stick/Left = `Axis 316`
Classic/Left Stick/Right = `Axis 317` Classic/Left Stick/Right = `Axis 317`
Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Left Stick/Center = 0,00 0,00
Classic/Right Stick/Up = `Axis 319` Classic/Right Stick/Up = `Axis 319`
Classic/Right Stick/Down = `Axis 320` Classic/Right Stick/Down = `Axis 320`
Classic/Right Stick/Left = `Axis 321` Classic/Right Stick/Left = `Axis 321`
Classic/Right Stick/Right = `Axis 322` Classic/Right Stick/Right = `Axis 322`
Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Right Stick/Center = 0,00 0,00
Classic/Triggers/L = `Axis 323` Classic/Triggers/L = `Axis 323`
Classic/Triggers/R = `Axis 324` Classic/Triggers/R = `Axis 324`
Classic/Triggers/Threshold = 90,000000 Classic/Triggers/Threshold = 90,000000
@ -101,8 +95,6 @@ Guitar/Stick/Up = `Axis 410`
Guitar/Stick/Down = `Axis 411` Guitar/Stick/Down = `Axis 411`
Guitar/Stick/Left = `Axis 412` Guitar/Stick/Left = `Axis 412`
Guitar/Stick/Right = `Axis 413` Guitar/Stick/Right = `Axis 413`
Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Guitar/Stick/Center = 0,00 0,00
Guitar/Whammy/Bar = `Axis 414` Guitar/Whammy/Bar = `Axis 414`
Drums/Buttons/- = `Button 500` Drums/Buttons/- = `Button 500`
Drums/Buttons/+ = `Button 501` Drums/Buttons/+ = `Button 501`
@ -116,8 +108,6 @@ Drums/Stick/Up = `Axis 509`
Drums/Stick/Down = `Axis 510` Drums/Stick/Down = `Axis 510`
Drums/Stick/Left = `Axis 511` Drums/Stick/Left = `Axis 511`
Drums/Stick/Right = `Axis 512` Drums/Stick/Right = `Axis 512`
Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Drums/Stick/Center = 0,00 0,00
Turntable/Buttons/Green Left = `Button 600` Turntable/Buttons/Green Left = `Button 600`
Turntable/Buttons/Red Left = `Button 601` Turntable/Buttons/Red Left = `Button 601`
Turntable/Buttons/Blue Left = `Button 602` Turntable/Buttons/Blue Left = `Button 602`
@ -136,8 +126,6 @@ Turntable/Stick/Up = `Axis 617`
Turntable/Stick/Down = `Axis 618` Turntable/Stick/Down = `Axis 618`
Turntable/Stick/Left = `Axis 619` Turntable/Stick/Left = `Axis 619`
Turntable/Stick/Right = `Axis 620` Turntable/Stick/Right = `Axis 620`
Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Turntable/Stick/Center = 0,00 0,00
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`
@ -200,8 +188,6 @@ Nunchuk/Stick/Up = `Axis 203`
Nunchuk/Stick/Down = `Axis 204` Nunchuk/Stick/Down = `Axis 204`
Nunchuk/Stick/Left = `Axis 205` Nunchuk/Stick/Left = `Axis 205`
Nunchuk/Stick/Right = `Axis 206` Nunchuk/Stick/Right = `Axis 206`
Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Nunchuk/Stick/Center = 0,00 0,00
Nunchuk/Swing/Up = `Axis 208` Nunchuk/Swing/Up = `Axis 208`
Nunchuk/Swing/Down = `Axis 209` Nunchuk/Swing/Down = `Axis 209`
Nunchuk/Swing/Left = `Axis 210` Nunchuk/Swing/Left = `Axis 210`
@ -234,14 +220,10 @@ Classic/Left Stick/Up = `Axis 314`
Classic/Left Stick/Down = `Axis 315` Classic/Left Stick/Down = `Axis 315`
Classic/Left Stick/Left = `Axis 316` Classic/Left Stick/Left = `Axis 316`
Classic/Left Stick/Right = `Axis 317` Classic/Left Stick/Right = `Axis 317`
Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Left Stick/Center = 0,00 0,00
Classic/Right Stick/Up = `Axis 319` Classic/Right Stick/Up = `Axis 319`
Classic/Right Stick/Down = `Axis 320` Classic/Right Stick/Down = `Axis 320`
Classic/Right Stick/Left = `Axis 321` Classic/Right Stick/Left = `Axis 321`
Classic/Right Stick/Right = `Axis 322` Classic/Right Stick/Right = `Axis 322`
Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Right Stick/Center = 0,00 0,00
Classic/Triggers/L = `Axis 323` Classic/Triggers/L = `Axis 323`
Classic/Triggers/R = `Axis 324` Classic/Triggers/R = `Axis 324`
Classic/Triggers/Threshold = 90,000000 Classic/Triggers/Threshold = 90,000000
@ -258,8 +240,6 @@ Guitar/Stick/Up = `Axis 410`
Guitar/Stick/Down = `Axis 411` Guitar/Stick/Down = `Axis 411`
Guitar/Stick/Left = `Axis 412` Guitar/Stick/Left = `Axis 412`
Guitar/Stick/Right = `Axis 413` Guitar/Stick/Right = `Axis 413`
Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Guitar/Stick/Center = 0,00 0,00
Guitar/Whammy/Bar = `Axis 414` Guitar/Whammy/Bar = `Axis 414`
Drums/Buttons/- = `Button 500` Drums/Buttons/- = `Button 500`
Drums/Buttons/+ = `Button 501` Drums/Buttons/+ = `Button 501`
@ -273,8 +253,6 @@ Drums/Stick/Up = `Axis 509`
Drums/Stick/Down = `Axis 510` Drums/Stick/Down = `Axis 510`
Drums/Stick/Left = `Axis 511` Drums/Stick/Left = `Axis 511`
Drums/Stick/Right = `Axis 512` Drums/Stick/Right = `Axis 512`
Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Drums/Stick/Center = 0,00 0,00
Turntable/Buttons/Green Left = `Button 600` Turntable/Buttons/Green Left = `Button 600`
Turntable/Buttons/Red Left = `Button 601` Turntable/Buttons/Red Left = `Button 601`
Turntable/Buttons/Blue Left = `Button 602` Turntable/Buttons/Blue Left = `Button 602`
@ -293,8 +271,6 @@ Turntable/Stick/Up = `Axis 617`
Turntable/Stick/Down = `Axis 618` Turntable/Stick/Down = `Axis 618`
Turntable/Stick/Left = `Axis 619` Turntable/Stick/Left = `Axis 619`
Turntable/Stick/Right = `Axis 620` Turntable/Stick/Right = `Axis 620`
Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Turntable/Stick/Center = 0,00 0,00
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`
@ -357,8 +333,6 @@ Nunchuk/Stick/Up = `Axis 203`
Nunchuk/Stick/Down = `Axis 204` Nunchuk/Stick/Down = `Axis 204`
Nunchuk/Stick/Left = `Axis 205` Nunchuk/Stick/Left = `Axis 205`
Nunchuk/Stick/Right = `Axis 206` Nunchuk/Stick/Right = `Axis 206`
Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Nunchuk/Stick/Center = 0,00 0,00
Nunchuk/Swing/Up = `Axis 208` Nunchuk/Swing/Up = `Axis 208`
Nunchuk/Swing/Down = `Axis 209` Nunchuk/Swing/Down = `Axis 209`
Nunchuk/Swing/Left = `Axis 210` Nunchuk/Swing/Left = `Axis 210`
@ -391,14 +365,10 @@ Classic/Left Stick/Up = `Axis 314`
Classic/Left Stick/Down = `Axis 315` Classic/Left Stick/Down = `Axis 315`
Classic/Left Stick/Left = `Axis 316` Classic/Left Stick/Left = `Axis 316`
Classic/Left Stick/Right = `Axis 317` Classic/Left Stick/Right = `Axis 317`
Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Left Stick/Center = 0,00 0,00
Classic/Right Stick/Up = `Axis 319` Classic/Right Stick/Up = `Axis 319`
Classic/Right Stick/Down = `Axis 320` Classic/Right Stick/Down = `Axis 320`
Classic/Right Stick/Left = `Axis 321` Classic/Right Stick/Left = `Axis 321`
Classic/Right Stick/Right = `Axis 322` Classic/Right Stick/Right = `Axis 322`
Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Right Stick/Center = 0,00 0,00
Classic/Triggers/L = `Axis 323` Classic/Triggers/L = `Axis 323`
Classic/Triggers/R = `Axis 324` Classic/Triggers/R = `Axis 324`
Classic/Triggers/Threshold = 90,000000 Classic/Triggers/Threshold = 90,000000
@ -415,8 +385,6 @@ Guitar/Stick/Up = `Axis 410`
Guitar/Stick/Down = `Axis 411` Guitar/Stick/Down = `Axis 411`
Guitar/Stick/Left = `Axis 412` Guitar/Stick/Left = `Axis 412`
Guitar/Stick/Right = `Axis 413` Guitar/Stick/Right = `Axis 413`
Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Guitar/Stick/Center = 0,00 0,00
Guitar/Whammy/Bar = `Axis 414` Guitar/Whammy/Bar = `Axis 414`
Drums/Buttons/- = `Button 500` Drums/Buttons/- = `Button 500`
Drums/Buttons/+ = `Button 501` Drums/Buttons/+ = `Button 501`
@ -430,8 +398,6 @@ Drums/Stick/Up = `Axis 509`
Drums/Stick/Down = `Axis 510` Drums/Stick/Down = `Axis 510`
Drums/Stick/Left = `Axis 511` Drums/Stick/Left = `Axis 511`
Drums/Stick/Right = `Axis 512` Drums/Stick/Right = `Axis 512`
Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Drums/Stick/Center = 0,00 0,00
Turntable/Buttons/Green Left = `Button 600` Turntable/Buttons/Green Left = `Button 600`
Turntable/Buttons/Red Left = `Button 601` Turntable/Buttons/Red Left = `Button 601`
Turntable/Buttons/Blue Left = `Button 602` Turntable/Buttons/Blue Left = `Button 602`
@ -450,8 +416,6 @@ Turntable/Stick/Up = `Axis 617`
Turntable/Stick/Down = `Axis 618` Turntable/Stick/Down = `Axis 618`
Turntable/Stick/Left = `Axis 619` Turntable/Stick/Left = `Axis 619`
Turntable/Stick/Right = `Axis 620` Turntable/Stick/Right = `Axis 620`
Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Turntable/Stick/Center = 0,00 0,00
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`
@ -514,8 +478,6 @@ Nunchuk/Stick/Up = `Axis 203`
Nunchuk/Stick/Down = `Axis 204` Nunchuk/Stick/Down = `Axis 204`
Nunchuk/Stick/Left = `Axis 205` Nunchuk/Stick/Left = `Axis 205`
Nunchuk/Stick/Right = `Axis 206` Nunchuk/Stick/Right = `Axis 206`
Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Nunchuk/Stick/Center = 0,00 0,00
Nunchuk/Swing/Up = `Axis 208` Nunchuk/Swing/Up = `Axis 208`
Nunchuk/Swing/Down = `Axis 209` Nunchuk/Swing/Down = `Axis 209`
Nunchuk/Swing/Left = `Axis 210` Nunchuk/Swing/Left = `Axis 210`
@ -548,14 +510,10 @@ Classic/Left Stick/Up = `Axis 314`
Classic/Left Stick/Down = `Axis 315` Classic/Left Stick/Down = `Axis 315`
Classic/Left Stick/Left = `Axis 316` Classic/Left Stick/Left = `Axis 316`
Classic/Left Stick/Right = `Axis 317` Classic/Left Stick/Right = `Axis 317`
Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Left Stick/Center = 0,00 0,00
Classic/Right Stick/Up = `Axis 319` Classic/Right Stick/Up = `Axis 319`
Classic/Right Stick/Down = `Axis 320` Classic/Right Stick/Down = `Axis 320`
Classic/Right Stick/Left = `Axis 321` Classic/Right Stick/Left = `Axis 321`
Classic/Right Stick/Right = `Axis 322` Classic/Right Stick/Right = `Axis 322`
Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Right Stick/Center = 0,00 0,00
Classic/Triggers/L = `Axis 323` Classic/Triggers/L = `Axis 323`
Classic/Triggers/R = `Axis 324` Classic/Triggers/R = `Axis 324`
Classic/Triggers/Threshold = 90,000000 Classic/Triggers/Threshold = 90,000000
@ -572,8 +530,6 @@ Guitar/Stick/Up = `Axis 410`
Guitar/Stick/Down = `Axis 411` Guitar/Stick/Down = `Axis 411`
Guitar/Stick/Left = `Axis 412` Guitar/Stick/Left = `Axis 412`
Guitar/Stick/Right = `Axis 413` Guitar/Stick/Right = `Axis 413`
Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Guitar/Stick/Center = 0,00 0,00
Guitar/Whammy/Bar = `Axis 414` Guitar/Whammy/Bar = `Axis 414`
Drums/Buttons/- = `Button 500` Drums/Buttons/- = `Button 500`
Drums/Buttons/+ = `Button 501` Drums/Buttons/+ = `Button 501`
@ -587,8 +543,6 @@ Drums/Stick/Up = `Axis 509`
Drums/Stick/Down = `Axis 510` Drums/Stick/Down = `Axis 510`
Drums/Stick/Left = `Axis 511` Drums/Stick/Left = `Axis 511`
Drums/Stick/Right = `Axis 512` Drums/Stick/Right = `Axis 512`
Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Drums/Stick/Center = 0,00 0,00
Turntable/Buttons/Green Left = `Button 600` Turntable/Buttons/Green Left = `Button 600`
Turntable/Buttons/Red Left = `Button 601` Turntable/Buttons/Red Left = `Button 601`
Turntable/Buttons/Blue Left = `Button 602` Turntable/Buttons/Blue Left = `Button 602`
@ -607,8 +561,6 @@ Turntable/Stick/Up = `Axis 617`
Turntable/Stick/Down = `Axis 618` Turntable/Stick/Down = `Axis 618`
Turntable/Stick/Left = `Axis 619` Turntable/Stick/Left = `Axis 619`
Turntable/Stick/Right = `Axis 620` Turntable/Stick/Right = `Axis 620`
Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Turntable/Stick/Center = 0,00 0,00
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`

View File

@ -43,8 +43,6 @@ Nunchuk/Stick/Up = `Axis 203`
Nunchuk/Stick/Down = `Axis 204` Nunchuk/Stick/Down = `Axis 204`
Nunchuk/Stick/Left = `Axis 205` Nunchuk/Stick/Left = `Axis 205`
Nunchuk/Stick/Right = `Axis 206` Nunchuk/Stick/Right = `Axis 206`
Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Nunchuk/Stick/Center = 0,00 0,00
Nunchuk/Swing/Up = `Axis 208` Nunchuk/Swing/Up = `Axis 208`
Nunchuk/Swing/Down = `Axis 209` Nunchuk/Swing/Down = `Axis 209`
Nunchuk/Swing/Left = `Axis 210` Nunchuk/Swing/Left = `Axis 210`
@ -77,14 +75,10 @@ Classic/Left Stick/Up = `Axis 314`
Classic/Left Stick/Down = `Axis 315` Classic/Left Stick/Down = `Axis 315`
Classic/Left Stick/Left = `Axis 316` Classic/Left Stick/Left = `Axis 316`
Classic/Left Stick/Right = `Axis 317` Classic/Left Stick/Right = `Axis 317`
Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Left Stick/Center = 0,00 0,00
Classic/Right Stick/Up = `Axis 319` Classic/Right Stick/Up = `Axis 319`
Classic/Right Stick/Down = `Axis 320` Classic/Right Stick/Down = `Axis 320`
Classic/Right Stick/Left = `Axis 321` Classic/Right Stick/Left = `Axis 321`
Classic/Right Stick/Right = `Axis 322` Classic/Right Stick/Right = `Axis 322`
Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Classic/Right Stick/Center = 0,00 0,00
Classic/Triggers/L = `Axis 323` Classic/Triggers/L = `Axis 323`
Classic/Triggers/R = `Axis 324` Classic/Triggers/R = `Axis 324`
Classic/Triggers/Threshold = 90,000000 Classic/Triggers/Threshold = 90,000000
@ -101,8 +95,6 @@ Guitar/Stick/Up = `Axis 410`
Guitar/Stick/Down = `Axis 411` Guitar/Stick/Down = `Axis 411`
Guitar/Stick/Left = `Axis 412` Guitar/Stick/Left = `Axis 412`
Guitar/Stick/Right = `Axis 413` Guitar/Stick/Right = `Axis 413`
Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Guitar/Stick/Center = 0,00 0,00
Guitar/Whammy/Bar = `Axis 414` Guitar/Whammy/Bar = `Axis 414`
Drums/Buttons/- = `Button 500` Drums/Buttons/- = `Button 500`
Drums/Buttons/+ = `Button 501` Drums/Buttons/+ = `Button 501`
@ -116,8 +108,6 @@ Drums/Stick/Up = `Axis 509`
Drums/Stick/Down = `Axis 510` Drums/Stick/Down = `Axis 510`
Drums/Stick/Left = `Axis 511` Drums/Stick/Left = `Axis 511`
Drums/Stick/Right = `Axis 512` Drums/Stick/Right = `Axis 512`
Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Drums/Stick/Center = 0,00 0,00
Turntable/Buttons/Green Left = `Button 600` Turntable/Buttons/Green Left = `Button 600`
Turntable/Buttons/Red Left = `Button 601` Turntable/Buttons/Red Left = `Button 601`
Turntable/Buttons/Blue Left = `Button 602` Turntable/Buttons/Blue Left = `Button 602`
@ -136,8 +126,6 @@ Turntable/Stick/Up = `Axis 617`
Turntable/Stick/Down = `Axis 618` Turntable/Stick/Down = `Axis 618`
Turntable/Stick/Left = `Axis 619` Turntable/Stick/Left = `Axis 619`
Turntable/Stick/Right = `Axis 620` Turntable/Stick/Right = `Axis 620`
Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
Turntable/Stick/Center = 0,00 0,00
Turntable/Effect/Dial = `Axis 621` Turntable/Effect/Dial = `Axis 621`
Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Left = `Axis 623`
Turntable/Crossfade/Right = `Axis 624` Turntable/Crossfade/Right = `Axis 624`

View File

@ -35,7 +35,7 @@ public final class DirectoryInitialization
"org.dolphinemu.dolphinemu.DIRECTORY_INITIALIZATION"; "org.dolphinemu.dolphinemu.DIRECTORY_INITIALIZATION";
public static final String EXTRA_STATE = "directoryState"; public static final String EXTRA_STATE = "directoryState";
private static final int WiimoteNewVersion = 4; // Last changed in PR 8503 private static final int WiimoteNewVersion = 5; // Last changed in PR 8907
private static volatile DirectoryInitializationState directoryState = null; private static volatile DirectoryInitializationState directoryState = null;
private static String userPath; private static String userPath;
private static String internalPath; private static String internalPath;