diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini index 41082fd8de..de39cd4a59 100644 --- a/Source/Android/app/src/main/assets/WiimoteNew.ini +++ b/Source/Android/app/src/main/assets/WiimoteNew.ini @@ -7,17 +7,131 @@ Buttons/2 = `Button 28` Buttons/- = `Button 24` Buttons/+ = `Button 25` Buttons/Home = `Button 26` -IR/Up = -IR/Down = -IR/Left = -IR/Right = -Shake/X = -Shake/Y = -Shake/Z = 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` +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` Source = 1 [Wiimote2] Device = Android/5/Touchscreen @@ -28,17 +142,131 @@ Buttons/2 = `Button 28` Buttons/- = `Button 24` Buttons/+ = `Button 25` Buttons/Home = `Button 26` -IR/Up = -IR/Down = -IR/Left = -IR/Right = -Shake/X = -Shake/Y = -Shake/Z = 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` +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` Source = 1 [Wiimote3] Device = Android/6/Touchscreen @@ -49,17 +277,131 @@ Buttons/2 = `Button 28` Buttons/- = `Button 24` Buttons/+ = `Button 25` Buttons/Home = `Button 26` -IR/Up = -IR/Down = -IR/Left = -IR/Right = -Shake/X = -Shake/Y = -Shake/Z = 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` +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` Source = 1 [Wiimote4] Device = Android/7/Touchscreen @@ -70,15 +412,129 @@ Buttons/2 = `Button 28` Buttons/- = `Button 24` Buttons/+ = `Button 25` Buttons/Home = `Button 26` -IR/Up = -IR/Down = -IR/Left = -IR/Right = -Shake/X = -Shake/Y = -Shake/Z = 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` +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` 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 db387344bd..5ea0ad74ae 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 @@ -25,39 +25,156 @@ public final class NativeLibrary */ public static final class ButtonType { - public static final int BUTTON_A = 0; - public static final int BUTTON_B = 1; - public static final int BUTTON_START = 2; - public static final int BUTTON_X = 3; - public static final int BUTTON_Y = 4; - public static final int BUTTON_Z = 5; - public static final int BUTTON_UP = 6; - public static final int BUTTON_DOWN = 7; - public static final int BUTTON_LEFT = 8; - public static final int BUTTON_RIGHT = 9; - public static final int STICK_MAIN = 10; - public static final int STICK_MAIN_UP = 11; - public static final int STICK_MAIN_DOWN = 12; - public static final int STICK_MAIN_LEFT = 13; - public static final int STICK_MAIN_RIGHT = 14; - public static final int STICK_C = 15; - public static final int STICK_C_UP = 16; - public static final int STICK_C_DOWN = 17; - public static final int STICK_C_LEFT = 18; - 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 BUTTON_A = 0; + public static final int BUTTON_B = 1; + public static final int BUTTON_START = 2; + public static final int BUTTON_X = 3; + public static final int BUTTON_Y = 4; + public static final int BUTTON_Z = 5; + public static final int BUTTON_UP = 6; + public static final int BUTTON_DOWN = 7; + public static final int BUTTON_LEFT = 8; + public static final int BUTTON_RIGHT = 9; + public static final int STICK_MAIN = 10; + public static final int STICK_MAIN_UP = 11; + public static final int STICK_MAIN_DOWN = 12; + public static final int STICK_MAIN_LEFT = 13; + public static final int STICK_MAIN_RIGHT = 14; + public static final int STICK_C = 15; + public static final int STICK_C_UP = 16; + public static final int STICK_C_DOWN = 17; + public static final int STICK_C_LEFT = 18; + 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; } /** @@ -84,7 +201,7 @@ public final class NativeLibrary * * @param Device The input descriptor of the gamepad. * @param Button Key code identifying which button was pressed. - * @param Action Mask identifying which action is happing (button pressed down, or button released). + * @param Action Mask identifying which action is happening (button pressed down, or button released). * * @return If we handled the button press. */ 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 dd8959129b..bfdd33cf92 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 @@ -47,6 +47,11 @@ public final class UserPreferences editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "True").equals("True")); + 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")); + editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL")); editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True")); editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True")); @@ -135,7 +140,13 @@ public final class UserPreferences boolean isUsingDualCore = prefs.getBoolean("dualCorePref", true); // Current CPU core being used. Falls back to interpreter upon error. - String currentEmuCore = prefs.getString("cpuCorePref", "0"); + String currentEmuCore = prefs.getString("cpuCorePref", "0"); + + // 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"); // Current video backend being used. Falls back to software rendering upon error. String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering"); @@ -213,6 +224,12 @@ public final class UserPreferences // CPU related Settings NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUCore", currentEmuCore); NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUThread", isUsingDualCore ? "True" : "False"); + + // 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); // General Video Settings NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend); diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index 85ebb4ebc1..a799e7788f 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -80,6 +80,24 @@ Software Renderer + + + + "None" + "Nunchuk" + "Classic" + "Guitar" + "Drums" + "Turntable" + + + None + Nunchuk + Classic + Guitar + Drums + Turntable + diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index a6f004d4d3..cb27f7951e 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -87,6 +87,13 @@ Wiimote 3 Wiimote 4 Enable Wiimote + 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 Input Binding Press or move an input to bind it to %1$s. @@ -122,10 +129,13 @@ IR Right IR Forward IR Backward + IR Hide Swing Up Swing Down Swing Left Swing Right + Swing Forward + Swing Backward Tilt Forward Tilt Backward Tilt Left @@ -133,6 +143,100 @@ 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 + + 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 + + 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 + + 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 + + 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 Interpreter diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml index 5e98e54bfc..863cdb298b 100644 --- a/Source/Android/app/src/main/res/xml/preferences.xml +++ b/Source/Android/app/src/main/res/xml/preferences.xml @@ -576,6 +576,14 @@ android:key="enableWiimote1" android:title="@string/enable_wiimote"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -718,6 +1339,606 @@ android:summary="%s" android:title="@string/dpad_right"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -794,6 +2023,606 @@ android:summary="%s" android:title="@string/dpad_right"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -870,6 +2707,606 @@ android:summary="%s" android:title="@string/dpad_right"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index cede1887d4..5a282dd81b 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -47,6 +47,120 @@ namespace ButtonManager "WiimoteDown", "WiimoteLeft", "WiimoteRight", + "WiimoteIRUp", + "WiimoteIRDown", + "WiimoteIRLeft", + "WiimoteIRRight", + "WiimoteIRForward", + "WiimoteIRBackward", + "WiimoteIRHide", + "WiimoteSwingUp", + "WiimoteSwingDown", + "WiimoteSwingLeft", + "WiimoteSwingRight", + "WiimoteSwingForward", + "WiimoteSwingBackward", + "WiimoteTiltForward", + "WiimoteTiltBackward", + "WiimoteTiltLeft", + "WiimoteTiltRight", + "WiimoteShakeX", + "WiimoteShakeY", + "WiimoteShakeZ", + // Nunchuk + "NunchukC", + "NunchukZ", + "NunchukUp", + "NunchukDown", + "NunchukLeft", + "NunchukRight", + "NunchukSwingUp", + "NunchukSwingDown", + "NunchukSwingLeft", + "NunchukSwingRight", + "NunchukSwingForward", + "NunchukSwingBackward", + "NunchukTiltForward", + "NunchukTiltBackward", + "NunchukTiltLeft", + "NunchukTiltRight", + "NunchukShakeX", + "NunchukShakeY", + "NunchukShakeZ", + // Classic + "ClassicA", + "ClassicB", + "ClassicX", + "ClassicY", + "ClassicMinus", + "ClassicPlus", + "ClassicHome", + "ClassicZL", + "ClassicZR", + "ClassicUp", + "ClassicDown", + "ClassicLeft", + "ClassicRight", + "ClassicLeftStickUp", + "ClassicLeftStickDown", + "ClassicLeftStickLeft", + "ClassicLeftStickRight", + "ClassicRightStickUp", + "ClassicRightStickDown", + "ClassicRightStickLeft", + "ClassicRightStickRight", + "ClassicTriggerL", + "ClassicTriggerR", + // Guitar + "GuitarMinus", + "GuitarPlus", + "GuitarGreen", + "GuitarRed", + "GuitarYellow", + "GuitarBue", + "GuitarOrange", + "GuitarStrumUp", + "GuitarStrumDown", + "GuitarUp", + "GuitarDown", + "GuitarLeft", + "GuitarRight", + "GuitarWhammy", + // Drums + "DrumsMinus", + "DrumsPlus", + "DrumsRed", + "DrumsYellow", + "DrumsBlue", + "DrumsGreen", + "DrumsOrange", + "DrumsBass", + "DrumsUp", + "DrumsDown", + "DrumsLeft", + "DrumsRight", + // Turntable + "TurntableGreenLeft", + "TurntableRedLeft", + "TurntableBlueLeft", + "TurntableGreenRight", + "TurntableRedRight", + "TurntableBlueRight", + "TurntableMinus", + "TurntablePlus", + "TurntableHome", + "TurntableEuphoria", + "TurntableLeftTLeft", + "TurntableLeftTRight", + "TurntableRightTLeft", + "TurntableRightTRight", + "TurntableUp", + "TurntableDown", + "TurntableLeft", + "TurntableRight", + "TurntableEffDial", + "TurntableCrossLeft", + "TurntableCrossRight", }; std::vector configTypes = { // GC @@ -82,6 +196,120 @@ namespace ButtonManager WIIMOTE_DOWN, WIIMOTE_LEFT, WIIMOTE_RIGHT, + WIIMOTE_IR_UP, + WIIMOTE_IR_DOWN, + WIIMOTE_IR_LEFT, + WIIMOTE_IR_RIGHT, + WIIMOTE_IR_FORWARD, + WIIMOTE_IR_BACKWARD, + WIIMOTE_IR_HIDE, + WIIMOTE_SWING_UP, + WIIMOTE_SWING_DOWN, + WIIMOTE_SWING_LEFT, + WIIMOTE_SWING_RIGHT, + WIIMOTE_SWING_FORWARD, + WIIMOTE_SWING_BACKWARD, + WIIMOTE_TILT_FORWARD, + WIIMOTE_TILT_BACKWARD, + WIIMOTE_TILT_LEFT, + WIIMOTE_TILT_RIGHT, + WIIMOTE_SHAKE_X, + WIIMOTE_SHAKE_Y, + WIIMOTE_SHAKE_Z, + // Nunchuk + 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, + // Classic + CLASSIC_BUTTON_A, + CLASSIC_BUTTON_B, + CLASSIC_BUTTON_X, + CLASSIC_BUTTON_Y, + CLASSIC_BUTTON_MINUS, + CLASSIC_BUTTON_PLUS, + CLASSIC_BUTTON_HOME, + CLASSIC_BUTTON_ZL, + CLASSIC_BUTTON_ZR, + CLASSIC_DPAD_UP, + CLASSIC_DPAD_DOWN, + CLASSIC_DPAD_LEFT, + CLASSIC_DPAD_RIGHT, + CLASSIC_STICK_LEFT_UP, + CLASSIC_STICK_LEFT_DOWN, + CLASSIC_STICK_LEFT_LEFT, + CLASSIC_STICK_LEFT_RIGHT, + CLASSIC_STICK_RIGHT_UP, + CLASSIC_STICK_RIGHT_DOWN, + CLASSIC_STICK_RIGHT_LEFT, + CLASSIC_STICK_RIGHT_RIGHT, + CLASSIC_TRIGGER_L, + CLASSIC_TRIGGER_R, + // Guitar + GUITAR_BUTTON_MINUS, + GUITAR_BUTTON_PLUS, + GUITAR_FRET_GREEN, + 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, + // Drums + DRUMS_BUTTON_MINUS, + DRUMS_BUTTON_PLUS, + 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, + // Turntable + 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_MINUS, + TURNTABLE_BUTTON_PLUS, + TURNTABLE_BUTTON_HOME, + TURNTABLE_BUTTON_EUPHORIA, + TURNTABLE_TABLE_LEFT_LEFT, + TURNTABLE_TABLE_LEFT_RIGHT, + TURNTABLE_TABLE_RIGHT_LEFT, + TURNTABLE_TABLE_RIGHT_RIGHT, + TURNTABLE_STICK_UP, + TURNTABLE_STICK_DOWN, + TURNTABLE_STICK_LEFT, + TURNTABLE_STICK_RIGHT, + TURNTABLE_EFFECT_DIAL, + TURNTABLE_CROSSFADE_LEFT, + TURNTABLE_CROSSFADE_RIGHT, }; static void AddBind(const std::string& dev, sBind *bind) @@ -136,6 +364,131 @@ namespace ButtonManager AddBind(touchScreenKey, new sBind(a, WIIMOTE_DOWN, BIND_BUTTON, WIIMOTE_DOWN, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_LEFT, BIND_BUTTON, WIIMOTE_LEFT, 1.0f)); AddBind(touchScreenKey, new sBind(a, WIIMOTE_RIGHT, BIND_BUTTON, WIIMOTE_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_HIDE, BIND_BUTTON, WIIMOTE_IR_HIDE, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_X, BIND_BUTTON, WIIMOTE_SHAKE_X, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Y, BIND_BUTTON, WIIMOTE_SHAKE_Y, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Z, BIND_BUTTON, WIIMOTE_SHAKE_Z, 1.0f)); + + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_UP, BIND_AXIS, WIIMOTE_IR_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_DOWN, BIND_AXIS, WIIMOTE_IR_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_LEFT, BIND_AXIS, WIIMOTE_IR_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_RIGHT, BIND_AXIS, WIIMOTE_IR_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_FORWARD, BIND_AXIS, WIIMOTE_IR_FORWARD, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_BACKWARD, BIND_AXIS, WIIMOTE_IR_BACKWARD, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_UP, BIND_AXIS, WIIMOTE_SWING_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_DOWN, BIND_AXIS, WIIMOTE_SWING_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_LEFT, BIND_AXIS, WIIMOTE_SWING_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_RIGHT, BIND_AXIS, WIIMOTE_SWING_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_FORWARD, BIND_AXIS, WIIMOTE_SWING_FORWARD, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_SWING_BACKWARD, BIND_AXIS, WIIMOTE_SWING_BACKWARD, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_FORWARD, BIND_AXIS, WIIMOTE_TILT_FORWARD, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_BACKWARD, BIND_AXIS, WIIMOTE_TILT_BACKWARD, 1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_LEFT, BIND_AXIS, WIIMOTE_TILT_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_RIGHT, BIND_AXIS, WIIMOTE_TILT_RIGHT, 1.0f)); + + // Wii: Nunchuk + AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_C, BIND_BUTTON, NUNCHUK_BUTTON_C, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_Z, BIND_BUTTON, NUNCHUK_BUTTON_Z, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_X, BIND_BUTTON, NUNCHUK_SHAKE_X, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Y, BIND_BUTTON, NUNCHUK_SHAKE_Y, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Z, BIND_BUTTON, NUNCHUK_SHAKE_Z, 1.0f)); + + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_UP, BIND_AXIS, NUNCHUK_SWING_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_DOWN, BIND_AXIS, NUNCHUK_SWING_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_LEFT, BIND_AXIS, NUNCHUK_SWING_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_RIGHT, BIND_AXIS, NUNCHUK_SWING_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_FORWARD, BIND_AXIS, NUNCHUK_SWING_FORWARD, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_SWING_BACKWARD, BIND_BUTTON, NUNCHUK_SWING_BACKWARD, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_FORWARD, BIND_AXIS, NUNCHUK_TILT_FORWARD, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_BACKWARD, BIND_AXIS, NUNCHUK_TILT_BACKWARD, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_LEFT, BIND_AXIS, NUNCHUK_TILT_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_RIGHT, BIND_AXIS, NUNCHUK_TILT_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_UP, BIND_AXIS, NUNCHUK_STICK_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_DOWN, BIND_AXIS, NUNCHUK_STICK_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_LEFT, BIND_AXIS, NUNCHUK_STICK_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, NUNCHUK_STICK_RIGHT, BIND_AXIS, NUNCHUK_STICK_RIGHT, 1.0f)); + + // Wii: Classic + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_A, BIND_BUTTON, CLASSIC_BUTTON_A, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_B, BIND_BUTTON, CLASSIC_BUTTON_B, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_X, BIND_BUTTON, CLASSIC_BUTTON_X, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_Y, BIND_BUTTON, CLASSIC_BUTTON_Y, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_MINUS, BIND_BUTTON, CLASSIC_BUTTON_MINUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_PLUS, BIND_BUTTON, CLASSIC_BUTTON_PLUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_HOME, BIND_BUTTON, CLASSIC_BUTTON_HOME, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_ZL, BIND_BUTTON, CLASSIC_BUTTON_ZL, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_BUTTON_ZR, BIND_BUTTON, CLASSIC_BUTTON_ZR, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_UP, BIND_BUTTON, CLASSIC_DPAD_UP, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_DOWN, BIND_BUTTON, CLASSIC_DPAD_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_LEFT, BIND_BUTTON, CLASSIC_DPAD_LEFT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_DPAD_RIGHT, BIND_BUTTON, CLASSIC_DPAD_RIGHT, 1.0f)); + + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_UP, BIND_AXIS, CLASSIC_STICK_LEFT_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_DOWN, BIND_AXIS, CLASSIC_STICK_LEFT_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_LEFT, BIND_AXIS, CLASSIC_STICK_LEFT_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_LEFT_RIGHT, BIND_AXIS, CLASSIC_STICK_LEFT_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_UP, BIND_AXIS, CLASSIC_STICK_RIGHT_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_DOWN, BIND_AXIS, CLASSIC_STICK_RIGHT_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_LEFT, BIND_AXIS, CLASSIC_STICK_RIGHT_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_STICK_RIGHT_RIGHT, BIND_AXIS, CLASSIC_STICK_RIGHT_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_TRIGGER_L, BIND_AXIS, CLASSIC_TRIGGER_L, 1.0f)); + AddBind(touchScreenKey, new sBind(a, CLASSIC_TRIGGER_R, BIND_AXIS, CLASSIC_TRIGGER_R, 1.0f)); + + // Wii: Guitar + AddBind(touchScreenKey, new sBind(a, GUITAR_BUTTON_MINUS, BIND_BUTTON, GUITAR_BUTTON_MINUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_BUTTON_PLUS, BIND_BUTTON, GUITAR_BUTTON_PLUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_GREEN, BIND_BUTTON, GUITAR_FRET_GREEN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_RED, BIND_BUTTON, GUITAR_FRET_RED, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_YELLOW, BIND_BUTTON, GUITAR_FRET_YELLOW, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_BLUE, BIND_BUTTON, GUITAR_FRET_BLUE, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_FRET_ORANGE, BIND_BUTTON, GUITAR_FRET_ORANGE, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_STRUM_UP, BIND_BUTTON, GUITAR_STRUM_UP, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_STRUM_DOWN, BIND_BUTTON, GUITAR_STRUM_DOWN, 1.0f)); + + AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_UP, BIND_AXIS, GUITAR_STICK_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_DOWN, BIND_AXIS, GUITAR_STICK_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_LEFT, BIND_AXIS, GUITAR_STICK_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_STICK_RIGHT, BIND_AXIS, GUITAR_STICK_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, GUITAR_WHAMMY_BAR, BIND_AXIS, GUITAR_WHAMMY_BAR, 1.0f)); + + // Wii: Drums + AddBind(touchScreenKey, new sBind(a, DRUMS_BUTTON_MINUS, BIND_BUTTON, DRUMS_BUTTON_MINUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_BUTTON_PLUS, BIND_BUTTON, DRUMS_BUTTON_PLUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_RED, BIND_BUTTON, DRUMS_PAD_RED, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_YELLOW, BIND_BUTTON, DRUMS_PAD_YELLOW, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_BLUE, BIND_BUTTON, DRUMS_PAD_BLUE, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_GREEN, BIND_BUTTON, DRUMS_PAD_GREEN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_ORANGE, BIND_BUTTON, DRUMS_PAD_ORANGE, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_PAD_BASS, BIND_BUTTON, DRUMS_PAD_BASS, 1.0f)); + + AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_UP, BIND_AXIS, DRUMS_STICK_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_DOWN, BIND_AXIS, DRUMS_STICK_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_LEFT, BIND_AXIS, DRUMS_STICK_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, DRUMS_STICK_RIGHT, BIND_AXIS, DRUMS_STICK_RIGHT, 1.0f)); + + // Wii: Turntable + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_GREEN_LEFT, BIND_BUTTON, TURNTABLE_BUTTON_GREEN_LEFT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_RED_LEFT, BIND_BUTTON, TURNTABLE_BUTTON_RED_LEFT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_BLUE_LEFT, BIND_BUTTON, TURNTABLE_BUTTON_BLUE_LEFT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_GREEN_RIGHT, BIND_BUTTON, TURNTABLE_BUTTON_GREEN_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_RED_RIGHT, BIND_BUTTON, TURNTABLE_BUTTON_RED_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_BLUE_RIGHT, BIND_BUTTON, TURNTABLE_BUTTON_BLUE_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_MINUS, BIND_BUTTON, TURNTABLE_BUTTON_MINUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_PLUS, BIND_BUTTON, TURNTABLE_BUTTON_PLUS, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_HOME, BIND_BUTTON, TURNTABLE_BUTTON_HOME, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_BUTTON_EUPHORIA, BIND_BUTTON, TURNTABLE_BUTTON_EUPHORIA, 1.0f)); + + AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_LEFT_LEFT, BIND_AXIS, TURNTABLE_TABLE_LEFT_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_LEFT_RIGHT, BIND_AXIS, TURNTABLE_TABLE_LEFT_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_RIGHT_LEFT, BIND_AXIS, TURNTABLE_TABLE_RIGHT_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_TABLE_RIGHT_RIGHT, BIND_AXIS, TURNTABLE_TABLE_RIGHT_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_UP, BIND_AXIS, TURNTABLE_STICK_UP, -1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_DOWN, BIND_AXIS, TURNTABLE_STICK_DOWN, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_LEFT, BIND_AXIS, TURNTABLE_STICK_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_STICK_RIGHT, BIND_AXIS, TURNTABLE_STICK_RIGHT, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_EFFECT_DIAL, BIND_AXIS, TURNTABLE_EFFECT_DIAL, 1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_CROSSFADE_LEFT, BIND_AXIS, TURNTABLE_CROSSFADE_LEFT, -1.0f)); + AddBind(touchScreenKey, new sBind(a, TURNTABLE_CROSSFADE_RIGHT, BIND_AXIS, TURNTABLE_CROSSFADE_RIGHT, 1.0f)); } // Init our controller bindings IniFile ini; diff --git a/Source/Core/DolphinWX/Android/ButtonManager.h b/Source/Core/DolphinWX/Android/ButtonManager.h index 672699cb49..e870afa632 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.h +++ b/Source/Core/DolphinWX/Android/ButtonManager.h @@ -46,6 +46,126 @@ namespace ButtonManager WIIMOTE_DOWN = 30, WIIMOTE_LEFT = 31, WIIMOTE_RIGHT = 32, + WIIMOTE_IR_UP = 33, + WIIMOTE_IR_DOWN = 34, + WIIMOTE_IR_LEFT = 35, + WIIMOTE_IR_RIGHT = 36, + WIIMOTE_IR_FORWARD = 37, + WIIMOTE_IR_BACKWARD = 38, + WIIMOTE_IR_HIDE = 39, + WIIMOTE_SWING_UP = 40, + WIIMOTE_SWING_DOWN = 41, + WIIMOTE_SWING_LEFT = 42, + WIIMOTE_SWING_RIGHT = 43, + WIIMOTE_SWING_FORWARD = 44, + WIIMOTE_SWING_BACKWARD = 45, + WIIMOTE_TILT_FORWARD = 46, + WIIMOTE_TILT_BACKWARD = 47, + WIIMOTE_TILT_LEFT = 48, + WIIMOTE_TILT_RIGHT = 49, + WIIMOTE_SHAKE_X = 51, + WIIMOTE_SHAKE_Y = 52, + WIIMOTE_SHAKE_Z = 53, + //Nunchuk + NUNCHUK_BUTTON_C = 54, + NUNCHUK_BUTTON_Z = 55, + NUNCHUK_STICK = 56, + NUNCHUK_STICK_UP = 57, + NUNCHUK_STICK_DOWN = 58, + NUNCHUK_STICK_LEFT = 59, + NUNCHUK_STICK_RIGHT = 60, + NUNCHUK_SWING_UP = 61, + NUNCHUK_SWING_DOWN = 62, + NUNCHUK_SWING_LEFT = 63, + NUNCHUK_SWING_RIGHT = 64, + NUNCHUK_SWING_FORWARD = 65, + NUNCHUK_SWING_BACKWARD = 66, + NUNCHUK_TILT_FORWARD = 67, + NUNCHUK_TILT_BACKWARD = 68, + NUNCHUK_TILT_LEFT = 69, + NUNCHUK_TILT_RIGHT = 70, + NUNCHUK_SHAKE_X = 72, + NUNCHUK_SHAKE_Y = 73, + NUNCHUK_SHAKE_Z = 74, + //Classic + CLASSIC_BUTTON_A = 75, + CLASSIC_BUTTON_B = 76, + CLASSIC_BUTTON_X = 77, + CLASSIC_BUTTON_Y = 78, + CLASSIC_BUTTON_MINUS = 79, + CLASSIC_BUTTON_PLUS = 80, + CLASSIC_BUTTON_HOME = 81, + CLASSIC_BUTTON_ZL = 82, + CLASSIC_BUTTON_ZR = 83, + CLASSIC_DPAD_UP = 84, + CLASSIC_DPAD_DOWN = 85, + CLASSIC_DPAD_LEFT = 86, + CLASSIC_DPAD_RIGHT = 87, + CLASSIC_STICK_LEFT = 88, + CLASSIC_STICK_LEFT_UP = 89, + CLASSIC_STICK_LEFT_DOWN = 90, + CLASSIC_STICK_LEFT_LEFT = 91, + CLASSIC_STICK_LEFT_RIGHT = 92, + CLASSIC_STICK_RIGHT = 93, + CLASSIC_STICK_RIGHT_UP = 94, + CLASSIC_STICK_RIGHT_DOWN = 95, + CLASSIC_STICK_RIGHT_LEFT = 96, + CLASSIC_STICK_RIGHT_RIGHT = 97, + CLASSIC_TRIGGER_L = 98, + CLASSIC_TRIGGER_R = 99, + //Guitar + GUITAR_BUTTON_MINUS = 100, + GUITAR_BUTTON_PLUS = 101, + GUITAR_FRET_GREEN = 102, + GUITAR_FRET_RED = 103, + GUITAR_FRET_YELLOW = 104, + GUITAR_FRET_BLUE = 105, + GUITAR_FRET_ORANGE = 106, + GUITAR_STRUM_UP = 107, + GUITAR_STRUM_DOWN = 108, + GUITAR_STICK = 109, + GUITAR_STICK_UP = 110, + GUITAR_STICK_DOWN = 111, + GUITAR_STICK_LEFT = 112, + GUITAR_STICK_RIGHT = 113, + GUITAR_WHAMMY_BAR = 114, + //Drums + DRUMS_BUTTON_MINUS = 115, + DRUMS_BUTTON_PLUS = 116, + DRUMS_PAD_RED = 117, + DRUMS_PAD_YELLOW = 118, + DRUMS_PAD_BLUE = 119, + DRUMS_PAD_GREEN = 120, + DRUMS_PAD_ORANGE = 121, + DRUMS_PAD_BASS = 122, + DRUMS_STICK = 123, + DRUMS_STICK_UP = 124, + DRUMS_STICK_DOWN = 125, + DRUMS_STICK_LEFT = 126, + DRUMS_STICK_RIGHT = 127, + //Turntable + TURNTABLE_BUTTON_GREEN_LEFT = 128, + TURNTABLE_BUTTON_RED_LEFT = 129, + TURNTABLE_BUTTON_BLUE_LEFT = 130, + TURNTABLE_BUTTON_GREEN_RIGHT = 131, + TURNTABLE_BUTTON_RED_RIGHT = 132, + TURNTABLE_BUTTON_BLUE_RIGHT = 133, + TURNTABLE_BUTTON_MINUS = 134, + TURNTABLE_BUTTON_PLUS = 135, + TURNTABLE_BUTTON_HOME = 136, + TURNTABLE_BUTTON_EUPHORIA = 137, + TURNTABLE_TABLE_LEFT_LEFT = 138, + TURNTABLE_TABLE_LEFT_RIGHT = 139, + TURNTABLE_TABLE_RIGHT_LEFT = 140, + TURNTABLE_TABLE_RIGHT_RIGHT = 141, + TURNTABLE_STICK = 142, + TURNTABLE_STICK_UP = 143, + TURNTABLE_STICK_DOWN = 144, + TURNTABLE_STICK_LEFT = 145, + TURNTABLE_STICK_RIGHT = 146, + TURNTABLE_EFFECT_DIAL = 147, + TURNTABLE_CROSSFADE_LEFT = 148, + TURNTABLE_CROSSFADE_RIGHT = 149, }; enum ButtonState { diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 7cf0f628bd..9b4d434996 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -71,6 +71,97 @@ Touchscreen::Touchscreen(int padID) AddInput(new Button(_padID, ButtonManager::WIIMOTE_DOWN)); AddInput(new Button(_padID, ButtonManager::WIIMOTE_LEFT)); AddInput(new Button(_padID, ButtonManager::WIIMOTE_RIGHT)); + AddInput(new Button(_padID, ButtonManager::WIIMOTE_IR_HIDE)); + AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_X)); + AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Y)); + AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Z)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_IR_UP), new Axis(_padID, ButtonManager::WIIMOTE_IR_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_IR_LEFT), new Axis(_padID, ButtonManager::WIIMOTE_IR_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_IR_FORWARD), new Axis(_padID, ButtonManager::WIIMOTE_IR_BACKWARD)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_SWING_UP), new Axis(_padID, ButtonManager::WIIMOTE_SWING_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_SWING_LEFT), new Axis(_padID, ButtonManager::WIIMOTE_SWING_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_SWING_FORWARD), new Axis(_padID, ButtonManager::WIIMOTE_SWING_BACKWARD)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_TILT_LEFT), new Axis(_padID, ButtonManager::WIIMOTE_TILT_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::WIIMOTE_TILT_FORWARD), new Axis(_padID, ButtonManager::WIIMOTE_TILT_BACKWARD)); + + //Wii ext: Nunchuk + AddInput(new Button(_padID, ButtonManager::NUNCHUK_BUTTON_C)); + AddInput(new Button(_padID, ButtonManager::NUNCHUK_BUTTON_Z)); + AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_X)); + AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Y)); + AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Z)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_STICK_LEFT), new Axis(_padID, ButtonManager::NUNCHUK_STICK_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_STICK_UP), new Axis(_padID, ButtonManager::NUNCHUK_STICK_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_SWING_LEFT), new Axis(_padID, ButtonManager::NUNCHUK_SWING_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_SWING_UP), new Axis(_padID, ButtonManager::NUNCHUK_SWING_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_SWING_FORWARD), new Axis(_padID, ButtonManager::NUNCHUK_SWING_BACKWARD)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_TILT_LEFT), new Axis(_padID, ButtonManager::NUNCHUK_TILT_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::NUNCHUK_TILT_FORWARD), new Axis(_padID, ButtonManager::NUNCHUK_TILT_BACKWARD)); + + // Wii ext: Classic + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_A)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_B)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_X)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_Y)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_MINUS)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_PLUS)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_HOME)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_ZL)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_BUTTON_ZR)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_UP)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_DOWN)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_LEFT)); + AddInput(new Button(_padID, ButtonManager::CLASSIC_DPAD_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_LEFT), new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_UP), new Axis(_padID, ButtonManager::CLASSIC_STICK_LEFT_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_LEFT), new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_UP), new Axis(_padID, ButtonManager::CLASSIC_STICK_RIGHT_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_L), new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_L)); + AddAnalogInputs(new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_R), new Axis(_padID, ButtonManager::CLASSIC_TRIGGER_R)); + + // Wii-ext: Guitar + AddInput(new Button(_padID, ButtonManager::GUITAR_BUTTON_MINUS)); + AddInput(new Button(_padID, ButtonManager::GUITAR_BUTTON_PLUS)); + AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_GREEN)); + AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_RED)); + AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_YELLOW)); + AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_BLUE)); + AddInput(new Button(_padID, ButtonManager::GUITAR_FRET_ORANGE)); + AddInput(new Button(_padID, ButtonManager::GUITAR_STRUM_UP)); + AddInput(new Button(_padID, ButtonManager::GUITAR_STRUM_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::GUITAR_STICK_LEFT), new Axis(_padID, ButtonManager::GUITAR_STICK_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::GUITAR_STICK_UP), new Axis(_padID, ButtonManager::GUITAR_STICK_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::GUITAR_WHAMMY_BAR), new Axis(_padID, ButtonManager::GUITAR_WHAMMY_BAR)); + + // Wii-ext: Drums + AddInput(new Button(_padID, ButtonManager::DRUMS_BUTTON_MINUS)); + AddInput(new Button(_padID, ButtonManager::DRUMS_BUTTON_PLUS)); + AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_RED)); + AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_YELLOW)); + AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_BLUE)); + AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_GREEN)); + AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_ORANGE)); + AddInput(new Button(_padID, ButtonManager::DRUMS_PAD_BASS)); + AddAnalogInputs(new Axis(_padID, ButtonManager::DRUMS_STICK_LEFT), new Axis(_padID, ButtonManager::DRUMS_STICK_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::DRUMS_STICK_UP), new Axis(_padID, ButtonManager::DRUMS_STICK_DOWN)); + + // Wii-ext: Turntable + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_GREEN_LEFT)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_RED_LEFT)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_BLUE_LEFT)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_GREEN_RIGHT)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_RED_RIGHT)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_BLUE_RIGHT)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_MINUS)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_PLUS)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_HOME)); + AddInput(new Button(_padID, ButtonManager::TURNTABLE_BUTTON_EUPHORIA)); + AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_TABLE_LEFT_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_TABLE_LEFT_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_TABLE_RIGHT_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_TABLE_RIGHT_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_STICK_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_STICK_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_STICK_UP), new Axis(_padID, ButtonManager::TURNTABLE_STICK_DOWN)); + AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_CROSSFADE_LEFT), new Axis(_padID, ButtonManager::TURNTABLE_CROSSFADE_RIGHT)); + AddAnalogInputs(new Axis(_padID, ButtonManager::TURNTABLE_EFFECT_DIAL), new Axis(_padID, ButtonManager::TURNTABLE_EFFECT_DIAL)); } // Buttons and stuff