pads: read left analog stick inputs to navigate the gui

include/config.h

@@ -108,6 +108,8 @@ enum CONFIG_INDEX {
 #define CONFIG_OPL_BOOT_SND_VOLUME      "boot_snd_volume"
 #define CONFIG_OPL_BGM_VOLUME           "bgm_volume"
 #define CONFIG_OPL_DEFAULT_BGM_PATH     "default_bgm_path"
+#define CONFIG_OPL_XSENSITIVITY         "x_sensitivity"
+#define CONFIG_OPL_YSENSITIVITY         "y_sensitivity"
 
 // Network config keys
 #define CONFIG_NET_ETH_LINKM          "eth_linkmode"

include/dialogs.h

@@ -62,6 +62,9 @@ enum UI_ITEMS {
     CFG_BGM_VOLUME,
     CFG_DEFAULT_BGM_PATH,
 
+    CFG_XSENSITIVITY,
+    CFG_YSENSITIVITY,
+
     NETCFG_SHOW_ADVANCED_OPTS,
     NETCFG_PS2_IP_ADDR_TYPE,
     NETCFG_PS2_IP_ADDR_0,

include/opl.h

@@ -146,6 +146,9 @@ extern int gBootSndVolume;
 extern int gBGMVolume;
 extern char gDefaultBGMPath[128];
 
+extern int gXSensitivity;
+extern int gYSensitivity;
+
 extern int gCheatSource;
 extern int gGSMSource;
 extern int gPadEmuSource;

lng_tmpl/_base.yml

@@ -680,3 +680,11 @@ gui_strings:
   string: Default Theme Music
 - label: DEF_BGM_PATH_HINT
   string: Set path to stream music for internal theme.
+- label: HIGH
+  string: High
+- label: LOW
+  string: Low
+- label: XSENSITIVITY
+  string: Analog X-Axis Sensitivity
+- label: YSENSITIVITY
+  string: Analog Y-Axis Sensitivity

src/dialogs.c

@@ -1015,6 +1015,17 @@ struct UIItem diaControllerConfig[] = {
     {UI_SPACER},
     {UI_ENUM, CFG_SELECTBUTTON, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
     {UI_BREAK},
+
+    {UI_BREAK},
+    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_XSENSITIVITY}}},
+    {UI_SPACER},
+    {UI_ENUM, CFG_XSENSITIVITY, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
+    {UI_BREAK},
+
+    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_YSENSITIVITY}}},
+    {UI_SPACER},
+    {UI_ENUM, CFG_YSENSITIVITY, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
+    {UI_BREAK},
 #ifdef PADEMU
     {UI_BREAK},
     {UI_BUTTON, PADEMU_GLOBAL_BUTTON, 1, 1, -1, 0, 0, {.label = {NULL, _STR_PADEMUCONFIG}}},

src/gui.c

@@ -911,16 +911,23 @@ void guiShowControllerConfig(void)
     // configure the enumerations
     const char *scrollSpeeds[] = {_l(_STR_SLOW), _l(_STR_MEDIUM), _l(_STR_FAST), NULL};
     const char *selectButtons[] = {_l(_STR_CIRCLE), _l(_STR_CROSS), NULL};
+    const char *sensitivity[] = {_l(_STR_LOW), _l(_STR_MEDIUM), _l(_STR_HIGH), NULL};
 
     diaSetEnum(diaControllerConfig, UICFG_SCROLL, scrollSpeeds);
     diaSetEnum(diaControllerConfig, CFG_SELECTBUTTON, selectButtons);
+    diaSetEnum(diaControllerConfig, CFG_XSENSITIVITY, sensitivity);
+    diaSetEnum(diaControllerConfig, CFG_YSENSITIVITY, sensitivity);
 
     diaSetInt(diaControllerConfig, UICFG_SCROLL, gScrollSpeed);
     diaSetInt(diaControllerConfig, CFG_SELECTBUTTON, gSelectButton == KEY_CIRCLE ? 0 : 1);
+    diaSetInt(diaControllerConfig, CFG_XSENSITIVITY, gXSensitivity);
+    diaSetInt(diaControllerConfig, CFG_YSENSITIVITY, gYSensitivity);
 
     int result = diaExecuteDialog(diaControllerConfig, -1, 1, NULL);
     if (result) {
         diaGetInt(diaControllerConfig, UICFG_SCROLL, &gScrollSpeed);
+        diaGetInt(diaControllerConfig, CFG_XSENSITIVITY, &gXSensitivity);
+        diaGetInt(diaControllerConfig, CFG_YSENSITIVITY, &gYSensitivity);
 
         if (diaGetInt(diaControllerConfig, CFG_SELECTBUTTON, &value))
             gSelectButton = value == 0 ? KEY_CIRCLE : KEY_CROSS;

src/opl.c

@@ -191,6 +191,9 @@ char gOPLPart[128];
 char *gHDDPrefix;
 char gExportName[32];
 
+int gXSensitivity;
+int gYSensitivity;
+
 int gOSDLanguageValue;
 int gOSDTVAspectRatio;
 int gOSDVideOutput;
@@ -908,6 +911,8 @@ static void _loadConfig()
             if (configGetInt(configOPL, CONFIG_OPL_SWAP_SEL_BUTTON, &value))
                 gSelectButton = value == 0 ? KEY_CIRCLE : KEY_CROSS;
 
+            configGetInt(configOPL, CONFIG_OPL_XSENSITIVITY, &gXSensitivity);
+            configGetInt(configOPL, CONFIG_OPL_YSENSITIVITY, &gYSensitivity);
             configGetInt(configOPL, CONFIG_OPL_DISABLE_DEBUG, &gEnableDebug);
             configGetInt(configOPL, CONFIG_OPL_PS2LOGO, &gPS2Logo);
             configGetInt(configOPL, CONFIG_OPL_HDD_GAME_LIST_CACHE, &gHDDGameListCache);
@@ -1093,6 +1098,8 @@ static void _saveConfig()
         configSetInt(configOPL, CONFIG_OPL_BOOT_SND_VOLUME, gBootSndVolume);
         configSetInt(configOPL, CONFIG_OPL_BGM_VOLUME, gBGMVolume);
         configSetStr(configOPL, CONFIG_OPL_DEFAULT_BGM_PATH, gDefaultBGMPath);
+        configSetInt(configOPL, CONFIG_OPL_XSENSITIVITY, gXSensitivity);
+        configSetInt(configOPL, CONFIG_OPL_YSENSITIVITY, gYSensitivity);
 
         configSetInt(configOPL, CONFIG_OPL_SWAP_SEL_BUTTON, gSelectButton == KEY_CIRCLE ? 0 : 1);
     }
@@ -1709,6 +1716,8 @@ static void setDefaults(void)
     gBootSndVolume = 80;
     gBGMVolume = 70;
     gDefaultBGMPath[0] = '\0';
+    gXSensitivity = 1;
+    gYSensitivity = 1;
 
     gBDMStartMode = START_MODE_DISABLED;
     gHDDStartMode = START_MODE_DISABLED;

src/pad.c

@@ -193,6 +193,54 @@ static void updatePadState(struct pad_data_t *pad, int state)
         pad->state = state;
 }
 
