Merge pull request #3311 from Phatcat/analog_input_android

[Android] More analog input configurations + misc

2 files changed, 329 insertions, 140 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 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);