diff --git a/Source/Android/app/src/main/assets/GCPadNew.ini b/Source/Android/app/src/main/assets/GCPadNew.ini index cdd12f148e..393fe930b0 100644 --- a/Source/Android/app/src/main/assets/GCPadNew.ini +++ b/Source/Android/app/src/main/assets/GCPadNew.ini @@ -2,103 +2,99 @@ Device = Android/0/Touchscreen Buttons/A = `Button 0` Buttons/B = `Button 1` +Buttons/Start = `Button 2` Buttons/X = `Button 3` Buttons/Y = `Button 4` Buttons/Z = `Button 5` -Buttons/Start = `Button 2` -Main Stick/Up = `Axis 11` -Main Stick/Down = `Axis 12` -Main Stick/Left = `Axis 13` -Main Stick/Right = `Axis 14` -Main Stick/Modifier = Shift_L -Main Stick/Modifier/Range = 50.000000 -C-Stick/Up = `Axis 16` -C-Stick/Down = `Axis 17` -C-Stick/Left = `Axis 18` -C-Stick/Right = `Axis 19` -C-Stick/Modifier = Control_L -C-Stick/Modifier/Range = 50.000000 -Triggers/L = `Axis 20` -Triggers/R = `Axis 21` D-Pad/Up = `Button 6` D-Pad/Down = `Button 7` D-Pad/Left = `Button 8` D-Pad/Right = `Button 9` +Main Stick/Up = `Axis 11` +Main Stick/Down = `Axis 12` +Main Stick/Left = `Axis 13` +Main Stick/Right = `Axis 14` +Main Stick/Radius = 100,000000 +C-Stick/Up = `Axis 16` +C-Stick/Down = `Axis 17` +C-Stick/Left = `Axis 18` +C-Stick/Right = `Axis 19` +C-Stick/Radius = 100,000000 +Triggers/L = `Axis 20` +Triggers/R = `Axis 21` +Triggers/Threshold = 90,000000 [GCPad2] Device = Android/1/Touchscreen Buttons/A = `Button 0` Buttons/B = `Button 1` +Buttons/Start = `Button 2` Buttons/X = `Button 3` Buttons/Y = `Button 4` Buttons/Z = `Button 5` -Buttons/Start = `Button 2` -Main Stick/Up = `Axis 11` -Main Stick/Down = `Axis 12` -Main Stick/Left = `Axis 13` -Main Stick/Right = `Axis 14` -Main Stick/Modifier = Shift_L -Main Stick/Modifier/Range = 50.000000 -C-Stick/Up = `Axis 16` -C-Stick/Down = `Axis 17` -C-Stick/Left = `Axis 18` -C-Stick/Right = `Axis 19` -C-Stick/Modifier = Control_L -C-Stick/Modifier/Range = 50.000000 -Triggers/L = `Axis 20` -Triggers/R = `Axis 21` D-Pad/Up = `Button 6` D-Pad/Down = `Button 7` D-Pad/Left = `Button 8` D-Pad/Right = `Button 9` +Main Stick/Up = `Axis 11` +Main Stick/Down = `Axis 12` +Main Stick/Left = `Axis 13` +Main Stick/Right = `Axis 14` +Main Stick/Radius = 100,000000 +C-Stick/Up = `Axis 16` +C-Stick/Down = `Axis 17` +C-Stick/Left = `Axis 18` +C-Stick/Right = `Axis 19` +C-Stick/Radius = 100,000000 +Triggers/L = `Axis 20` +Triggers/R = `Axis 21` +Triggers/Threshold = 90,000000 [GCPad3] Device = Android/2/Touchscreen Buttons/A = `Button 0` Buttons/B = `Button 1` +Buttons/Start = `Button 2` Buttons/X = `Button 3` Buttons/Y = `Button 4` Buttons/Z = `Button 5` -Buttons/Start = `Button 2` -Main Stick/Up = `Axis 11` -Main Stick/Down = `Axis 12` -Main Stick/Left = `Axis 13` -Main Stick/Right = `Axis 14` -Main Stick/Modifier = Shift_L -Main Stick/Modifier/Range = 50.000000 -C-Stick/Up = `Axis 16` -C-Stick/Down = `Axis 17` -C-Stick/Left = `Axis 18` -C-Stick/Right = `Axis 19` -C-Stick/Modifier = Control_L -C-Stick/Modifier/Range = 50.000000 -Triggers/L = `Axis 20` -Triggers/R = `Axis 21` D-Pad/Up = `Button 6` D-Pad/Down = `Button 7` D-Pad/Left = `Button 8` D-Pad/Right = `Button 9` -[GCPad4] -Device = Android/3/Touchscreen -Buttons/A = `Button 0` -Buttons/B = `Button 1` -Buttons/X = `Button 3` -Buttons/Y = `Button 4` -Buttons/Z = `Button 5` -Buttons/Start = `Button 2` Main Stick/Up = `Axis 11` Main Stick/Down = `Axis 12` Main Stick/Left = `Axis 13` Main Stick/Right = `Axis 14` -Main Stick/Modifier = Shift_L -Main Stick/Modifier/Range = 50.000000 +Main Stick/Radius = 100,000000 C-Stick/Up = `Axis 16` C-Stick/Down = `Axis 17` C-Stick/Left = `Axis 18` C-Stick/Right = `Axis 19` -C-Stick/Modifier = Control_L -C-Stick/Modifier/Range = 50.000000 +C-Stick/Radius = 100,000000 Triggers/L = `Axis 20` Triggers/R = `Axis 21` +Triggers/Threshold = 90,000000 +[GCPad4] +Device = Android/3/Touchscreen +Buttons/A = `Button 0` +Buttons/B = `Button 1` +Buttons/Start = `Button 2` +Buttons/X = `Button 3` +Buttons/Y = `Button 4` +Buttons/Z = `Button 5` D-Pad/Up = `Button 6` D-Pad/Down = `Button 7` D-Pad/Left = `Button 8` -D-Pad/Right = `Button 9` \ No newline at end of file +D-Pad/Right = `Button 9` +Main Stick/Up = `Axis 11` +Main Stick/Down = `Axis 12` +Main Stick/Left = `Axis 13` +Main Stick/Right = `Axis 14` +Main Stick/Radius = 100,000000 +C-Stick/Up = `Axis 16` +C-Stick/Down = `Axis 17` +C-Stick/Left = `Axis 18` +C-Stick/Right = `Axis 19` +C-Stick/Radius = 100,000000 +Triggers/L = `Axis 20` +Triggers/R = `Axis 21` +Triggers/Threshold = 90,000000 diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini index de39cd4a59..abead1e196 100644 --- a/Source/Android/app/src/main/assets/WiimoteNew.ini +++ b/Source/Android/app/src/main/assets/WiimoteNew.ini @@ -1,540 +1,540 @@ [Wiimote1] Device = Android/4/Touchscreen -Buttons/A = `Button 22` -Buttons/B = `Button 23` -Buttons/1 = `Button 27` -Buttons/2 = `Button 28` -Buttons/- = `Button 24` -Buttons/+ = `Button 25` -Buttons/Home = `Button 26` -D-Pad/Up = `Button 29` -D-Pad/Down = `Button 30` -D-Pad/Left = `Button 31` -D-Pad/Right = `Button 32` -IR/Up = `Axis 33` -IR/Down = `Axis 34` -IR/Left = `Axis 35` -IR/Right = `Axis 36` -IR/Forward = `Axis 37` -IR/Backward = `Axis 38` -IR/Hide = `Button 39` -Swing/Up = `Axis 40` -Swing/Down = `Axis 41` -Swing/Left = `Axis 42` -Swing/Right = `Axis 43` -Swing/Forward = `Axis 44` -Swing/Backward = `Axis 45` -Tilt/Forward = `Axis 46` -Tilt/Backward = `Axis 47` -Tilt/Left = `Axis 48` -Tilt/Right = `Axis 49` -Tilt/Modifier = `Button 50` -Shake/X = `Button 51` -Shake/Y = `Button 52` -Shake/Z = `Button 53` +Buttons/A = `Button 100` +Buttons/B = `Button 101` +Buttons/- = `Button 102` +Buttons/+ = `Button 103` +Buttons/Home = `Button 104` +Buttons/1 = `Button 105` +Buttons/2 = `Button 106` +D-Pad/Up = `Button 107` +D-Pad/Down = `Button 108` +D-Pad/Left = `Button 109` +D-Pad/Right = `Button 110` +IR/Up = `Axis 112` +IR/Down = `Axis 113` +IR/Left = `Axis 114` +IR/Right = `Axis 115` +IR/Forward = `Axis 116` +IR/Backward = `Axis 117` +IR/Hide = `Button 118` +Swing/Up = `Axis 120` +Swing/Down = `Axis 121` +Swing/Left = `Axis 122` +Swing/Right = `Axis 123` +Swing/Forward = `Axis 124` +Swing/Backward = `Axis 125` +Tilt/Forward = `Axis 127` +Tilt/Backward = `Axis 128` +Tilt/Left = `Axis 129` +Tilt/Right = `Axis 130` +Tilt/Modifier = `Button 131` +Tilt/Modifier/Range = 50,000000 +Shake/X = `Button 132` +Shake/Y = `Button 133` +Shake/Z = `Button 134` Extension = None -Nunchuk/Buttons/C = `Button 54` -Nunchuk/Buttons/Z = `Button 55` -Nunchuk/Stick/Up = `Axis 57` -Nunchuk/Stick/Down = `Axis 58` -Nunchuk/Stick/Left = `Axis 59` -Nunchuk/Stick/Right = `Axis 60` -Nunchuk/Stick/Modifier = Shift_R -Nunchuk/Stick/Modifier/Range = 50.000000 -Nunchuk/Swing/Up = `Axis 61` -Nunchuk/Swing/Down = `Axis 62` -Nunchuk/Swing/Left = `Axis 63` -Nunchuk/Swing/Right = `Axis 64` -Nunchuk/Swing/Forward = `Axis 65` -Nunchuk/Swing/Backward = `Axis 66` -Nunchuk/Tilt/Forward = `Axis 67` -Nunchuk/Tilt/Backward = `Axis 68` -Nunchuk/Tilt/Left = `Axis 69` -Nunchuk/Tilt/Right = `Axis 70` -Nunchuk/Tilt/Modifier = `Button 71` -Nunchuk/Shake/X = `Button 72` -Nunchuk/Shake/Y = `Button 73` -Nunchuk/Shake/Z = `Button 74` -Classic/Buttons/A = `Button 75` -Classic/Buttons/B = `Button 76` -Classic/Buttons/X = `Button 77` -Classic/Buttons/Y = `Button 78` -Classic/Buttons/- = `Button 79` -Classic/Buttons/+ = `Button 80` -Classic/Buttons/Home = `Button 81` -Classic/Buttons/ZL = `Button 82` -Classic/Buttons/ZR = `Button 83` -Classic/D-Pad/Up = `Button 84` -Classic/D-Pad/Down = `Button 85` -Classic/D-Pad/Left = `Button 86` -Classic/D-Pad/Right = `Button 87` -Classic/Left Stick/Up = `Axis 89` -Classic/Left Stick/Down = `Axis 90` -Classic/Left Stick/Left = `Axis 91` -Classic/Left Stick/Right = `Axis 92` -Classic/Left Stick/Modifier/Range = 50.000000 -Classic/Right Stick/Up = `Axis 94` -Classic/Right Stick/Down = `Axis 95` -Classic/Right Stick/Left = `Axis 96` -Classic/Right Stick/Right = `Axis 97` -Classic/Right Stick/Modifier/Range = 50.000000 -Classic/Trigger/L = `Axis 98` -Classic/Trigger/L/Modifier/Range = 50.000000 -Classic/Trigger/R = `Axis 99` -Classic/Trigger/R/Modifier/Range = 50.000000 -Guitar/Buttons/- = `Button 100` -Guitar/Buttons/+ = `Button 101` -Guitar/Frets/Green = `Button 102` -Guitar/Frets/Red = `Button 103` -Guitar/Frets/Yellow = `Button 104` -Guitar/Frets/Blue = `Button 105` -Guitar/Frets/Orange = `Button 106` -Guitar/Strum/Up = `Button 107` -Guitar/Strum/Down = `Button 108` -Guitar/Stick/Up = `Axis 110` -Guitar/Stick/Down = `Axis 111` -Guitar/Stick/Left = `Axis 112` -Guitar/Stick/Right = `Axis 113` -Guitar/Stick/Modifier/Range = 50.000000 -Guitar/Whammy/Bar = `Axis = 114` -Drums/Buttons/- = `Button 115` -Drums/Buttons/+ = `Button 116` -Drums/Pads/Red = `Button 117` -Drums/Pads/Yellow = `Button 118` -Drums/Pads/Blue = `Button 119` -Drums/Pads/Green = `Button 120` -Drums/Pads/Orange = `Button 121` -Drums/Pads/Bass = `Button 122` -Drums/Stick/Up = `Axis 124` -Drums/Stick/Down = `Axis 125` -Drums/Stick/Left = `Axis 126` -Drums/Stick/Right = `Axis 127` -Drums/Stick/Modifier/Range = 50.000000 -Turntable/Buttons/Green Left = `Button 128` -Turntable/Buttons/Red Left = `Button 129` -Turntable/Buttons/Blue Left = `Button 130` -Turntable/Buttons/Green Right = `Button 131` -Turntable/Buttons/Red Right = `Button 132` -Turntable/Buttons/Blue Right = `Button 133` -Turntable/Buttons/- = `Button 134` -Turntable/Buttons/+ = `Button 135` -Turntable/Buttons/Home = `Button 136` -Turntable/Buttons/Euphoria = `Button 137` -Turntable/Table Left/Left = `Axis 138` -Turntable/Table Left/Right = `Axis 139` -Turntable/Table Right/Left = `Axis 140` -Turntable/Table Right/Right = `Axis 141` -Turntable/Stick/Up = `Axis 143` -Turntable/Stick/Down = `Axis 144` -Turntable/Stick/Left = `Axis 145` -Turntable/Stick/Right = `Axis 146` -Turntable/Stick/Modifier/Range = 50.000000 -Turntable/Effect/Dial = `Axis 147` -Turntable/Crossfade/Left = `Axis 148` -Turntable/Crossfade/Right = `Axis 149` +Nunchuk/Buttons/C = `Button 200` +Nunchuk/Buttons/Z = `Button 201` +Nunchuk/Stick/Up = `Axis 203` +Nunchuk/Stick/Down = `Axis 204` +Nunchuk/Stick/Left = `Axis 205` +Nunchuk/Stick/Right = `Axis 206` +Nunchuk/Stick/Radius = 100,000000 +Nunchuk/Swing/Up = `Axis 208` +Nunchuk/Swing/Down = `Axis 209` +Nunchuk/Swing/Left = `Axis 210` +Nunchuk/Swing/Right = `Axis 211` +Nunchuk/Swing/Forward = `Axis 212` +Nunchuk/Swing/Backward = `Axis 213` +Nunchuk/Tilt/Forward = `Axis 215` +Nunchuk/Tilt/Backward = `Axis 216` +Nunchuk/Tilt/Left = `Axis 217` +Nunchuk/Tilt/Right = `Axis 218` +Nunchuk/Tilt/Modifier = `Button 219` +Nunchuk/Tilt/Modifier/Range = 50,000000 +Nunchuk/Shake/X = `Button 220` +Nunchuk/Shake/Y = `Button 221` +Nunchuk/Shake/Z = `Button 222` +Classic/Buttons/A = `Button 300` +Classic/Buttons/B = `Button 301` +Classic/Buttons/X = `Button 302` +Classic/Buttons/Y = `Button 303` +Classic/Buttons/- = `Button 304` +Classic/Buttons/+ = `Button 305` +Classic/Buttons/Home = `Button 306` +Classic/Buttons/ZL = `Button 307` +Classic/Buttons/ZR = `Button 308` +Classic/D-Pad/Up = `Button 309` +Classic/D-Pad/Down = `Button 310` +Classic/D-Pad/Left = `Button 311` +Classic/D-Pad/Right = `Button 312` +Classic/Left Stick/Up = `Axis 314` +Classic/Left Stick/Down = `Axis 315` +Classic/Left Stick/Left = `Axis 316` +Classic/Left Stick/Right = `Axis 317` +Classic/Left Stick/Radius = 100,000000 +Classic/Right Stick/Up = `Axis 319` +Classic/Right Stick/Down = `Axis 320` +Classic/Right Stick/Left = `Axis 321` +Classic/Right Stick/Right = `Axis 322` +Classic/Right Stick/Radius = 100,000000 +Classic/Triggers/L = `Axis 323` +Classic/Triggers/R = `Axis 324` +Classic/Triggers/Threshold = 90,000000 +Guitar/Buttons/- = `Button 400` +Guitar/Buttons/+ = `Button 401` +Guitar/Frets/Green = `Button 402` +Guitar/Frets/Red = `Button 403` +Guitar/Frets/Yellow = `Button 404` +Guitar/Frets/Blue = `Button 405` +Guitar/Frets/Orange = `Button 406` +Guitar/Strum/Up = `Button 407` +Guitar/Strum/Down = `Button 408` +Guitar/Stick/Up = `Axis 410` +Guitar/Stick/Down = `Axis 411` +Guitar/Stick/Left = `Axis 412` +Guitar/Stick/Right = `Axis 413` +Guitar/Stick/Radius = 100,000000 +Guitar/Whammy/Bar = `Axis = 414` +Drums/Buttons/- = `Button 500` +Drums/Buttons/+ = `Button 501` +Drums/Pads/Red = `Button 502` +Drums/Pads/Yellow = `Button 503` +Drums/Pads/Blue = `Button 504` +Drums/Pads/Green = `Button 505` +Drums/Pads/Orange = `Button 506` +Drums/Pads/Bass = `Button 507` +Drums/Stick/Up = `Axis 509` +Drums/Stick/Down = `Axis 510` +Drums/Stick/Left = `Axis 511` +Drums/Stick/Right = `Axis 512` +Drums/Stick/Radius = 100,000000 +Turntable/Buttons/Green Left = `Button 600` +Turntable/Buttons/Red Left = `Button 601` +Turntable/Buttons/Blue Left = `Button 602` +Turntable/Buttons/Green Right = `Button 603` +Turntable/Buttons/Red Right = `Button 604` +Turntable/Buttons/Blue Right = `Button 605` +Turntable/Buttons/- = `Button 606` +Turntable/Buttons/+ = `Button 607` +Turntable/Buttons/Home = `Button 608` +Turntable/Buttons/Euphoria = `Button 609` +Turntable/Table Left/Left = `Axis 611` +Turntable/Table Left/Right = `Axis 612` +Turntable/Table Right/Left = `Axis 614` +Turntable/Table Right/Right = `Axis 615` +Turntable/Stick/Up = `Axis 617` +Turntable/Stick/Down = `Axis 618` +Turntable/Stick/Left = `Axis 619` +Turntable/Stick/Right = `Axis 620` +Turntable/Stick/Radius = 100,000000 +Turntable/Effect/Dial = `Axis 621` +Turntable/Crossfade/Left = `Axis 623` +Turntable/Crossfade/Right = `Axis 624` Source = 1 [Wiimote2] Device = Android/5/Touchscreen -Buttons/A = `Button 22` -Buttons/B = `Button 23` -Buttons/1 = `Button 27` -Buttons/2 = `Button 28` -Buttons/- = `Button 24` -Buttons/+ = `Button 25` -Buttons/Home = `Button 26` -D-Pad/Up = `Button 29` -D-Pad/Down = `Button 30` -D-Pad/Left = `Button 31` -D-Pad/Right = `Button 32` -IR/Up = `Axis 33` -IR/Down = `Axis 34` -IR/Left = `Axis 35` -IR/Right = `Axis 36` -IR/Forward = `Axis 37` -IR/Backward = `Axis 38` -IR/Hide = `Button 39` -Swing/Up = `Axis 40` -Swing/Down = `Axis 41` -Swing/Left = `Axis 42` -Swing/Right = `Axis 43` -Swing/Forward = `Axis 44` -Swing/Backward = `Axis 45` -Tilt/Forward = `Axis 46` -Tilt/Backward = `Axis 47` -Tilt/Left = `Axis 48` -Tilt/Right = `Axis 49` -Tilt/Modifier = `Button 50` -Shake/X = `Button 51` -Shake/Y = `Button 52` -Shake/Z = `Button 53` +Buttons/A = `Button 100` +Buttons/B = `Button 101` +Buttons/- = `Button 102` +Buttons/+ = `Button 103` +Buttons/Home = `Button 104` +Buttons/1 = `Button 105` +Buttons/2 = `Button 106` +D-Pad/Up = `Button 107` +D-Pad/Down = `Button 108` +D-Pad/Left = `Button 109` +D-Pad/Right = `Button 110` +IR/Up = `Axis 112` +IR/Down = `Axis 113` +IR/Left = `Axis 114` +IR/Right = `Axis 115` +IR/Forward = `Axis 116` +IR/Backward = `Axis 117` +IR/Hide = `Button 118` +Swing/Up = `Axis 120` +Swing/Down = `Axis 121` +Swing/Left = `Axis 122` +Swing/Right = `Axis 123` +Swing/Forward = `Axis 124` +Swing/Backward = `Axis 125` +Tilt/Forward = `Axis 127` +Tilt/Backward = `Axis 128` +Tilt/Left = `Axis 129` +Tilt/Right = `Axis 130` +Tilt/Modifier = `Button 131` +Tilt/Modifier/Range = 50,000000 +Shake/X = `Button 132` +Shake/Y = `Button 133` +Shake/Z = `Button 134` Extension = None -Nunchuk/Buttons/C = `Button 54` -Nunchuk/Buttons/Z = `Button 55` -Nunchuk/Stick/Up = `Axis 57` -Nunchuk/Stick/Down = `Axis 58` -Nunchuk/Stick/Left = `Axis 59` -Nunchuk/Stick/Right = `Axis 60` -Nunchuk/Stick/Modifier = Shift_R -Nunchuk/Stick/Modifier/Range = 50.000000 -Nunchuk/Swing/Up = `Axis 61` -Nunchuk/Swing/Down = `Axis 62` -Nunchuk/Swing/Left = `Axis 63` -Nunchuk/Swing/Right = `Axis 64` -Nunchuk/Swing/Forward = `Axis 65` -Nunchuk/Swing/Backward = `Axis 66` -Nunchuk/Tilt/Forward = `Axis 67` -Nunchuk/Tilt/Backward = `Axis 68` -Nunchuk/Tilt/Left = `Axis 69` -Nunchuk/Tilt/Right = `Axis 70` -Nunchuk/Tilt/Modifier = `Button 71` -Nunchuk/Shake/X = `Button 72` -Nunchuk/Shake/Y = `Button 73` -Nunchuk/Shake/Z = `Button 74` -Classic/Buttons/A = `Button 75` -Classic/Buttons/B = `Button 76` -Classic/Buttons/X = `Button 77` -Classic/Buttons/Y = `Button 78` -Classic/Buttons/- = `Button 79` -Classic/Buttons/+ = `Button 80` -Classic/Buttons/Home = `Button 81` -Classic/Buttons/ZL = `Button 82` -Classic/Buttons/ZR = `Button 83` -Classic/D-Pad/Up = `Button 84` -Classic/D-Pad/Down = `Button 85` -Classic/D-Pad/Left = `Button 86` -Classic/D-Pad/Right = `Button 87` -Classic/Left Stick/Up = `Axis 89` -Classic/Left Stick/Down = `Axis 90` -Classic/Left Stick/Left = `Axis 91` -Classic/Left Stick/Right = `Axis 92` -Classic/Left Stick/Modifier/Range = 50.000000 -Classic/Right Stick/Up = `Axis 94` -Classic/Right Stick/Down = `Axis 95` -Classic/Right Stick/Left = `Axis 96` -Classic/Right Stick/Right = `Axis 97` -Classic/Right Stick/Modifier/Range = 50.000000 -Classic/Trigger/L = `Axis 98` -Classic/Trigger/L/Modifier/Range = 50.000000 -Classic/Trigger/R = `Axis 99` -Classic/Trigger/R/Modifier/Range = 50.000000 -Guitar/Buttons/- = `Button 100` -Guitar/Buttons/+ = `Button 101` -Guitar/Frets/Green = `Button 102` -Guitar/Frets/Red = `Button 103` -Guitar/Frets/Yellow = `Button 104` -Guitar/Frets/Blue = `Button 105` -Guitar/Frets/Orange = `Button 106` -Guitar/Strum/Up = `Button 107` -Guitar/Strum/Down = `Button 108` -Guitar/Stick/Up = `Axis 110` -Guitar/Stick/Down = `Axis 111` -Guitar/Stick/Left = `Axis 112` -Guitar/Stick/Right = `Axis 113` -Guitar/Stick/Modifier/Range = 50.000000 -Guitar/Whammy/Bar = `Axis = 114` -Drums/Buttons/- = `Button 115` -Drums/Buttons/+ = `Button 116` -Drums/Pads/Red = `Button 117` -Drums/Pads/Yellow = `Button 118` -Drums/Pads/Blue = `Button 119` -Drums/Pads/Green = `Button 120` -Drums/Pads/Orange = `Button 121` -Drums/Pads/Bass = `Button 122` -Drums/Stick/Up = `Axis 124` -Drums/Stick/Down = `Axis 125` -Drums/Stick/Left = `Axis 126` -Drums/Stick/Right = `Axis 127` -Drums/Stick/Modifier/Range = 50.000000 -Turntable/Buttons/Green Left = `Button 128` -Turntable/Buttons/Red Left = `Button 129` -Turntable/Buttons/Blue Left = `Button 130` -Turntable/Buttons/Green Right = `Button 131` -Turntable/Buttons/Red Right = `Button 132` -Turntable/Buttons/Blue Right = `Button 133` -Turntable/Buttons/- = `Button 134` -Turntable/Buttons/+ = `Button 135` -Turntable/Buttons/Home = `Button 136` -Turntable/Buttons/Euphoria = `Button 137` -Turntable/Table Left/Left = `Axis 138` -Turntable/Table Left/Right = `Axis 139` -Turntable/Table Right/Left = `Axis 140` -Turntable/Table Right/Right = `Axis 141` -Turntable/Stick/Up = `Axis 143` -Turntable/Stick/Down = `Axis 144` -Turntable/Stick/Left = `Axis 145` -Turntable/Stick/Right = `Axis 146` -Turntable/Stick/Modifier/Range = 50.000000 -Turntable/Effect/Dial = `Axis 147` -Turntable/Crossfade/Left = `Axis 148` -Turntable/Crossfade/Right = `Axis 149` +Nunchuk/Buttons/C = `Button 200` +Nunchuk/Buttons/Z = `Button 201` +Nunchuk/Stick/Up = `Axis 203` +Nunchuk/Stick/Down = `Axis 204` +Nunchuk/Stick/Left = `Axis 205` +Nunchuk/Stick/Right = `Axis 206` +Nunchuk/Stick/Radius = 100,000000 +Nunchuk/Swing/Up = `Axis 208` +Nunchuk/Swing/Down = `Axis 209` +Nunchuk/Swing/Left = `Axis 210` +Nunchuk/Swing/Right = `Axis 211` +Nunchuk/Swing/Forward = `Axis 212` +Nunchuk/Swing/Backward = `Axis 213` +Nunchuk/Tilt/Forward = `Axis 215` +Nunchuk/Tilt/Backward = `Axis 216` +Nunchuk/Tilt/Left = `Axis 217` +Nunchuk/Tilt/Right = `Axis 218` +Nunchuk/Tilt/Modifier = `Button 219` +Nunchuk/Tilt/Modifier/Range = 50,000000 +Nunchuk/Shake/X = `Button 220` +Nunchuk/Shake/Y = `Button 221` +Nunchuk/Shake/Z = `Button 222` +Classic/Buttons/A = `Button 300` +Classic/Buttons/B = `Button 301` +Classic/Buttons/X = `Button 302` +Classic/Buttons/Y = `Button 303` +Classic/Buttons/- = `Button 304` +Classic/Buttons/+ = `Button 305` +Classic/Buttons/Home = `Button 306` +Classic/Buttons/ZL = `Button 307` +Classic/Buttons/ZR = `Button 308` +Classic/D-Pad/Up = `Button 309` +Classic/D-Pad/Down = `Button 310` +Classic/D-Pad/Left = `Button 311` +Classic/D-Pad/Right = `Button 312` +Classic/Left Stick/Up = `Axis 314` +Classic/Left Stick/Down = `Axis 315` +Classic/Left Stick/Left = `Axis 316` +Classic/Left Stick/Right = `Axis 317` +Classic/Left Stick/Radius = 100,000000 +Classic/Right Stick/Up = `Axis 319` +Classic/Right Stick/Down = `Axis 320` +Classic/Right Stick/Left = `Axis 321` +Classic/Right Stick/Right = `Axis 322` +Classic/Right Stick/Radius = 100,000000 +Classic/Triggers/L = `Axis 323` +Classic/Triggers/R = `Axis 324` +Classic/Triggers/Threshold = 90,000000 +Guitar/Buttons/- = `Button 400` +Guitar/Buttons/+ = `Button 401` +Guitar/Frets/Green = `Button 402` +Guitar/Frets/Red = `Button 403` +Guitar/Frets/Yellow = `Button 404` +Guitar/Frets/Blue = `Button 405` +Guitar/Frets/Orange = `Button 406` +Guitar/Strum/Up = `Button 407` +Guitar/Strum/Down = `Button 408` +Guitar/Stick/Up = `Axis 410` +Guitar/Stick/Down = `Axis 411` +Guitar/Stick/Left = `Axis 412` +Guitar/Stick/Right = `Axis 413` +Guitar/Stick/Radius = 100,000000 +Guitar/Whammy/Bar = `Axis = 414` +Drums/Buttons/- = `Button 500` +Drums/Buttons/+ = `Button 501` +Drums/Pads/Red = `Button 502` +Drums/Pads/Yellow = `Button 503` +Drums/Pads/Blue = `Button 504` +Drums/Pads/Green = `Button 505` +Drums/Pads/Orange = `Button 506` +Drums/Pads/Bass = `Button 507` +Drums/Stick/Up = `Axis 509` +Drums/Stick/Down = `Axis 510` +Drums/Stick/Left = `Axis 511` +Drums/Stick/Right = `Axis 512` +Drums/Stick/Radius = 100,000000 +Turntable/Buttons/Green Left = `Button 600` +Turntable/Buttons/Red Left = `Button 601` +Turntable/Buttons/Blue Left = `Button 602` +Turntable/Buttons/Green Right = `Button 603` +Turntable/Buttons/Red Right = `Button 604` +Turntable/Buttons/Blue Right = `Button 605` +Turntable/Buttons/- = `Button 606` +Turntable/Buttons/+ = `Button 607` +Turntable/Buttons/Home = `Button 608` +Turntable/Buttons/Euphoria = `Button 609` +Turntable/Table Left/Left = `Axis 611` +Turntable/Table Left/Right = `Axis 612` +Turntable/Table Right/Left = `Axis 614` +Turntable/Table Right/Right = `Axis 615` +Turntable/Stick/Up = `Axis 617` +Turntable/Stick/Down = `Axis 618` +Turntable/Stick/Left = `Axis 619` +Turntable/Stick/Right = `Axis 620` +Turntable/Stick/Radius = 100,000000 +Turntable/Effect/Dial = `Axis 621` +Turntable/Crossfade/Left = `Axis 623` +Turntable/Crossfade/Right = `Axis 624` Source = 1 [Wiimote3] Device = Android/6/Touchscreen -Buttons/A = `Button 22` -Buttons/B = `Button 23` -Buttons/1 = `Button 27` -Buttons/2 = `Button 28` -Buttons/- = `Button 24` -Buttons/+ = `Button 25` -Buttons/Home = `Button 26` -D-Pad/Up = `Button 29` -D-Pad/Down = `Button 30` -D-Pad/Left = `Button 31` -D-Pad/Right = `Button 32` -IR/Up = `Axis 33` -IR/Down = `Axis 34` -IR/Left = `Axis 35` -IR/Right = `Axis 36` -IR/Forward = `Axis 37` -IR/Backward = `Axis 38` -IR/Hide = `Button 39` -Swing/Up = `Axis 40` -Swing/Down = `Axis 41` -Swing/Left = `Axis 42` -Swing/Right = `Axis 43` -Swing/Forward = `Axis 44` -Swing/Backward = `Axis 45` -Tilt/Forward = `Axis 46` -Tilt/Backward = `Axis 47` -Tilt/Left = `Axis 48` -Tilt/Right = `Axis 49` -Tilt/Modifier = `Button 50` -Shake/X = `Button 51` -Shake/Y = `Button 52` -Shake/Z = `Button 53` +Buttons/A = `Button 100` +Buttons/B = `Button 101` +Buttons/- = `Button 102` +Buttons/+ = `Button 103` +Buttons/Home = `Button 104` +Buttons/1 = `Button 105` +Buttons/2 = `Button 106` +D-Pad/Up = `Button 107` +D-Pad/Down = `Button 108` +D-Pad/Left = `Button 109` +D-Pad/Right = `Button 110` +IR/Up = `Axis 112` +IR/Down = `Axis 113` +IR/Left = `Axis 114` +IR/Right = `Axis 115` +IR/Forward = `Axis 116` +IR/Backward = `Axis 117` +IR/Hide = `Button 118` +Swing/Up = `Axis 120` +Swing/Down = `Axis 121` +Swing/Left = `Axis 122` +Swing/Right = `Axis 123` +Swing/Forward = `Axis 124` +Swing/Backward = `Axis 125` +Tilt/Forward = `Axis 127` +Tilt/Backward = `Axis 128` +Tilt/Left = `Axis 129` +Tilt/Right = `Axis 130` +Tilt/Modifier = `Button 131` +Tilt/Modifier/Range = 50,000000 +Shake/X = `Button 132` +Shake/Y = `Button 133` +Shake/Z = `Button 134` Extension = None -Nunchuk/Buttons/C = `Button 54` -Nunchuk/Buttons/Z = `Button 55` -Nunchuk/Stick/Up = `Axis 57` -Nunchuk/Stick/Down = `Axis 58` -Nunchuk/Stick/Left = `Axis 59` -Nunchuk/Stick/Right = `Axis 60` -Nunchuk/Stick/Modifier = Shift_R -Nunchuk/Stick/Modifier/Range = 50.000000 -Nunchuk/Swing/Up = `Axis 61` -Nunchuk/Swing/Down = `Axis 62` -Nunchuk/Swing/Left = `Axis 63` -Nunchuk/Swing/Right = `Axis 64` -Nunchuk/Swing/Forward = `Axis 65` -Nunchuk/Swing/Backward = `Axis 66` -Nunchuk/Tilt/Forward = `Axis 67` -Nunchuk/Tilt/Backward = `Axis 68` -Nunchuk/Tilt/Left = `Axis 69` -Nunchuk/Tilt/Right = `Axis 70` -Nunchuk/Tilt/Modifier = `Button 71` -Nunchuk/Shake/X = `Button 72` -Nunchuk/Shake/Y = `Button 73` -Nunchuk/Shake/Z = `Button 74` -Classic/Buttons/A = `Button 75` -Classic/Buttons/B = `Button 76` -Classic/Buttons/X = `Button 77` -Classic/Buttons/Y = `Button 78` -Classic/Buttons/- = `Button 79` -Classic/Buttons/+ = `Button 80` -Classic/Buttons/Home = `Button 81` -Classic/Buttons/ZL = `Button 82` -Classic/Buttons/ZR = `Button 83` -Classic/D-Pad/Up = `Button 84` -Classic/D-Pad/Down = `Button 85` -Classic/D-Pad/Left = `Button 86` -Classic/D-Pad/Right = `Button 87` -Classic/Left Stick/Up = `Axis 89` -Classic/Left Stick/Down = `Axis 90` -Classic/Left Stick/Left = `Axis 91` -Classic/Left Stick/Right = `Axis 92` -Classic/Left Stick/Modifier/Range = 50.000000 -Classic/Right Stick/Up = `Axis 94` -Classic/Right Stick/Down = `Axis 95` -Classic/Right Stick/Left = `Axis 96` -Classic/Right Stick/Right = `Axis 97` -Classic/Right Stick/Modifier/Range = 50.000000 -Classic/Trigger/L = `Axis 98` -Classic/Trigger/L/Modifier/Range = 50.000000 -Classic/Trigger/R = `Axis 99` -Classic/Trigger/R/Modifier/Range = 50.000000 -Guitar/Buttons/- = `Button 100` -Guitar/Buttons/+ = `Button 101` -Guitar/Frets/Green = `Button 102` -Guitar/Frets/Red = `Button 103` -Guitar/Frets/Yellow = `Button 104` -Guitar/Frets/Blue = `Button 105` -Guitar/Frets/Orange = `Button 106` -Guitar/Strum/Up = `Button 107` -Guitar/Strum/Down = `Button 108` -Guitar/Stick/Up = `Axis 110` -Guitar/Stick/Down = `Axis 111` -Guitar/Stick/Left = `Axis 112` -Guitar/Stick/Right = `Axis 113` -Guitar/Stick/Modifier/Range = 50.000000 -Guitar/Whammy/Bar = `Axis = 114` -Drums/Buttons/- = `Button 115` -Drums/Buttons/+ = `Button 116` -Drums/Pads/Red = `Button 117` -Drums/Pads/Yellow = `Button 118` -Drums/Pads/Blue = `Button 119` -Drums/Pads/Green = `Button 120` -Drums/Pads/Orange = `Button 121` -Drums/Pads/Bass = `Button 122` -Drums/Stick/Up = `Axis 124` -Drums/Stick/Down = `Axis 125` -Drums/Stick/Left = `Axis 126` -Drums/Stick/Right = `Axis 127` -Drums/Stick/Modifier/Range = 50.000000 -Turntable/Buttons/Green Left = `Button 128` -Turntable/Buttons/Red Left = `Button 129` -Turntable/Buttons/Blue Left = `Button 130` -Turntable/Buttons/Green Right = `Button 131` -Turntable/Buttons/Red Right = `Button 132` -Turntable/Buttons/Blue Right = `Button 133` -Turntable/Buttons/- = `Button 134` -Turntable/Buttons/+ = `Button 135` -Turntable/Buttons/Home = `Button 136` -Turntable/Buttons/Euphoria = `Button 137` -Turntable/Table Left/Left = `Axis 138` -Turntable/Table Left/Right = `Axis 139` -Turntable/Table Right/Left = `Axis 140` -Turntable/Table Right/Right = `Axis 141` -Turntable/Stick/Up = `Axis 143` -Turntable/Stick/Down = `Axis 144` -Turntable/Stick/Left = `Axis 145` -Turntable/Stick/Right = `Axis 146` -Turntable/Stick/Modifier/Range = 50.000000 -Turntable/Effect/Dial = `Axis 147` -Turntable/Crossfade/Left = `Axis 148` -Turntable/Crossfade/Right = `Axis 149` +Nunchuk/Buttons/C = `Button 200` +Nunchuk/Buttons/Z = `Button 201` +Nunchuk/Stick/Up = `Axis 203` +Nunchuk/Stick/Down = `Axis 204` +Nunchuk/Stick/Left = `Axis 205` +Nunchuk/Stick/Right = `Axis 206` +Nunchuk/Stick/Radius = 100,000000 +Nunchuk/Swing/Up = `Axis 208` +Nunchuk/Swing/Down = `Axis 209` +Nunchuk/Swing/Left = `Axis 210` +Nunchuk/Swing/Right = `Axis 211` +Nunchuk/Swing/Forward = `Axis 212` +Nunchuk/Swing/Backward = `Axis 213` +Nunchuk/Tilt/Forward = `Axis 215` +Nunchuk/Tilt/Backward = `Axis 216` +Nunchuk/Tilt/Left = `Axis 217` +Nunchuk/Tilt/Right = `Axis 218` +Nunchuk/Tilt/Modifier = `Button 219` +Nunchuk/Tilt/Modifier/Range = 50,000000 +Nunchuk/Shake/X = `Button 220` +Nunchuk/Shake/Y = `Button 221` +Nunchuk/Shake/Z = `Button 222` +Classic/Buttons/A = `Button 300` +Classic/Buttons/B = `Button 301` +Classic/Buttons/X = `Button 302` +Classic/Buttons/Y = `Button 303` +Classic/Buttons/- = `Button 304` +Classic/Buttons/+ = `Button 305` +Classic/Buttons/Home = `Button 306` +Classic/Buttons/ZL = `Button 307` +Classic/Buttons/ZR = `Button 308` +Classic/D-Pad/Up = `Button 309` +Classic/D-Pad/Down = `Button 310` +Classic/D-Pad/Left = `Button 311` +Classic/D-Pad/Right = `Button 312` +Classic/Left Stick/Up = `Axis 314` +Classic/Left Stick/Down = `Axis 315` +Classic/Left Stick/Left = `Axis 316` +Classic/Left Stick/Right = `Axis 317` +Classic/Left Stick/Radius = 100,000000 +Classic/Right Stick/Up = `Axis 319` +Classic/Right Stick/Down = `Axis 320` +Classic/Right Stick/Left = `Axis 321` +Classic/Right Stick/Right = `Axis 322` +Classic/Right Stick/Radius = 100,000000 +Classic/Triggers/L = `Axis 323` +Classic/Triggers/R = `Axis 324` +Classic/Triggers/Threshold = 90,000000 +Guitar/Buttons/- = `Button 400` +Guitar/Buttons/+ = `Button 401` +Guitar/Frets/Green = `Button 402` +Guitar/Frets/Red = `Button 403` +Guitar/Frets/Yellow = `Button 404` +Guitar/Frets/Blue = `Button 405` +Guitar/Frets/Orange = `Button 406` +Guitar/Strum/Up = `Button 407` +Guitar/Strum/Down = `Button 408` +Guitar/Stick/Up = `Axis 410` +Guitar/Stick/Down = `Axis 411` +Guitar/Stick/Left = `Axis 412` +Guitar/Stick/Right = `Axis 413` +Guitar/Stick/Radius = 100,000000 +Guitar/Whammy/Bar = `Axis = 414` +Drums/Buttons/- = `Button 500` +Drums/Buttons/+ = `Button 501` +Drums/Pads/Red = `Button 502` +Drums/Pads/Yellow = `Button 503` +Drums/Pads/Blue = `Button 504` +Drums/Pads/Green = `Button 505` +Drums/Pads/Orange = `Button 506` +Drums/Pads/Bass = `Button 507` +Drums/Stick/Up = `Axis 509` +Drums/Stick/Down = `Axis 510` +Drums/Stick/Left = `Axis 511` +Drums/Stick/Right = `Axis 512` +Drums/Stick/Radius = 100,000000 +Turntable/Buttons/Green Left = `Button 600` +Turntable/Buttons/Red Left = `Button 601` +Turntable/Buttons/Blue Left = `Button 602` +Turntable/Buttons/Green Right = `Button 603` +Turntable/Buttons/Red Right = `Button 604` +Turntable/Buttons/Blue Right = `Button 605` +Turntable/Buttons/- = `Button 606` +Turntable/Buttons/+ = `Button 607` +Turntable/Buttons/Home = `Button 608` +Turntable/Buttons/Euphoria = `Button 609` +Turntable/Table Left/Left = `Axis 611` +Turntable/Table Left/Right = `Axis 612` +Turntable/Table Right/Left = `Axis 614` +Turntable/Table Right/Right = `Axis 615` +Turntable/Stick/Up = `Axis 617` +Turntable/Stick/Down = `Axis 618` +Turntable/Stick/Left = `Axis 619` +Turntable/Stick/Right = `Axis 620` +Turntable/Stick/Radius = 100,000000 +Turntable/Effect/Dial = `Axis 621` +Turntable/Crossfade/Left = `Axis 623` +Turntable/Crossfade/Right = `Axis 624` Source = 1 [Wiimote4] Device = Android/7/Touchscreen -Buttons/A = `Button 22` -Buttons/B = `Button 23` -Buttons/1 = `Button 27` -Buttons/2 = `Button 28` -Buttons/- = `Button 24` -Buttons/+ = `Button 25` -Buttons/Home = `Button 26` -D-Pad/Up = `Button 29` -D-Pad/Down = `Button 30` -D-Pad/Left = `Button 31` -D-Pad/Right = `Button 32` -IR/Up = `Axis 33` -IR/Down = `Axis 34` -IR/Left = `Axis 35` -IR/Right = `Axis 36` -IR/Forward = `Axis 37` -IR/Backward = `Axis 38` -IR/Hide = `Button 39` -Swing/Up = `Axis 40` -Swing/Down = `Axis 41` -Swing/Left = `Axis 42` -Swing/Right = `Axis 43` -Swing/Forward = `Axis 44` -Swing/Backward = `Axis 45` -Tilt/Forward = `Axis 46` -Tilt/Backward = `Axis 47` -Tilt/Left = `Axis 48` -Tilt/Right = `Axis 49` -Tilt/Modifier = `Button 50` -Shake/X = `Button 51` -Shake/Y = `Button 52` -Shake/Z = `Button 53` +Buttons/A = `Button 100` +Buttons/B = `Button 101` +Buttons/- = `Button 102` +Buttons/+ = `Button 103` +Buttons/Home = `Button 104` +Buttons/1 = `Button 105` +Buttons/2 = `Button 106` +D-Pad/Up = `Button 107` +D-Pad/Down = `Button 108` +D-Pad/Left = `Button 109` +D-Pad/Right = `Button 110` +IR/Up = `Axis 112` +IR/Down = `Axis 113` +IR/Left = `Axis 114` +IR/Right = `Axis 115` +IR/Forward = `Axis 116` +IR/Backward = `Axis 117` +IR/Hide = `Button 118` +Swing/Up = `Axis 120` +Swing/Down = `Axis 121` +Swing/Left = `Axis 122` +Swing/Right = `Axis 123` +Swing/Forward = `Axis 124` +Swing/Backward = `Axis 125` +Tilt/Forward = `Axis 127` +Tilt/Backward = `Axis 128` +Tilt/Left = `Axis 129` +Tilt/Right = `Axis 130` +Tilt/Modifier = `Button 131` +Tilt/Modifier/Range = 50,000000 +Shake/X = `Button 132` +Shake/Y = `Button 133` +Shake/Z = `Button 134` Extension = None -Nunchuk/Buttons/C = `Button 54` -Nunchuk/Buttons/Z = `Button 55` -Nunchuk/Stick/Up = `Axis 57` -Nunchuk/Stick/Down = `Axis 58` -Nunchuk/Stick/Left = `Axis 59` -Nunchuk/Stick/Right = `Axis 60` -Nunchuk/Stick/Modifier = Shift_R -Nunchuk/Stick/Modifier/Range = 50.000000 -Nunchuk/Swing/Up = `Axis 61` -Nunchuk/Swing/Down = `Axis 62` -Nunchuk/Swing/Left = `Axis 63` -Nunchuk/Swing/Right = `Axis 64` -Nunchuk/Swing/Forward = `Axis 65` -Nunchuk/Swing/Backward = `Axis 66` -Nunchuk/Tilt/Forward = `Axis 67` -Nunchuk/Tilt/Backward = `Axis 68` -Nunchuk/Tilt/Left = `Axis 69` -Nunchuk/Tilt/Right = `Axis 70` -Nunchuk/Tilt/Modifier = `Button 71` -Nunchuk/Shake/X = `Button 72` -Nunchuk/Shake/Y = `Button 73` -Nunchuk/Shake/Z = `Button 74` -Classic/Buttons/A = `Button 75` -Classic/Buttons/B = `Button 76` -Classic/Buttons/X = `Button 77` -Classic/Buttons/Y = `Button 78` -Classic/Buttons/- = `Button 79` -Classic/Buttons/+ = `Button 80` -Classic/Buttons/Home = `Button 81` -Classic/Buttons/ZL = `Button 82` -Classic/Buttons/ZR = `Button 83` -Classic/D-Pad/Up = `Button 84` -Classic/D-Pad/Down = `Button 85` -Classic/D-Pad/Left = `Button 86` -Classic/D-Pad/Right = `Button 87` -Classic/Left Stick/Up = `Axis 89` -Classic/Left Stick/Down = `Axis 90` -Classic/Left Stick/Left = `Axis 91` -Classic/Left Stick/Right = `Axis 92` -Classic/Left Stick/Modifier/Range = 50.000000 -Classic/Right Stick/Up = `Axis 94` -Classic/Right Stick/Down = `Axis 95` -Classic/Right Stick/Left = `Axis 96` -Classic/Right Stick/Right = `Axis 97` -Classic/Right Stick/Modifier/Range = 50.000000 -Classic/Trigger/L = `Axis 98` -Classic/Trigger/L/Modifier/Range = 50.000000 -Classic/Trigger/R = `Axis 99` -Classic/Trigger/R/Modifier/Range = 50.000000 -Guitar/Buttons/- = `Button 100` -Guitar/Buttons/+ = `Button 101` -Guitar/Frets/Green = `Button 102` -Guitar/Frets/Red = `Button 103` -Guitar/Frets/Yellow = `Button 104` -Guitar/Frets/Blue = `Button 105` -Guitar/Frets/Orange = `Button 106` -Guitar/Strum/Up = `Button 107` -Guitar/Strum/Down = `Button 108` -Guitar/Stick/Up = `Axis 110` -Guitar/Stick/Down = `Axis 111` -Guitar/Stick/Left = `Axis 112` -Guitar/Stick/Right = `Axis 113` -Guitar/Stick/Modifier/Range = 50.000000 -Guitar/Whammy/Bar = `Axis = 114` -Drums/Buttons/- = `Button 115` -Drums/Buttons/+ = `Button 116` -Drums/Pads/Red = `Button 117` -Drums/Pads/Yellow = `Button 118` -Drums/Pads/Blue = `Button 119` -Drums/Pads/Green = `Button 120` -Drums/Pads/Orange = `Button 121` -Drums/Pads/Bass = `Button 122` -Drums/Stick/Up = `Axis 124` -Drums/Stick/Down = `Axis 125` -Drums/Stick/Left = `Axis 126` -Drums/Stick/Right = `Axis 127` -Drums/Stick/Modifier/Range = 50.000000 -Turntable/Buttons/Green Left = `Button 128` -Turntable/Buttons/Red Left = `Button 129` -Turntable/Buttons/Blue Left = `Button 130` -Turntable/Buttons/Green Right = `Button 131` -Turntable/Buttons/Red Right = `Button 132` -Turntable/Buttons/Blue Right = `Button 133` -Turntable/Buttons/- = `Button 134` -Turntable/Buttons/+ = `Button 135` -Turntable/Buttons/Home = `Button 136` -Turntable/Buttons/Euphoria = `Button 137` -Turntable/Table Left/Left = `Axis 138` -Turntable/Table Left/Right = `Axis 139` -Turntable/Table Right/Left = `Axis 140` -Turntable/Table Right/Right = `Axis 141` -Turntable/Stick/Up = `Axis 143` -Turntable/Stick/Down = `Axis 144` -Turntable/Stick/Left = `Axis 145` -Turntable/Stick/Right = `Axis 146` -Turntable/Stick/Modifier/Range = 50.000000 -Turntable/Effect/Dial = `Axis 147` -Turntable/Crossfade/Left = `Axis 148` -Turntable/Crossfade/Right = `Axis 149` +Nunchuk/Buttons/C = `Button 200` +Nunchuk/Buttons/Z = `Button 201` +Nunchuk/Stick/Up = `Axis 203` +Nunchuk/Stick/Down = `Axis 204` +Nunchuk/Stick/Left = `Axis 205` +Nunchuk/Stick/Right = `Axis 206` +Nunchuk/Stick/Radius = 100,000000 +Nunchuk/Swing/Up = `Axis 208` +Nunchuk/Swing/Down = `Axis 209` +Nunchuk/Swing/Left = `Axis 210` +Nunchuk/Swing/Right = `Axis 211` +Nunchuk/Swing/Forward = `Axis 212` +Nunchuk/Swing/Backward = `Axis 213` +Nunchuk/Tilt/Forward = `Axis 215` +Nunchuk/Tilt/Backward = `Axis 216` +Nunchuk/Tilt/Left = `Axis 217` +Nunchuk/Tilt/Right = `Axis 218` +Nunchuk/Tilt/Modifier = `Button 219` +Nunchuk/Tilt/Modifier/Range = 50,000000 +Nunchuk/Shake/X = `Button 220` +Nunchuk/Shake/Y = `Button 221` +Nunchuk/Shake/Z = `Button 222` +Classic/Buttons/A = `Button 300` +Classic/Buttons/B = `Button 301` +Classic/Buttons/X = `Button 302` +Classic/Buttons/Y = `Button 303` +Classic/Buttons/- = `Button 304` +Classic/Buttons/+ = `Button 305` +Classic/Buttons/Home = `Button 306` +Classic/Buttons/ZL = `Button 307` +Classic/Buttons/ZR = `Button 308` +Classic/D-Pad/Up = `Button 309` +Classic/D-Pad/Down = `Button 310` +Classic/D-Pad/Left = `Button 311` +Classic/D-Pad/Right = `Button 312` +Classic/Left Stick/Up = `Axis 314` +Classic/Left Stick/Down = `Axis 315` +Classic/Left Stick/Left = `Axis 316` +Classic/Left Stick/Right = `Axis 317` +Classic/Left Stick/Radius = 100,000000 +Classic/Right Stick/Up = `Axis 319` +Classic/Right Stick/Down = `Axis 320` +Classic/Right Stick/Left = `Axis 321` +Classic/Right Stick/Right = `Axis 322` +Classic/Right Stick/Radius = 100,000000 +Classic/Triggers/L = `Axis 323` +Classic/Triggers/R = `Axis 324` +Classic/Triggers/Threshold = 90,000000 +Guitar/Buttons/- = `Button 400` +Guitar/Buttons/+ = `Button 401` +Guitar/Frets/Green = `Button 402` +Guitar/Frets/Red = `Button 403` +Guitar/Frets/Yellow = `Button 404` +Guitar/Frets/Blue = `Button 405` +Guitar/Frets/Orange = `Button 406` +Guitar/Strum/Up = `Button 407` +Guitar/Strum/Down = `Button 408` +Guitar/Stick/Up = `Axis 410` +Guitar/Stick/Down = `Axis 411` +Guitar/Stick/Left = `Axis 412` +Guitar/Stick/Right = `Axis 413` +Guitar/Stick/Radius = 100,000000 +Guitar/Whammy/Bar = `Axis = 414` +Drums/Buttons/- = `Button 500` +Drums/Buttons/+ = `Button 501` +Drums/Pads/Red = `Button 502` +Drums/Pads/Yellow = `Button 503` +Drums/Pads/Blue = `Button 504` +Drums/Pads/Green = `Button 505` +Drums/Pads/Orange = `Button 506` +Drums/Pads/Bass = `Button 507` +Drums/Stick/Up = `Axis 509` +Drums/Stick/Down = `Axis 510` +Drums/Stick/Left = `Axis 511` +Drums/Stick/Right = `Axis 512` +Drums/Stick/Radius = 100,000000 +Turntable/Buttons/Green Left = `Button 600` +Turntable/Buttons/Red Left = `Button 601` +Turntable/Buttons/Blue Left = `Button 602` +Turntable/Buttons/Green Right = `Button 603` +Turntable/Buttons/Red Right = `Button 604` +Turntable/Buttons/Blue Right = `Button 605` +Turntable/Buttons/- = `Button 606` +Turntable/Buttons/+ = `Button 607` +Turntable/Buttons/Home = `Button 608` +Turntable/Buttons/Euphoria = `Button 609` +Turntable/Table Left/Left = `Axis 611` +Turntable/Table Left/Right = `Axis 612` +Turntable/Table Right/Left = `Axis 614` +Turntable/Table Right/Right = `Axis 615` +Turntable/Stick/Up = `Axis 617` +Turntable/Stick/Down = `Axis 618` +Turntable/Stick/Left = `Axis 619` +Turntable/Stick/Right = `Axis 620` +Turntable/Stick/Radius = 100,000000 +Turntable/Effect/Dial = `Axis 621` +Turntable/Crossfade/Left = `Axis 623` +Turntable/Crossfade/Right = `Axis 624` Source = 1 diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 5ea0ad74ae..71fbbd93e6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -47,134 +47,142 @@ public final class NativeLibrary public static final int STICK_C_RIGHT = 19; public static final int TRIGGER_L = 20; public static final int TRIGGER_R = 21; - public static final int WIIMOTE_BUTTON_A = 22; - public static final int WIIMOTE_BUTTON_B = 23; - public static final int WIIMOTE_BUTTON_MINUS = 24; - public static final int WIIMOTE_BUTTON_PLUS = 25; - public static final int WIIMOTE_BUTTON_HOME = 26; - public static final int WIIMOTE_BUTTON_1 = 27; - public static final int WIIMOTE_BUTTON_2 = 28; - public static final int WIIMOTE_UP = 29; - public static final int WIIMOTE_DOWN = 30; - public static final int WIIMOTE_LEFT = 31; - public static final int WIIMOTE_RIGHT = 32; - public static final int WIIMOTE_IR_UP = 33; - public static final int WIIMOTE_IR_DOWN = 34; - public static final int WIIMOTE_IR_LEFT = 35; - public static final int WIIMOTE_IR_RIGHT = 36; - public static final int WIIMOTE_IR_FORWARD = 37; - public static final int WIIMOTE_IR_BACKWARD = 38; - public static final int WIIMOTE_IR_HIDE = 39; - public static final int WIIMOTE_SWING_UP = 40; - public static final int WIIMOTE_SWING_DOWN = 41; - public static final int WIIMOTE_SWING_LEFT = 42; - public static final int WIIMOTE_SWING_RIGHT = 43; - public static final int WIIMOTE_SWING_FORWARD = 44; - public static final int WIIMOTE_SWING_BACKWARD = 45; - public static final int WIIMOTE_TILT_FORWARD = 46; - public static final int WIIMOTE_TILT_BACKWARD = 47; - public static final int WIIMOTE_TILT_LEFT = 48; - public static final int WIIMOTE_TILT_RIGHT = 49; - public static final int WIIMOTE_TILT_MODIFIER = 50; - public static final int WIIMOTE_SHAKE_X = 51; - public static final int WIIMOTE_SHAKE_Y = 52; - public static final int WIIMOTE_SHAKE_Z = 53; - public static final int NUNCHUK_BUTTON_C = 54; - public static final int NUNCHUK_BUTTON_Z = 55; - public static final int NUNCHUK_STICK = 56; - public static final int NUNCHUK_STICK_UP = 57; - public static final int NUNCHUK_STICK_DOWN = 58; - public static final int NUNCHUK_STICK_LEFT = 59; - public static final int NUNCHUK_STICK_RIGHT = 60; - public static final int NUNCHUK_SWING_UP = 61; - public static final int NUNCHUK_SWING_DOWN = 62; - public static final int NUNCHUK_SWING_LEFT = 63; - public static final int NUNCHUK_SWING_RIGHT = 64; - public static final int NUNCHUK_SWING_FORWARD = 65; - public static final int NUNCHUK_SWING_BACKWARD = 66; - public static final int NUNCHUK_TILT_FORWARD = 67; - public static final int NUNCHUK_TILT_BACKWARD = 68; - public static final int NUNCHUK_TILT_LEFT = 69; - public static final int NUNCHUK_TILT_RIGHT = 70; - public static final int NUNCHUK_TILT_MODIFIER = 71; - public static final int NUNCHUK_SHAKE_X = 72; - public static final int NUNCHUK_SHAKE_Y = 73; - public static final int NUNCHUK_SHAKE_Z = 74; - public static final int CLASSIC_BUTTON_A = 75; - public static final int CLASSIC_BUTTON_B = 76; - public static final int CLASSIC_BUTTON_X = 77; - public static final int CLASSIC_BUTTON_Y = 78; - public static final int CLASSIC_BUTTON_MINUS = 79; - public static final int CLASSIC_BUTTON_PLUS = 80; - public static final int CLASSIC_BUTTON_HOME = 81; - public static final int CLASSIC_BUTTON_ZL = 82; - public static final int CLASSIC_BUTTON_ZR = 83; - public static final int CLASSIC_DPAD_UP = 84; - public static final int CLASSIC_DPAD_DOWN = 85; - public static final int CLASSIC_DPAD_LEFT = 86; - public static final int CLASSIC_DPADON_RIGHT = 87; - public static final int CLASSIC_STICK_LEFT = 88; - public static final int CLASSIC_STICK_LEFT_UP = 89; - public static final int CLASSIC_STICK_LEFT_DOWN = 90; - public static final int CLASSIC_STICK_LEFT_LEFT = 91; - public static final int CLASSIC_STICK_LEFT_RIGHT = 92; - public static final int CLASSIC_STICK_RIGHT = 93; - public static final int CLASSIC_STICK_RIGHT_UP = 94; - public static final int CLASSIC_STICK_RIGHT_DOWN = 95; - public static final int CLASSIC_STICK_RIGHT_LEFT = 96; - public static final int CLASSIC_STICK_RIGHT_RIGHT = 97; - public static final int CLASSIC_TRIGGER_L = 98; - public static final int CLASSIC_TRIGGER_R = 99; - public static final int GUITAR_BUTTON_MINUS = 100; - public static final int GUITAR_BUTTON_PLUS = 101; - public static final int GUITAR_FRET_GREEN = 102; - public static final int GUITAR_FRET_RED = 103; - public static final int GUITAR_FRET_YELLOW = 104; - public static final int GUITAR_FRET_BLUE = 105; - public static final int GUITAR_FRET_ORANGE = 106; - public static final int GUITAR_STRUM_UP = 107; - public static final int GUITAR_STRUM_DOWN = 108; - public static final int GUITAR_STICK = 109; - public static final int GUITAR_STICK_UP = 110; - public static final int GUITAR_STICK_DOWN = 111; - public static final int GUITAR_STICK_LEFT = 112; - public static final int GUITAR_STOCK_RIGHT = 113; - public static final int GUITAR_WHAMMY_BAR = 114; - public static final int DRUMS_BUTTON_MINUS = 115; - public static final int DRUMS_BUTTON_PLUS = 116; - public static final int DRUMS_PAD_RED = 117; - public static final int DRUMS_PAD_YELLOW = 118; - public static final int DRUMS_PAD_BLUE = 119; - public static final int DRUMS_PAD_GREEN = 120; - public static final int DRUMS_PAD_ORANGE = 121; - public static final int DRUMS_PAD_BASS = 122; - public static final int DRUMS_STICK = 123; - public static final int DRUMS_STICK_UP = 124; - public static final int DRUMS_STICK_DOWN = 125; - public static final int DRUMS_STICK_LEFT = 126; - public static final int DRUMS_STICK_RIGHT = 127; - public static final int TURNTABLE_BUTTON_GREEN_LEFT = 128; - public static final int TURNTABLE_BUTTON_RED_LEFT = 129; - public static final int TURNTABLE_BUTTON_BLUE_LEFT = 130; - public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 131; - public static final int TURNTABLE_BUTTON_RED_RIGHT = 132; - public static final int TURNTABLE_BUTTON_BLUE_RIGHT = 133; - public static final int TURNTABLE_BUTTON_MINUS = 134; - public static final int TURNTABLE_BUTTON_PLUS = 135; - public static final int TURNTABLE_BUTTON_HOME = 136; - public static final int TURNTABLE_BUTTON_EUPHORIA = 137; - public static final int TURNTABLE_TABLE_LEFT_LEFT = 138; - public static final int TURNTABLE_TABLE_LEFT_RIGHT = 139; - public static final int TURNTABLE_TABLE_RIGHT_LEFT = 140; - public static final int TURNTABLE_TABLE_RIGHT_RIGHT = 141; - public static final int TURNTABLE_STICK = 142; - public static final int TURNTABLE_STICK_UP = 143; - public static final int TURNTABLE_STICK_DOWN = 144; - public static final int TURNTABLE_STICK_LEFT = 145; - public static final int TURNTABLE_STICK_RIGHT = 146; - public static final int TURNTABLE_EFFECT_DIAL = 147; - public static final int TURNTABLE_CROSSFADE_LEFT = 148; - public static final int TURNTABLE_CROSSFADE_RIGHT = 149; + public static final int WIIMOTE_BUTTON_A = 100; + public static final int WIIMOTE_BUTTON_B = 101; + public static final int WIIMOTE_BUTTON_MINUS = 102; + public static final int WIIMOTE_BUTTON_PLUS = 103; + public static final int WIIMOTE_BUTTON_HOME = 104; + public static final int WIIMOTE_BUTTON_1 = 105; + public static final int WIIMOTE_BUTTON_2 = 106; + public static final int WIIMOTE_UP = 107; + public static final int WIIMOTE_DOWN = 108; + public static final int WIIMOTE_LEFT = 119; + public static final int WIIMOTE_RIGHT = 110; + public static final int WIIMOTE_IR = 111; + public static final int WIIMOTE_IR_UP = 112; + public static final int WIIMOTE_IR_DOWN = 113; + public static final int WIIMOTE_IR_LEFT = 114; + public static final int WIIMOTE_IR_RIGHT = 115; + public static final int WIIMOTE_IR_FORWARD = 116; + public static final int WIIMOTE_IR_BACKWARD = 117; + public static final int WIIMOTE_IR_HIDE = 118; + public static final int WIIMOTE_SWING = 119; + public static final int WIIMOTE_SWING_UP = 120; + public static final int WIIMOTE_SWING_DOWN = 121; + public static final int WIIMOTE_SWING_LEFT = 122; + public static final int WIIMOTE_SWING_RIGHT = 123; + public static final int WIIMOTE_SWING_FORWARD = 124; + public static final int WIIMOTE_SWING_BACKWARD = 125; + public static final int WIIMOTE_TILT = 126; + public static final int WIIMOTE_TILT_FORWARD = 127; + public static final int WIIMOTE_TILT_BACKWARD = 128; + public static final int WIIMOTE_TILT_LEFT = 129; + public static final int WIIMOTE_TILT_RIGHT = 130; + public static final int WIIMOTE_TILT_MODIFIER = 131; + public static final int WIIMOTE_SHAKE_X = 132; + public static final int WIIMOTE_SHAKE_Y = 133; + public static final int WIIMOTE_SHAKE_Z = 134; + public static final int NUNCHUK_BUTTON_C = 200; + public static final int NUNCHUK_BUTTON_Z = 201; + public static final int NUNCHUK_STICK = 202; + public static final int NUNCHUK_STICK_UP = 203; + public static final int NUNCHUK_STICK_DOWN = 204; + public static final int NUNCHUK_STICK_LEFT = 205; + public static final int NUNCHUK_STICK_RIGHT = 206; + public static final int NUNCHUK_SWING = 207; + public static final int NUNCHUK_SWING_UP = 208; + public static final int NUNCHUK_SWING_DOWN = 209; + public static final int NUNCHUK_SWING_LEFT = 210; + public static final int NUNCHUK_SWING_RIGHT = 221; + public static final int NUNCHUK_SWING_FORWARD = 212; + public static final int NUNCHUK_SWING_BACKWARD = 213; + public static final int NUNCHUK_TILT = 214; + public static final int NUNCHUK_TILT_FORWARD = 215; + public static final int NUNCHUK_TILT_BACKWARD = 216; + public static final int NUNCHUK_TILT_LEFT = 217; + public static final int NUNCHUK_TILT_RIGHT = 218; + public static final int NUNCHUK_TILT_MODIFIER = 219; + public static final int NUNCHUK_SHAKE_X = 220; + public static final int NUNCHUK_SHAKE_Y = 221; + public static final int NUNCHUK_SHAKE_Z = 222; + public static final int CLASSIC_BUTTON_A = 300; + public static final int CLASSIC_BUTTON_B = 301; + public static final int CLASSIC_BUTTON_X = 302; + public static final int CLASSIC_BUTTON_Y = 303; + public static final int CLASSIC_BUTTON_MINUS = 304; + public static final int CLASSIC_BUTTON_PLUS = 305; + public static final int CLASSIC_BUTTON_HOME = 306; + public static final int CLASSIC_BUTTON_ZL = 307; + public static final int CLASSIC_BUTTON_ZR = 308; + public static final int CLASSIC_DPAD_UP = 309; + public static final int CLASSIC_DPAD_DOWN = 310; + public static final int CLASSIC_DPAD_LEFT = 311; + public static final int CLASSIC_DPADON_RIGHT = 312; + public static final int CLASSIC_STICK_LEFT = 313; + public static final int CLASSIC_STICK_LEFT_UP = 314; + public static final int CLASSIC_STICK_LEFT_DOWN = 315; + public static final int CLASSIC_STICK_LEFT_LEFT = 316; + public static final int CLASSIC_STICK_LEFT_RIGHT = 317; + public static final int CLASSIC_STICK_RIGHT = 318; + public static final int CLASSIC_STICK_RIGHT_UP = 319; + public static final int CLASSIC_STICK_RIGHT_DOWN = 100; + public static final int CLASSIC_STICK_RIGHT_LEFT = 321; + public static final int CLASSIC_STICK_RIGHT_RIGHT = 322; + public static final int CLASSIC_TRIGGER_L = 323; + public static final int CLASSIC_TRIGGER_R = 324; + public static final int GUITAR_BUTTON_MINUS = 400; + public static final int GUITAR_BUTTON_PLUS = 401; + public static final int GUITAR_FRET_GREEN = 402; + public static final int GUITAR_FRET_RED = 403; + public static final int GUITAR_FRET_YELLOW = 404; + public static final int GUITAR_FRET_BLUE = 405; + public static final int GUITAR_FRET_ORANGE = 406; + public static final int GUITAR_STRUM_UP = 407; + public static final int GUITAR_STRUM_DOWN = 408; + public static final int GUITAR_STICK = 409; + public static final int GUITAR_STICK_UP = 410; + public static final int GUITAR_STICK_DOWN = 411; + public static final int GUITAR_STICK_LEFT = 412; + public static final int GUITAR_STICK_RIGHT = 413; + public static final int GUITAR_WHAMMY_BAR = 414; + public static final int DRUMS_BUTTON_MINUS = 500; + public static final int DRUMS_BUTTON_PLUS = 501; + public static final int DRUMS_PAD_RED = 502; + public static final int DRUMS_PAD_YELLOW = 503; + public static final int DRUMS_PAD_BLUE = 504; + public static final int DRUMS_PAD_GREEN = 505; + public static final int DRUMS_PAD_ORANGE = 506; + public static final int DRUMS_PAD_BASS = 507; + public static final int DRUMS_STICK = 508; + public static final int DRUMS_STICK_UP = 509; + public static final int DRUMS_STICK_DOWN = 510; + public static final int DRUMS_STICK_LEFT = 511; + public static final int DRUMS_STICK_RIGHT = 512; + public static final int TURNTABLE_BUTTON_GREEN_LEFT = 600; + public static final int TURNTABLE_BUTTON_RED_LEFT = 601; + public static final int TURNTABLE_BUTTON_BLUE_LEFT = 602; + public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 603; + public static final int TURNTABLE_BUTTON_RED_RIGHT = 604; + public static final int TURNTABLE_BUTTON_BLUE_RIGHT = 605; + public static final int TURNTABLE_BUTTON_MINUS = 606; + public static final int TURNTABLE_BUTTON_PLUS = 607; + public static final int TURNTABLE_BUTTON_HOME = 608; + public static final int TURNTABLE_BUTTON_EUPHORIA = 609; + public static final int TURNTABLE_TABLE_LEFT = 610; + public static final int TURNTABLE_TABLE_LEFT_LEFT = 611; + public static final int TURNTABLE_TABLE_LEFT_RIGHT = 612; + public static final int TURNTABLE_TABLE_RIGHT = 613; + public static final int TURNTABLE_TABLE_RIGHT_LEFT = 614; + public static final int TURNTABLE_TABLE_RIGHT_RIGHT = 615; + public static final int TURNTABLE_STICK = 616; + public static final int TURNTABLE_STICK_UP = 617; + public static final int TURNTABLE_STICK_DOWN = 618; + public static final int TURNTABLE_STICK_LEFT = 619; + public static final int TURNTABLE_STICK_RIGHT = 620; + public static final int TURNTABLE_EFFECT_DIAL = 621; + public static final int TURNTABLE_CROSSFADE = 622; + public static final int TURNTABLE_CROSSFADE_LEFT = 623; + public static final int TURNTABLE_CROSSFADE_RIGHT = 624; } /** diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java index d1c5e92600..ea7201710b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java @@ -49,10 +49,67 @@ public final class UserPreferences editor.putBoolean("OverclockEnable", getConfig("Dolphin.ini", "Core", "OverclockEnable", "False").equals("True")); editor.putString("Overclock", getConfig("Dolphin.ini", "Core", "Overclock", "100")); - editor.putString("WiimoteExtension_4", getConfig("WiimoteNew.ini", "Wiimote1", "Extension", "None")); - editor.putString("WiimoteExtension_5", getConfig("WiimoteNew.ini", "Wiimote2", "Extension", "None")); - editor.putString("WiimoteExtension_6", getConfig("WiimoteNew.ini", "Wiimote3", "Extension", "None")); - editor.putString("WiimoteExtension_7", getConfig("WiimoteNew.ini", "Wiimote4", "Extension", "None")); + // Load analog ranges from GCPadNew.ini and WiimoteNew.ini + editor.putString("mainRadius0", getConfig("GCPadNew.ini", "GCPad1", "Main Stick/Radius", "100,000000")); + editor.putString("cStickRadius0", getConfig("GCPadNew.ini", "GCPad1", "C-Stick/Radius", "100,000000")); + editor.putString("inputThres0", getConfig("GCPadNew.ini", "GCPad1", "Triggers/Threshold", "90,000000")); + editor.putString("mainRadius1", getConfig("GCPadNew.ini", "GCPad2", "Main Stick/Radius", "100,000000")); + editor.putString("cStickRadius1", getConfig("GCPadNew.ini", "GCPad2", "C-Stick/Radius", "100,000000")); + editor.putString("inputThres1", getConfig("GCPadNew.ini", "GCPad2", "Triggers/Threshold", "90,000000")); + editor.putString("mainRadius2", getConfig("GCPadNew.ini", "GCPad3", "Main Stick/Radius", "100,000000")); + editor.putString("cStickRadius2", getConfig("GCPadNew.ini", "GCPad3", "C-Stick/Radius", "100,000000")); + editor.putString("inputThres2", getConfig("GCPadNew.ini", "GCPad3", "Triggers/Threshold", "90,000000")); + editor.putString("mainRadius3", getConfig("GCPadNew.ini", "GCPad4", "Main Stick/Radius", "100,000000")); + editor.putString("cStickRadius3", getConfig("GCPadNew.ini", "GCPad4", "C-Stick/Radius", "100,000000")); + editor.putString("inputThres3", getConfig("GCPadNew.ini", "GCPad4", "Triggers/Threshold", "90,000000")); + + editor.putString("tiltRange4", getConfig("WiimoteNew.ini", "Wiimote1", "Tilt/Modifier/Range", "50,00000")); + editor.putString("tiltRange5", getConfig("WiimoteNew.ini", "Wiimote2", "Tilt/Modifier/Range", "50,00000")); + editor.putString("tiltRange6", getConfig("WiimoteNew.ini", "Wiimote3", "Tilt/Modifier/Range", "50,00000")); + editor.putString("tiltRange7", getConfig("WiimoteNew.ini", "Wiimote4", "Tilt/Modifier/Range", "50,00000")); + + editor.putString("nunchukRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", "100,000000")); + editor.putString("nunchukRange4", getConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Tilt/Modifier/Range", "50,00000")); + editor.putString("nunchukRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", "100,000000")); + editor.putString("nunchukRange5", getConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Tilt/Modifier/Range", "50,00000")); + editor.putString("nunchukRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", "100,000000")); + editor.putString("nunchukRange6", getConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Tilt/Modifier/Range", "50,00000")); + editor.putString("nunchukRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", "100,000000")); + editor.putString("nunchukRange7", getConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Tilt/Modifier/Range", "50,00000")); + + editor.putString("classicLRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Left Stick/Radius", "100,000000")); + editor.putString("classicRRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Right Stick/Radius", "100,000000")); + editor.putString("classicThres4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Triggers/Threshold", "90,000000")); + editor.putString("classicLRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Left Stick/Radius", "100,000000")); + editor.putString("classicRRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Right Stick/Radius", "100,000000")); + editor.putString("classicThres5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Triggers/Threshold", "90,000000")); + editor.putString("classicLRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Left Stick/Radius", "100,000000")); + editor.putString("classicRRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Right Stick/Radius", "100,000000")); + editor.putString("classicThres6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Triggers/Threshold", "90,000000")); + editor.putString("classicLRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Left Stick/Radius", "100,000000")); + editor.putString("classicRRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Right Stick/Radius", "100,000000")); + editor.putString("classicThres7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Triggers/Threshold", "90,000000")); + + editor.putString("guitarRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Guitar/Stick/Radius", "100,000000")); + editor.putString("guitarRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Guitar/Stick/Radius", "100,000000")); + editor.putString("guitarRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Guitar/Stick/Radius", "100,000000")); + editor.putString("guitarRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Guitar/Stick/Radius", "100,000000")); + + editor.putString("drumsRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Drums/Stick/Radius", "100,000000")); + editor.putString("drumsRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Drums/Stick/Radius", "100,000000")); + editor.putString("drumsRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Drums/Stick/Radius", "100,000000")); + editor.putString("drumsRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Drums/Stick/Radius", "100,000000")); + + editor.putString("turntableRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Turntable/Stick/Radius", "100,000000")); + editor.putString("turntableRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Turntable/Stick/Radius", "100,000000")); + editor.putString("turntableRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Turntable/Stick/Radius", "100,000000")); + editor.putString("turntableRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Turntable/Stick/Radius", "100,000000")); + + // Load Wiimote Extension settings from WiimoteNew.ini + editor.putString("wiimoteExtension4", getConfig("WiimoteNew.ini", "Wiimote1", "Extension", "None")); + editor.putString("wiimoteExtension5", getConfig("WiimoteNew.ini", "Wiimote2", "Extension", "None")); + editor.putString("wiimoteExtension6", getConfig("WiimoteNew.ini", "Wiimote3", "Extension", "None")); + editor.putString("wiimoteExtension7", getConfig("WiimoteNew.ini", "Wiimote4", "Extension", "None")); editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL")); editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True")); @@ -147,11 +204,73 @@ public final class UserPreferences boolean overclockEnabled = prefs.getBoolean("OverclockEnable", false); String overclockSetting = prefs.getString("Overclock", "100"); + // Current GC analog range setup. Falls back to default upon error. + String currentMainRadius0 = prefs.getString("mainRadius0", "100,000000"); + String currentCStickRadius0 = prefs.getString("cStickRadius0", "100,000000"); + String currentInputThres0 = prefs.getString("inputThres0", "90,000000"); + String currentMainRadius1 = prefs.getString("mainRadius1", "100,000000"); + String currentCStickRadius1 = prefs.getString("cStickRadius1", "100,000000"); + String currentInputThres1 = prefs.getString("inputThres1", "90,000000"); + String currentMainRadius2 = prefs.getString("mainRadius2", "100,000000"); + String currentCStickRadius2 = prefs.getString("cStickRadius2", "100,000000"); + String currentInputThres2 = prefs.getString("inputThres2", "90,000000"); + String currentMainRadius3 = prefs.getString("mainRadius3", "100,000000"); + String currentCStickRadius3 = prefs.getString("cStickRadius3", "100,000000"); + String currentInputThres3 = prefs.getString("inputThres3", "90,000000"); + + // Current Wii analog range setup. Falls back to default on error. + String currentTiltRange4 = prefs.getString("tiltRange4", "50,000000"); + String currentTiltRange5 = prefs.getString("tiltRange5", "50,000000"); + String currentTiltRange6 = prefs.getString("tiltRange6", "50,000000"); + String currentTiltRange7 = prefs.getString("tiltRange7", "50,000000"); + + // Current Nunchuk analog range setup. Falls back to default upon error. + String currentNunchukRadius4 = prefs.getString("nunchukRadius4", "100,000000"); + String currentNunchukRange4 = prefs.getString("nunchukRange4", "50,000000"); + String currentNunchukRadius5 = prefs.getString("nunchukRadius5", "100,000000"); + String currentNunchukRange5 = prefs.getString("nunchukRange5", "50,000000"); + String currentNunchukRadius6 = prefs.getString("nunchukRadius6", "100,000000"); + String currentNunchukRange6 = prefs.getString("nunchukRange6", "50,000000"); + String currentNunchukRadius7 = prefs.getString("nunchukRadius7", "100,000000"); + String currentNunchukRange7 = prefs.getString("nunchukRange7", "50,000000"); + + // Current Classic analog range setup. Falls back to 100,000000 upon error. + String currentClassicLRadius4 = prefs.getString("classicLRadius4", "100,000000"); + String currentClassicRRadius4 = prefs.getString("classicRRadius4", "100,000000"); + String currentClassicThres4 = prefs.getString("classicThres4", "90,000000"); + String currentClassicLRadius5 = prefs.getString("classicLRadius5", "100,000000"); + String currentClassicRRadius5 = prefs.getString("classicRRadius5", "100,000000"); + String currentClassicThres5 = prefs.getString("classicThres5", "90,000000"); + String currentClassicLRadius6 = prefs.getString("classicLRadius6", "100,000000"); + String currentClassicRRadius6 = prefs.getString("classicRRadius6", "100,000000"); + String currentClassicThres6 = prefs.getString("classicThres6", "90,000000"); + String currentClassicLRadius7 = prefs.getString("classicLRadius7", "100,000000"); + String currentClassicRRadius7 = prefs.getString("classicRRadius7", "100,000000"); + String currentClassicThres7 = prefs.getString("classicThres7", "90,000000"); + + // Current Guitar analog range setup. Falls back to default upon error. + String currentGuitarRadius4 = prefs.getString("guitarRadius4", "100,000000"); + String currentGuitarRadius5 = prefs.getString("guitarRadius5", "100,000000"); + String currentGuitarRadius6 = prefs.getString("guitarRadius6", "100,000000"); + String currentGuitarRadius7 = prefs.getString("guitarRadius7", "100,000000"); + + // Current Drums modifier Radius setup. Falls back to default upon error. + String currentDrumsRadius4 = prefs.getString("drumsRadius4", "100,000000"); + String currentDrumsRadius5 = prefs.getString("drumsRadius5", "100,000000"); + String currentDrumsRadius6 = prefs.getString("drumsRadius6", "100,000000"); + String currentDrumsRadius7 = prefs.getString("drumsRadius7", "100,000000"); + + // Current Turntable analog range setup. Falls back to default upon error. + String currentTurntableRadius4 = prefs.getString("turntableRadius4", "100,000000"); + String currentTurntableRadius5 = prefs.getString("turntableRadius5", "100,000000"); + String currentTurntableRadius6 = prefs.getString("turntableRadius6", "100,000000"); + String currentTurntableRadius7 = prefs.getString("turntableRadius7", "100,000000"); + // Current wiimote extension setup. Falls back to no extension upon error. - String WiimoteExtension_4 = prefs.getString("WiimoteExtension_4", "None"); - String WiimoteExtension_5 = prefs.getString("WiimoteExtension_5", "None"); - String WiimoteExtension_6 = prefs.getString("WiimoteExtension_6", "None"); - String WiimoteExtension_7 = prefs.getString("WiimoteExtension_7", "None"); + String currentWiimoteExtension4 = prefs.getString("wiimoteExtension4", "None"); + String currentWiimoteExtension5 = prefs.getString("wiimoteExtension5", "None"); + String currentWiimoteExtension6 = prefs.getString("wiimoteExtension6", "None"); + String currentWiimoteExtension7 = prefs.getString("wiimoteExtension7", "None"); // Current video backend being used. Falls back to software rendering upon error. String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering"); @@ -233,11 +352,73 @@ public final class UserPreferences NativeLibrary.SetConfig("Dolphin.ini", "Core", "OverclockEnable", overclockEnabled ? "True" : "False"); NativeLibrary.SetConfig("Dolphin.ini", "Core", "Overclock", overclockSetting); + // GameCube analog ranges Setup + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "Main Stick/Radius", currentMainRadius0); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "C-Stick/Radius", currentCStickRadius0); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "Triggers/Threshold", currentInputThres0); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "Main Stick/Radius", currentMainRadius1); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "C-Stick/Radius", currentCStickRadius1); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "Triggers/Threshold", currentInputThres1); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "Main Stick/Radius", currentMainRadius2); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "C-Stick/Radius", currentCStickRadius2); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "Triggers/Threshold", currentInputThres2); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "Main Stick/Radius", currentMainRadius3); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "C-Stick/Radius", currentCStickRadius3); + NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "Triggers/Threshold", currentInputThres3); + + // Wiimote analog ranges Setup + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Tilt/Modifier/Range", currentTiltRange4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Tilt/Modifier/Range", currentTiltRange5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Tilt/Modifier/Range", currentTiltRange6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Tilt/Modifier/Range", currentTiltRange7); + + // Nunchuk analog ranges Setup + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", currentNunchukRadius4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", currentNunchukRange4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", currentNunchukRadius5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", currentNunchukRange5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", currentNunchukRadius6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", currentNunchukRange6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", currentNunchukRadius7); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", currentNunchukRange7); + + // Classic analog ranges Setup + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Left Stick/Radius", currentClassicLRadius4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Right Stick/Radius", currentClassicRRadius4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Triggers/Threshold", currentClassicThres4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Left Stick/Radius", currentClassicLRadius5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Right Stick/Radius", currentClassicRRadius5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Triggers/Threshold", currentClassicThres5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Left Stick/Radius", currentClassicLRadius6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Right Stick/Radius", currentClassicRRadius6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Triggers/Threshold", currentClassicThres6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Left Stick/Radius", currentClassicLRadius7); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Right Stick/Radius", currentClassicRRadius7); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Triggers/Threshold", currentClassicThres7); + + // Guitar analog ranges Setup + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Guitar/Stick/Radius", currentGuitarRadius4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Guitar/Stick/Radius", currentGuitarRadius5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Guitar/Stick/Radius", currentGuitarRadius6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Guitar/Stick/Radius", currentGuitarRadius7); + + // Drums analog ranges Setup + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Drums/Stick/Radius", currentDrumsRadius4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Drums/Stick/Radius", currentDrumsRadius5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Drums/Stick/Radius", currentDrumsRadius6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Drums/Stick/Radius", currentDrumsRadius7); + + // Turntable analog ranges Setup + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Turntable/Stick/Radius", currentTurntableRadius4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Turntable/Stick/Radius", currentTurntableRadius5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Turntable/Stick/Radius", currentTurntableRadius6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Turntable/Stick/Radius", currentTurntableRadius7); + // Wiimote Extension Settings - NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", WiimoteExtension_4); - NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Extension", WiimoteExtension_5); - NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Extension", WiimoteExtension_6); - NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Extension", WiimoteExtension_7); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", currentWiimoteExtension4); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Extension", currentWiimoteExtension5); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Extension", currentWiimoteExtension6); + NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Extension", currentWiimoteExtension7); // General Video Settings NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend); diff --git a/Source/Android/app/src/main/res/values-ja/strings.xml b/Source/Android/app/src/main/res/values-ja/strings.xml index 10efaf6a2e..6fc9a8f7ea 100644 --- a/Source/Android/app/src/main/res/values-ja/strings.xml +++ b/Source/Android/app/src/main/res/values-ja/strings.xml @@ -1,4 +1,4 @@ - + @@ -73,17 +73,15 @@ 入力オーバーレイレイアウト 入力オーバーレイのためのボタンのレイアウト。 コントロールのサイズを調整し - ゲームキューブコントローラの入力バインディング コントローラ1 コントローラ2 コントローラ3 コントローラ4 コントローラを有効 - Wiiリモコンの入力バインディング - Wiiリモコン1 - Wiiリモコン2 - Wiiリモコン3 - Wiiリモコン4 + Wiiリモコン1 + Wiiリモコン2 + Wiiリモコン3 + Wiiリモコン4 Wiiリモコンを有効 入力バインディング %1$sにバインドするための入力を移動または押してください。 diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index a799e7788f..cf812c87e9 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -14,7 +14,7 @@ 1 2 - + @string/interpreter @@ -34,7 +34,7 @@ 0 4 - + @string/interpreter @@ -52,7 +52,7 @@ 0 5 - + @string/software_renderer @@ -72,7 +72,7 @@ Software Renderer OGL - + @string/software_renderer @@ -83,22 +83,22 @@ - "None" - "Nunchuk" - "Classic" - "Guitar" - "Drums" - "Turntable" + "None" + "Nunchuk" + "Classic" + "Guitar" + "Drums" + "Turntable" - None - Nunchuk - Classic - Guitar - Drums - Turntable + None + Nunchuk + Classic + Guitar + Drums + Turntable - + @string/disabled @@ -112,7 +112,7 @@ RAM (cached) RAM (uncached) - + @string/texture_cache_accuracy_low @@ -124,7 +124,33 @@ 512 0 - + + + + 100 + 90 + 80 + 70 + 60 + 50 + 40 + 30 + 20 + 10 + + + 100,000000 + 90,000000 + 80,000000 + 70,000000 + 60,000000 + 50,000000 + 40,000000 + 30,000000 + 20,000000 + 10,000000 + + @string/disabled @@ -136,15 +162,17 @@ Virtual Real - + 1x Native (640x528) 1.5x Native (960x792) - 2x Native (1280x1056) + 2x Native (1280x1056) for 720p 2.5x Native (1600x1320) - 3x Native (1920x1584) + 3x Native (1920x1584) for 1080p 4x Native (2560x2112) + 5x Native (3200x2640) + 6x Native (3840x3168) for 4K 2 @@ -153,6 +181,8 @@ 5 6 7 + 8 + 9 diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 250bc0462a..7819de79cc 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -75,27 +75,42 @@ Input Overlay Layout Button layout for the input overlay. Adjust the control size - GameCube Controller Bindings - Controller 1 - Controller 2 - Controller 3 - Controller 4 + Controller Bindings + GameCube Controllers + Wii Controllers (Wiimotes) + GameCube Controller 1 + GameCube Controller 2 + GameCube Controller 3 + GameCube Controller 4 Enable controller - Wiimote Bindings - Wiimote 1 - Wiimote 2 - Wiimote 3 - Wiimote 4 + Buttons + Directional Keys + Main Stick Navigation + C-Stick Navigation + Analog Triggers + Modifier Range + Analog Radius (High value = High sensitivity) + Analog Threshold (Low value = High sensitivity) + Wiimote 1 + Wiimote 2 + Wiimote 3 + Wiimote 4 Enable Wiimote + IR Motion Controls + Swing Navigation + Tilt Navigation + Shake Controls + Analog Stick Navigation Wiimote Extension - Choose which Wii Extension you want to use with the Wiimote - Show Nunchuk Extension configurations - Show Classic Extension configurations - Show Guitar Extension configurations - Show Drums Extension configurations - Show Turntable Extension configurations + Choose which Extension you want to use with the Wiimote + Nunchuk + Classic Controller + Guitar + Drums + Turntable Input Binding Press or move an input to bind it to %1$s. + Button A Button B @@ -117,12 +132,17 @@ C Stick Right Trigger L Trigger R + Button 1 Button 2 Button + Button - Button Home + Stick Up + Stick Down + Stick Left + Stick Right IR Up IR Down IR Left @@ -140,103 +160,68 @@ Tilt Backward Tilt Left Tilt Right + Tilt Modifier Shake X Shake Y Shake Z + - Nunchuk Button C - Nunchuk Button Z - Nunchuk Stick Up - Nunchuk Stick Down - Nunchuk Stick Left - Nunchuk Stick Right - Nunchuk Swing Up - Nunchuk Swing Down - Nunchuk Swing Left - Nunchuk Swing Right - Nunchuk Swing Forward - Nunchuk Swing Backward - Nunchuk Tilt Forward - Nunchuk Tilt Backward - Nunchuk Tilt Left - Nunchuk Tilt Right - Nunchuk Shake X - Nunchuk Shake Y - Nunchuk Shake Z + Button C + - Classic Controller Button A - Classic Controller Button B - Classic Controller Button X - Classic Controller Button Y - Classic Controller Button - - Classic Controller Button + - Classic Controller Button Home - Classic Controller Button ZL - Classic Controller Button ZR - Classic Controller D-Pad Up - Classic Controller D-Pad Down - Classic Controller D-Pad Left - Classic Controller D-Pad Right - Classic Controller Left Stick Up - Classic Controller Left Stick Down - Classic Controller Left Stick Left - Classic Controller Left Stick Right - Classic Controller Right Stick Up - Classic Controller Right Stick Down - Classic Controller Right Stick Left - Classic Controller Right Stick Right - Classic Controller Left Trigger - Classic Controller Right Trigger + Button ZL + Button ZR + Left Analog Stick Navigation + Left Stick Up + Left Stick Down + Left Stick Left + Left Stick Right + Right Analog Stick Navigation + Right Stick Up + Right Stick Down + Right Stick Left + Right Stick Right + - Guitar Button - - Guitar Button + - Guitar Fret Red - Guitar Fret Red - Guitar Fret Yellow - Guitar Fret Blue - Guitar Fret Orange - Guitar Strum Up - Guitar Strum Down - Guitar Stick Up - Guitar Stick Down - Guitar Stick Left - Guitar Stick Right - Guitar Whammy Bar + Guitar Frets + Red Fret + Red Fret + Yellow Fret + Blue Fret + Orange Fret + Strum Up + Strum Down + Guitar Whammy + Whammy Bar + - Drums Button - - Drums Button + - Drums Pad Red - Drums Pad Yellow - Drums Pad Blue - Drums Pad Green - Drums Pad Orange - Drums Pad Bass - Drums Stick Up - Drums Stick Down - Drums Stick Left - Drums Stick Right + Drum Pads + Red Pad + Yellow Pad + Blue Pad + Green Pad + Orange Pad + Bass Pad + - Turntable Button Green Left - Turntable Button Red Left - Turntable Button Blue Left - Turntable Button Green Right - Turntable Button Red Right - Turntable Button Blue Right - Turntable Button - - Turntable Button + - Turntable Button Home - Turntable Button Euphoria - Turntable Left Table Left - Turntable Left Table Right - Turntable Right Table Left - Turntable Right Table Right - Turntable Stick Up - Turntable Stick Down - Turntable Stick Left - Turntable Stick Right - Turntable Effekt Dial - Turntable Crossfade Left - Turntable Crossfade Right + Green Left + Red Left + Blue Left + Green Right + Red Right + Blue Right + Euphoria + Left Turntable + Left Table Left + Left Table Right + Right Turntable + Right Table Left + Right Table Right + Effects + Effect Dial + Crossfade + Crossfade Left + Crossfade Right Interpreter @@ -346,6 +331,7 @@ CPU Settings Input Settings + Extension Bindings Video Settings Emulation Activity diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml index 8fb40a7c06..3a5bc32422 100644 --- a/Source/Android/app/src/main/res/xml/preferences.xml +++ b/Source/Android/app/src/main/res/xml/preferences.xml @@ -64,3265 +64,4591 @@ - + - - + android:key="controller_bindings" + android:title="@string/controller_bindings"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:key="gamecube_bindings_control_0" + android:title="@string/controller_0"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:key="gamecube_bindings_control_1" + android:title="@string/controller_1"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + - + + android:key="gamecube_bindings_control_2" + android:title="@string/controller_2"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:key="gamecube_bindings_control_3" + android:title="@string/controller_3"> - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + android:key="wiimote_bindings_4" + android:title="@string/wiimote_0"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:key="wiimote_bindings_5" + android:title="@string/wiimote_1"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:key="wiimote_bindings_6" + android:title="@string/wiimote_2"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:key="wiimote_bindings_7" + android:title="@string/wiimote_3"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3332,7 +4658,6 @@ android:key="preferences_video" android:title="@string/preferences_video"> -