Skip to content

Commit 42bb169

Browse files
davidhedlunddavidhedlund
authored
Merge branch 'libretro:master' into patch-65
2 parents 65c8cea + 38cf938 commit 42bb169

26 files changed

Lines changed: 877 additions & 63 deletions

‎android/DualSense Wireless Controller (Android 13).cfg‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
input_driver = "android"
2+
input_device = "DualSense Wireless Controller"
3+
input_device_display_name = "Sony Corp. DualSense Wireless Controller (Android 13)"
4+
input_vendor_id = "1356"
5+
input_product_id = "3302"
6+
input_b_btn = "96"
7+
input_y_btn = "99"
8+
input_select_btn = "109"
9+
input_start_btn = "108"
10+
input_up_btn = "h0up"
11+
input_down_btn = "h0down"
12+
input_left_btn = "h0left"
13+
input_right_btn = "h0right"
14+
input_a_btn = "97"
15+
input_x_btn = "100"
16+
input_l_btn = "102"
17+
input_r_btn = "103"
18+
input_l2_btn = "104"
19+
input_r2_btn = "105"
20+
input_l3_btn = "106"
21+
input_r3_btn = "107"
22+
input_l_x_plus_axis = "+0"
23+
input_l_x_minus_axis = "-0"
24+
input_l_y_plus_axis = "+1"
25+
input_l_y_minus_axis = "-1"
26+
input_r_x_plus_axis = "+2"
27+
input_r_x_minus_axis = "-2"
28+
input_r_y_plus_axis = "+3"
29+
input_r_y_minus_axis = "-3"
30+
input_menu_toggle_btn = "110"
31+
input_b_btn_label = "Cross"
32+
input_y_btn_label = "Square"
33+
input_select_btn_label = "Create"
34+
input_start_btn_label = "Options"
35+
input_up_btn_label = "D-Pad Up"
36+
input_down_btn_label = "D-Pad Down"
37+
input_left_btn_label = "D-Pad Left"
38+
input_right_btn_label = "D-Pad Right"
39+
input_a_btn_label = "Circle"
40+
input_x_btn_label = "Triangle"
41+
input_l_btn_label = "L1"
42+
input_r_btn_label = "R1"
43+
input_l2_btn_label = "L2"
44+
input_r2_btn_label = "R2"
45+
input_l3_btn_label = "L3"
46+
input_r3_btn_label = "R3"
47+
input_l_x_plus_axis_label = "Left Analog X+ (Right)"
48+
input_l_x_minus_axis_label = "Left Analog X- (Left)"
49+
input_l_y_plus_axis_label = "Left Analog Y+ (Down)"
50+
input_l_y_minus_axis_label = "Left Analog Y- (Up)"
51+
input_r_x_plus_axis_label = "Right Analog X+ (Right)"
52+
input_r_x_minus_axis_label = "Right Analog X- (Left)"
53+
input_r_y_plus_axis_label = "Right Analog Y+ (Down)"
54+
input_r_y_minus_axis_label = "Right Analog Y- (Up)"
55+
input_menu_toggle_btn_label = "PS"

