Wiimote + Extensions for Android

2 files changed, 169 insertions, 35 deletions

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);