Skip to content

Commit 0cf26d0

Browse files
authored
Merge pull request #986 from davidhedlund/patch-20
Update controller-autoconfiguration.md: Replaced "L2 Analog" and "R2 Analog" with "L2 Trigger" and "R2 Trigger" respectively.
2 parents 344f870 + de5182d commit 0cf26d0

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

docs/guides/controller-autoconfiguration.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The matching algorithm considers several key factors:
1515

1616
Different controller drivers use these identifiers in various ways:
1717

18-
- 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).
18+
- 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).
1919
- The `linuxraw` driver rely on the Device Index (input_device).
2020

2121
### Difference in input variable generation between linuxraw and udev.
@@ -278,8 +278,8 @@ To work around this issue, you need to manually edit the RetroArch config file t
278278
input_l2_axis = "+X" (where X is the L2 axis number)
279279
input_r2_axis = "+Y" (where Y is the R2 axis number)
280280
281-
input_l2_axis_label = "L2 Analog"
282-
input_r2_axis_label = "R2 Analog"
281+
input_l2_axis_label = "L2 Trigger"
282+
input_r2_axis_label = "R2 Trigger"
283283
```
284284

285285
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
299299
input_l2_axis = "+2"
300300
input_r2_axis = "+5"
301301
302-
input_l2_axis_label = "L2 Analog"
303-
input_r2_axis_label = "R2 Analog"
302+
input_l2_axis_label = "L2 Trigger"
303+
input_r2_axis_label = "R2 Trigger"
304304
```
305305

306306
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)"
556556

557557
Labels for analog L2/R2 triggers:
558558
```
559-
input_l2_axis_label = "L2 Analog"
560-
input_r2_axis_label = "R2 Analog"
559+
input_l2_axis_label = "L2 Trigger"
560+
input_r2_axis_label = "R2 Trigger"
561561
```
562562

563563
##### Buttons (digital inputs)
@@ -607,7 +607,7 @@ input_menu_toggle_btn_label = "Guide"
607607

608608
#### Example: Controllers for Sony PlayStation 2 and later
609609

610-
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:
610+
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:
611611
```
612612
input_b_btn_label = "Cross"
613613
input_y_btn_label = "Square"
@@ -621,8 +621,8 @@ input_a_btn_label = "Circle"
621621
input_x_btn_label = "Triangle"
622622
input_l_btn_label = "L1"
623623
input_r_btn_label = "R1"
624-
input_l2_axis_label = "L2 Analog"
625-
input_r2_axis_label = "R2 Analog"
624+
input_l2_axis_label = "L2 Trigger"
625+
input_r2_axis_label = "R2 Trigger"
626626
input_l3_btn_label = "L3"
627627
input_r3_btn_label = "R3"
628628
input_l_x_plus_axis_label = "Left Analog X+ (right)"
@@ -684,8 +684,8 @@ input_a_btn_label = "Circle"
684684
input_x_btn_label = "Triangle"
685685
input_l_btn_label = "L1"
686686
input_r_btn_label = "R1"
687-
input_l2_axis_label = "L2 Analog"
688-
input_r2_axis_label = "R2 Analog"
687+
input_l2_axis_label = "L2 Trigger"
688+
input_r2_axis_label = "R2 Trigger"
689689
input_l3_btn_label = "L3"
690690
input_r3_btn_label = "R3"
691691
input_l_x_plus_axis_label = "Left Analog X+ (right)"

0 commit comments

Comments
 (0)