‎android/GameSir-X5 Lite.cfg‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
input_driver = "android"
2+
input_device = "GameSir-X5 Lite"
3+
input_vendor_id = "13623"
4+
input_product_id = "4374"
5+
6+
input_b_btn = "96"
7+
input_y_btn = "99"
8+
input_select_btn = "109"
9+
input_start_btn = "108"
10+
input_up_btn = "h0up"
11+
input_down_btn = "h0down"
12+
input_left_btn = "h0left"
13+
input_right_btn = "h0right"
14+
input_a_btn = "97"
15+
input_x_btn = "100"
16+
input_l_btn = "102"
17+
input_r_btn = "103"
18+
input_l2_btn = "104"
19+
input_r2_btn = "105"
20+
input_l3_btn = "106"
21+
input_r3_btn = "107"
22+
input_l_x_plus_axis = "+0"
23+
input_l_x_minus_axis = "-0"
24+
input_l_y_plus_axis = "+1"
25+
input_l_y_minus_axis = "-1"
26+
input_r_x_plus_axis = "+2"
27+
input_r_x_minus_axis = "-2"
28+
input_r_y_plus_axis = "+3"
29+
input_r_y_minus_axis = "-3"
30+
input_menu_toggle_btn = "110"
31+
32+
input_b_btn_label = "A"
33+
input_y_btn_label = "X"
34+
input_select_btn_label = "View"
35+
input_start_btn_label = "Menu"
36+
input_up_btn_label = "D-pad Up"
37+
input_down_btn_label = "D-pad Down"
38+
input_left_btn_label = "D-pad Left"
39+
input_right_btn_label = "D-pad Right"
40+
input_a_btn_label = "B"
41+
input_x_btn_label = "Y"
42+
input_l_btn_label = "LB"
43+
input_r_btn_label = "RB"
44+
input_l2_btn_label = "LT"
45+
input_r2_btn_label = "RT"
46+
input_l3_btn_label = "LS"
47+
input_r3_btn_label = "RS"
48+
input_l_x_plus_axis_label = "Left Stick X+"
49+
input_l_x_minus_axis_label = "Left Stick X-"
50+
input_l_y_plus_axis_label = "Left Stick Y+"
51+
input_l_y_minus_axis_label = "Left Stick Y-"
52+
input_r_x_plus_axis_label = "Right Stick X+"
53+
input_r_x_minus_axis_label = "Right Stick X-"
54+
input_r_y_plus_axis_label = "Right Stick Y+"
55+
input_r_y_minus_axis_label = "Right Stick Y-"
56+
input_menu_toggle_btn_label = "Home"

‎android/Odin Controller (Xbox).cfg‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
input_driver = "android"
2+
input_device = "Odin Controller"
3+
input_device_display_name = "Ayn Odin (Xbox Mode)"
4+
input_vendor_id = "8224"
5+
input_product_id = "274"
6+
input_b_btn = "96"
7+
input_b_btn_label = "B"
8+
input_y_btn = "99"
9+
input_y_btn_label = "Y"
10+
input_select_btn = "109"
11+
input_select_btn_label = "Select"
12+
input_start_btn = "108"
13+
input_start_btn_label = "Start"
14+
input_up_btn = "h0up"
15+
input_up_btn_label = "D-Pad Up"
16+
input_down_btn = "h0down"
17+
input_up_down_label = "D-Pad Down"
18+
input_left_btn = "h0left"
19+
input_left_btn_label = "D-Pad Left"
20+
input_right_btn = "h0right"
21+
input_right_btn_label = "D-Pad Right"
22+
input_a_btn = "97"
23+
input_a_btn_label = "A"
24+
input_x_btn = "100"
25+
input_a_btn_label = "X"
26+
input_l_btn = "102"
27+
input_l_btn_label = "L1"
28+
input_r_btn = "103"
29+
input_r_btn_label = "R1"
30+
input_l2_axis = "+6"
31+
input_l2_axis_label = "L2"
32+
input_r2_axis = "+7"
33+
input_r2_axis_label = "R2"
34+
input_l3_btn = "106"
35+
input_l3_btn_label = "Left Thumb"
36+
input_r3_btn = "107"
37+
input_r3_btn_label = "Right Thumb"
38+
input_l_x_plus_axis = "+0"
39+
input_l_x_plus_axis_label = "Left Stick Right"
40+
input_l_x_minus_axis = "-0"
41+
input_l_x_minus_axis_label = "Left Stick Left"
42+
input_l_y_plus_axis = "+1"
43+
input_l_y_plus_axis_label = "Left Stick Up"
44+
input_l_y_minus_axis = "-1"
45+
input_l_y_minus_axis_label = "Left Stick Down"
46+
input_r_x_plus_axis = "+2"
47+
input_r_x_plus_axis_label = "Right Stick Right"
48+
input_r_x_minus_axis = "-2"
49+
input_r_x_minus_axis_label = "Right Stick Left"
50+
input_r_y_plus_axis = "+3"
51+
input_r_y_plus_axis_label = "Right Stick Up"
52+
input_r_y_minus_axis = "-3"
53+
input_r_y_minus_axis_label = "Right Stick Down"
54+
input_menu_toggle_btn = "4"
55+
input_menu_toggle_btn_label = "Back"

‎android/Odin_Controller.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ input_r_y_plus_axis = "+3"
5151
input_r_y_plus_axis_label = "Right Stick Up"
5252
input_r_y_minus_axis = "-3"
5353
input_r_y_minus_axis_label = "Right Stick Down"
54+
input_menu_toggle_btn = "4"
55+
input_menu_toggle_btn_label = "Back"

