From f8488bbc08a62acba0b874c73852b9feb7665313 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Thu, 5 Sep 2024 01:15:46 +0200 Subject: [PATCH 1/2] Update controller-autoconfiguration.md replaced "L2 Analog" and "R2 Analog" with "L2 Trigger" and "R2 Trigger" respectively. --- docs/guides/controller-autoconfiguration.md | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/guides/controller-autoconfiguration.md b/docs/guides/controller-autoconfiguration.md index 493a71135..d3aeb093c 100644 --- a/docs/guides/controller-autoconfiguration.md +++ b/docs/guides/controller-autoconfiguration.md @@ -278,8 +278,8 @@ To work around this issue, you need to manually edit the RetroArch config file t input_l2_axis = "+X" (where X is the L2 axis number) input_r2_axis = "+Y" (where Y is the R2 axis number) -input_l2_axis_label = "L2 Analog" -input_r2_axis_label = "R2 Analog" +input_l2_axis_label = "L2 Trigger" +input_r2_axis_label = "R2 Trigger" ``` For [example](https://github.com/libretro/retroarch-joypad-autoconfig/pull/1135), if L2 is axis 2 and R2 is axis 5, you would: @@ -299,8 +299,8 @@ With input_l2_axis = "+2" input_r2_axis = "+5" -input_l2_axis_label = "L2 Analog" -input_r2_axis_label = "R2 Analog" +input_l2_axis_label = "L2 Trigger" +input_r2_axis_label = "R2 Trigger" ``` Note: These variable values are examples and should not be directly copied to your configuration file. @@ -556,8 +556,8 @@ input_r_y_minus_axis_label = "Right Analog Y- (up)" Labels for analog L2/R2 triggers: ``` -input_l2_axis_label = "L2 Analog" -input_r2_axis_label = "R2 Analog" +input_l2_axis_label = "L2 Trigger" +input_r2_axis_label = "R2 Trigger" ``` ##### Buttons (digital inputs) @@ -607,7 +607,7 @@ input_menu_toggle_btn_label = "Guide" #### Example: Controllers for Sony PlayStation 2 and later -Labels for PlayStation controllers starting from PS2. Note that analog L2/R2 triggers (`input_l2_axis_label = "L2 Analog"`, and `input_r2_axis_label = "R2 Analog"`) are featured: +Labels for PlayStation controllers starting from PS2. Note that analog L2/R2 triggers (`input_l2_axis_label = "L2 Trigger"`, and `input_r2_axis_label = "R2 Trigger"`) are featured: ``` input_b_btn_label = "Cross" input_y_btn_label = "Square" @@ -621,8 +621,8 @@ input_a_btn_label = "Circle" input_x_btn_label = "Triangle" input_l_btn_label = "L1" input_r_btn_label = "R1" -input_l2_axis_label = "L2 Analog" -input_r2_axis_label = "R2 Analog" +input_l2_axis_label = "L2 Trigger" +input_r2_axis_label = "R2 Trigger" input_l3_btn_label = "L3" input_r3_btn_label = "R3" input_l_x_plus_axis_label = "Left Analog X+ (right)" @@ -684,8 +684,8 @@ input_a_btn_label = "Circle" input_x_btn_label = "Triangle" input_l_btn_label = "L1" input_r_btn_label = "R1" -input_l2_axis_label = "L2 Analog" -input_r2_axis_label = "R2 Analog" +input_l2_axis_label = "L2 Trigger" +input_r2_axis_label = "R2 Trigger" input_l3_btn_label = "L3" input_r3_btn_label = "R3" input_l_x_plus_axis_label = "Left Analog X+ (right)" From de5182d81c4bc2cdd36c78dab0e82a573fd7abca Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Thu, 5 Sep 2024 01:44:21 +0200 Subject: [PATCH 2/2] Update controller-autoconfiguration.md fixed task_autodetect.c link --- docs/guides/controller-autoconfiguration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/controller-autoconfiguration.md b/docs/guides/controller-autoconfiguration.md index d3aeb093c..786bfe0bc 100644 --- a/docs/guides/controller-autoconfiguration.md +++ b/docs/guides/controller-autoconfiguration.md @@ -15,7 +15,7 @@ The matching algorithm considers several key factors: Different controller drivers use these identifiers in various ways: -- The `android`, `udev`, and `sdl2` drivers can use either the Device Index (`input_device`) or a combination of Vendor ID (`input_vendor_id`) and Product ID (`input_product_id`). If the Device Index is configured incorrectly, the system will fall back on checking the Vendor ID and Product ID, and vice versa. References: input_autoconfigure_get_config_file_affinity in (task_autodetect.c)[https://github.com/libretro/RetroArch/blob/master/tasks/task_autodetect.c], and `input_autoconfigure_connect` in [android_input.c](https://github.com/libretro/RetroArch/blob/master/input/drivers/android_input.c), [sdl_joypad.c](https://github.com/libretro/RetroArch/blob/master/input/drivers_joypad/sdl_joypad.c), [udev_joypad.c](https://github.com/libretro/RetroArch/blob/master/input/drivers_joypad/udev_joypad.c). +- The `android`, `udev`, and `sdl2` drivers can use either the Device Index (`input_device`) or a combination of Vendor ID (`input_vendor_id`) and Product ID (`input_product_id`). If the Device Index is configured incorrectly, the system will fall back on checking the Vendor ID and Product ID, and vice versa. References: input_autoconfigure_get_config_file_affinity in [task_autodetect.c](https://github.com/libretro/RetroArch/blob/master/tasks/task_autodetect.c), and `input_autoconfigure_connect` in [android_input.c](https://github.com/libretro/RetroArch/blob/master/input/drivers/android_input.c), [sdl_joypad.c](https://github.com/libretro/RetroArch/blob/master/input/drivers_joypad/sdl_joypad.c), [udev_joypad.c](https://github.com/libretro/RetroArch/blob/master/input/drivers_joypad/udev_joypad.c). - The `linuxraw` driver rely on the Device Index (input_device). ### Difference in input variable generation between linuxraw and udev.