+static u32 readLeftJoy(struct pad_data_t *pad, u32 pdata)
+{
+    u32 padData = pdata;
+    int xDeadzone, yDeadzone;
+
+    if ((pad->buttons.mode >> 4) == 0x07) {
+        switch (gXSensitivity) {
+            case 0:
+                xDeadzone = 100;
+                break;
+            case 1:
+                xDeadzone = 80;
+                break;
+            case 2:
+                xDeadzone = 60;
+                break;
+            default:
+                xDeadzone = 80;
+        }
+
+        switch (gYSensitivity) {
+            case 0:
+                yDeadzone = 100;
+                break;
+            case 1:
+                yDeadzone = 80;
+                break;
+            case 2:
+                yDeadzone = 60;
+                break;
+            default:
+                yDeadzone = 80;
+        }
+
+        if (pad->buttons.ljoy_h < 127 - xDeadzone)
+            padData |= PAD_LEFT;
+        else if (pad->buttons.ljoy_h > 127 + xDeadzone)
+            padData |= PAD_RIGHT;
+
+        if (pad->buttons.ljoy_v < 127 - yDeadzone)
+            padData |= PAD_UP;
+        else if (pad->buttons.ljoy_v > 127 + yDeadzone)
+            padData |= PAD_DOWN;
+    }
+
+    return padData;
+}
+
 static int readPad(struct pad_data_t *pad)
 {
     int rcode = 0, oldState, newState, ret, padsRead;
@@ -247,6 +295,8 @@ static int readPad(struct pad_data_t *pad)
         else
             rcode = 0;
 
+        newpdata |= readLeftJoy(pad, newpdata);
+
         pad->oldpaddata = pad->paddata;
         pad->paddata = newpdata;