‎android/Retroid_Pocket_5.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ input_device = "Retroid Pocket Controller"
33
input_device_display_name = "Retroid Pocket 5"
44

55
input_vendor_id = "8226"
6-
input_product_id = "12290"
6+
input_product_id = "12289"
77

88
input_up_btn = "h0up"
99
input_down_btn = "h0down"

android/Retroid_Pocket.cfg renamed to android/Retroid_Pocket_5_Xbox.cfg

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
input_driver = "android"
2-
input_device = "Retroid Pocket Controller"
3-
input_device_display_name = "Retroid Pocket"
2+
input_device = "Xbox Wireless Controller"
3+
input_device_display_name = "Retroid Pocket 5 (Xbox)"
44

55
input_vendor_id = "8226"
6-
input_product_id = "12289"
6+
input_product_id = "12290"
77

88
input_up_btn = "h0up"
99
input_down_btn = "h0down"
1010
input_left_btn = "h0left"
1111
input_right_btn = "h0right"
12-
input_a_btn = "96"
13-
input_b_btn = "97"
14-
input_x_btn = "99"
15-
input_y_btn = "100"
12+
input_a_btn = "97"
13+
input_b_btn = "96"
14+
input_x_btn = "100"
15+
input_y_btn = "99"
1616
input_l_btn = "102"
1717
input_r_btn = "103"
1818
input_l2_axis = "+8"

‎dinput/8BitDo_Micro_BT.cfg‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# 8Bitdo Micro - http://www.8bitdo.com/ - https://www.8bitdo.com/micro/
2+
# Firmware v1.05 - http://support.8bitdo.com/
3+
4+
# Mode switch set to "D"
5+
6+
input_driver = "dinput"
7+
input_device = "8BitDo Micro gamepad"
8+
input_device_display_name = "8BitDo Micro"
9+
# Hex vid:pid and Decimal vid:pid is shown in the "log_verbosity" window, enable "log_verbosity" in retroarch.cfg and run RetroArch.
10+
# Hex vid:pid = 2DC8:9020 -> Decimal vid:pid = 11720:36896
11+
input_vendor_id = "11720"
12+
input_product_id = "36896"
13+
14+
input_up_axis = "-1"
15+
input_down_axis = "+1"
16+
input_left_axis = "-0"
17+
input_right_axis = "+0"
18+
input_a_btn = "0"
19+
input_b_btn = "1"
20+
input_x_btn = "3"
21+
input_y_btn = "4"
22+
input_select_btn = "10"
23+
input_start_btn = "11"
24+
input_l_btn = "6"
25+
input_r_btn = "7"
26+
input_l2_btn = "8"
27+
input_r2_btn = "9"
28+
29+
input_up_axis_label = "D-Pad Up"
30+
input_down_axis_label = "D-Pad Down"
31+
input_left_axis_label = "D-Pad Left"
32+
input_right_axis_label = "D-Pad Right"
33+
input_a_btn_label = "A"
34+
input_b_btn_label = "B"
35+
input_x_btn_label = "X"
36+
input_y_btn_label = "Y"
37+
input_select_btn_label = "Select"
38+
input_start_btn_label = "Start"
39+
input_l_btn_label = "L1"
40+
input_r_btn_label = "R1"
41+
input_l2_btn_label = "L2"
42+
input_r2_btn_label = "R2"

‎dinput/Controller (HORI Fighting Commander PC).cfg‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
input_driver = "dinput"
2+
input_device = "Controller (HORI Fighting Commander PC)"
3+
input_vendor_id = "3853"
4+
input_product_id = "443"
5+
input_b_btn = "0"
6+
input_y_btn = "2"
7+
input_select_btn = "6"
8+
input_start_btn = "7"
9+
input_up_btn = "h0up"
10+
input_down_btn = "h0down"
11+
input_left_btn = "h0left"
12+
input_right_btn = "h0right"
13+
input_a_btn = "1"
14+
input_x_btn = "3"
15+
input_l_btn = "4"
16+
input_r_btn = "5"
17+
input_l2_axis = "+2"
18+
input_r2_axis = "-2"
19+
input_l3_btn = "8"
20+
input_r3_btn = "9"
21+
input_l_x_plus_axis = "+0"
22+
input_l_x_minus_axis = "-0"
23+
input_l_y_plus_axis = "+1"
24+
input_l_y_minus_axis = "-1"
25+
input_r_x_plus_axis = "+3"
26+
input_r_x_minus_axis = "-3"
27+
input_r_y_plus_axis = "+4"
28+
input_r_y_minus_axis = "-4"
29+
input_b_btn_label = "A"
30+
input_y_btn_label = "X"
31+
input_select_btn_label = "Back"
32+
input_start_btn_label = "Start"
33+
input_up_btn_label = "D-Pad Up"
34+
input_down_btn_label = "D-Pad Down"
35+
input_left_btn_label = "D-Pad Left"
36+
input_right_btn_label = "D-Pad Right"
37+
input_a_btn_label = "B"
38+
input_x_btn_label = "Y"
39+
input_l_btn_label = "LB"
40+
input_r_btn_label = "RB"
41+
input_l2_axis_label = "LT"
42+
input_r2_axis_label = "RT"
43+
input_l2_btn_label = "LT"
44+
input_r2_btn_label = "RT"
45+
input_l3_btn_label = "LSB"
46+
input_r3_btn_label = "RSB"
47+
input_l_x_plus_axis_label = "Left Analog X+"
48+
input_l_x_minus_axis_label = "Left Analog X-"
49+
input_l_y_plus_axis_label = "Left Analog Y+"
50+
input_l_y_minus_axis_label = "Left Analog Y-"
51+
input_menu_toggle_btn_label = "Guide"

‎dinput/HORI Fighting Commander OCTA Pro.cfg‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
input_driver = "dinput"
2+
input_device = "HORI Fighting Commander OCTA Pro"
3+
input_vendor_id = "3853"
4+
input_product_id = "456"
5+
input_b_btn = "1"
6+
input_y_btn = "0"
7+
input_select_btn = "8"
8+
input_start_btn = "9"
9+
input_up_btn = "h0up"
10+
input_down_btn = "h0down"
11+
input_left_btn = "h0left"
12+
input_right_btn = "h0right"
13+
input_a_btn = "2"
14+
input_x_btn = "3"
15+
input_l_btn = "4"
16+
input_r_btn = "5"
17+
input_l2_btn = "6"
18+
input_r2_btn = "7"
19+
input_l3_btn = "10"
20+
input_r3_btn = "13"
21+
input_l_x_plus_axis = "+0"
22+
input_l_x_minus_axis = "-0"
23+
input_l_y_plus_axis = "+1"
24+
input_l_y_minus_axis = "-1"
25+
input_r_x_plus_axis = "+2"
26+
input_r_x_minus_axis = "-2"
27+
input_r_y_plus_axis = "+5"
28+
input_r_y_minus_axis = "-5"
29+
input_select_btn = "8"
30+
input_start_btn = "9"
31+
input_menu_toggle_btn = "12"
32+
input_b_btn_label = "Cross"
33+
input_y_btn_label = "Square"
34+
input_select_btn_label = "Share"
35+
input_start_btn_label = "Options"
36+
input_up_btn_label = "D-Pad Up"
37+
input_down_btn_label = "D-Pad Down"
38+
input_left_btn_label = "D-Pad Left"
39+
input_right_btn_label = "D-Pad Right"
40+
input_a_btn_label = "Circle"
41+
input_x_btn_label = "Triangle"
42+
input_l_btn_label = "L1"
43+
input_r_btn_label = "R1"
44+
input_l2_axis_label = "L2"
45+
input_r2_axis_label = "R2"
46+
input_l2_btn_label = "L2"
47+
input_r2_btn_label = "R2"
48+
input_l3_btn_label = "L3"
49+
input_r3_btn_label = "R3"
50+
input_l_x_plus_axis_label = "Left Analog X+"
51+
input_l_x_minus_axis_label = "Left Analog X-"
52+
input_l_y_plus_axis_label = "Left Analog Y+"
53+
input_l_y_minus_axis_label = "Left Analog Y-"
54+
input_menu_toggle_btn_label = "PS"

‎linuxraw/Nintendo Switch Pro Controller.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
input_driver = "linuxraw"
22
input_device = "Nintendo Switch Pro Controller"
33
input_device_alt1 = "Nintendo Co., Ltd. Pro Controller"
4-
input_device_alt3 = "Pro Controller"
4+
input_device_alt2 = "Pro Controller"
55
input_b_btn = "0"
66
input_y_btn = "3"
77
input_select_btn = "9"

0 commit comments

Comments
 (0)