DualSense cleanup

libretro · Mar 4, 2023 · 08150b2 · 08150b2
1 parent 91af80b
commit 08150b2
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 33 deletions.
diff --git a/android/Dual Sense 5.cfg b/android/Dual Sense 5.cfg
@@ -1,10 +1,9 @@
 input_driver = "android"
 input_device = "Wireless Controller"
-input_device_display_name = "DualSense 5"
+input_device_display_name = "DualSense"
 input_vendor_id = "1356"
 input_product_id = "3302"
 
-
 input_b_btn = "97"
 input_y_btn = "96"
 input_select_btn = "104"
@@ -31,7 +30,6 @@ input_r_y_plus_axis = "+3"
 input_r_y_minus_axis = "-3"
 input_menu_toggle_btn = "110"
 
-
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
 input_select_btn_label = "Create"

diff --git a/dinput/DualSense5.cfg b/dinput/DualSense5.cfg
@@ -1,6 +1,6 @@
 input_driver = "dinput"
 input_device = "Wireless Controller"
-input_device_display_name = "DualSense 5"
+input_device_display_name = "DualSense"
 input_vendor_id = "1356"
 input_product_id = "3302"
 
@@ -16,8 +16,8 @@ input_a_btn = "2"
 input_x_btn = "3"
 input_l_btn = "4"
 input_r_btn = "5"
-input_l2_btn = "6"
-input_r2_btn = "7"
+input_l2_axis = "+3"
+input_r2_axis = "+4"
 input_l3_btn = "10"
 input_r3_btn = "11"
 input_l_x_plus_axis = "+0"
@@ -32,7 +32,7 @@ input_menu_toggle_btn = "12"
 
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
-input_select_btn_label = "Share"
+input_select_btn_label = "Create"
 input_start_btn_label = "Options"
 input_up_btn_label = "D-Pad Up"
 input_down_btn_label = "D-Pad Down"
@@ -44,8 +44,6 @@ input_l_btn_label = "L1"
 input_r_btn_label = "R1"
 input_l2_axis_label = "L2"
 input_r2_axis_label = "R2"
-input_l2_btn_label = "L2"
-input_r2_btn_label = "R2"
 input_l3_btn_label = "L3"
 input_r3_btn_label = "R3"
 input_l_x_plus_axis_label = "Left Analog X+"

diff --git a/hid/DualSense Wireless Controller (PS5).cfg b/hid/DualSense Wireless Controller (PS5).cfg
@@ -1,7 +1,9 @@
-input_device = "DualSense Wireless Controller (PS5)"
 input_driver = "hid"
+input_device = "DualSense Wireless Controller (PS5)"
+input_device_display_name = "DualSense"
 input_vendor_id = "1356"
 input_product_id = "3302"
+
 input_b_btn = "1"
 input_y_btn = "0"
 input_select_btn = "8"
@@ -27,10 +29,11 @@ input_r_x_minus_axis = "-4"
 input_r_y_plus_axis = "+5"
 input_r_y_minus_axis = "-5"
 input_menu_toggle_btn = "12"
+
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
-input_select_btn_label = "Share"
-input_start_btn_label = "Start"
+input_select_btn_label = "Create"
+input_start_btn_label = "Options"
 input_up_btn_label = "D-Pad Up"
 input_down_btn_label = "D-Pad Down"
 input_left_btn_label = "D-Pad Left"

diff --git a/sdl2/PS5 Controller.cfg b/sdl2/PS5 Controller.cfg
@@ -1,7 +1,9 @@
 input_driver = "sdl2"
 input_device = "PS5 Controller"
+input_device_display_name = "DualSense"
 input_vendor_id = "1356"
 input_product_id = "1476"
+
 input_b_btn = "0"
 input_y_btn = "2"
 input_select_btn = "4"
@@ -30,7 +32,7 @@ input_menu_toggle_btn = "5"
 
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
-input_select_btn_label = "Share"
+input_select_btn_label = "Create"
 input_start_btn_label = "Options"
 input_up_btn_label = "D-Pad Up"
 input_down_btn_label = "D-Pad Down"
@@ -44,12 +46,12 @@ input_l2_axis_label = "L2"
 input_r2_axis_label = "R2"
 input_l3_btn_label = "L3"
 input_r3_btn_label = "R3"
-input_l_x_plus_axis_label = "Left Analog Right"
-input_l_x_minus_axis_label = "Left Analog Left"
-input_l_y_plus_axis_label = "Left Analog Down"
-input_l_y_minus_axis_label = "Left Analog Up"
-input_r_x_plus_axis_label = "Right Analog Right"
-input_r_x_minus_axis_label = "Right Analog Left"
-input_r_y_plus_axis_label = "Right Analog Down"
-input_r_y_minus_axis_label = "Right Analog Up"
+input_l_x_plus_axis_label = "Left Analog X+"
+input_l_x_minus_axis_label = "Left Analog X-"
+input_l_y_plus_axis_label = "Left Analog Y+"
+input_l_y_minus_axis_label = "Left Analog Y-"
+input_r_x_plus_axis_label = "Right Analog X+"
+input_r_x_minus_axis_label = "Right Analog X-"
+input_r_y_plus_axis_label = "Right Analog Y+"
+input_r_y_minus_axis_label = "Right Analog Y-"
 input_menu_toggle_btn_label = "PS"
diff --git a/udev/Sony Interactive Entertainment Wireless Controller.cfg b/udev/Sony Interactive Entertainment Wireless Controller.cfg
@@ -1,7 +1,9 @@
 input_driver = "udev"
 input_device = "Sony Interactive Entertainment Wireless Controller"
+input_device_display_name = "DualSense"
 input_vendor_id = "1356"
 input_product_id = "3302"
+
 input_b_btn = "0"
 input_y_btn = "3"
 input_select_btn = "8"
@@ -14,8 +16,8 @@ input_a_btn = "1"
 input_x_btn = "2"
 input_l_btn = "4"
 input_r_btn = "5"
-input_l2_btn = "6"
-input_r2_btn = "7"
+input_l2_axis = "+2"
+input_r2_axis = "+5"
 input_l3_btn = "11"
 input_r3_btn = "12"
 input_l_x_plus_axis = "+0"
@@ -40,16 +42,16 @@ input_a_btn_label = "Circle"
 input_x_btn_label = "Triangle"
 input_l_btn_label = "L1"
 input_r_btn_label = "R1"
-input_l2_btn_label = "L2"
-input_r2_btn_label = "R2"
+input_l2_axis_label = "L2"
+input_r2_axis_label = "R2"
 input_l3_btn_label = "L3"
 input_r3_btn_label = "R3"
-input_l_x_plus_axis_label = "Left Analog Right"
-input_l_x_minus_axis_label = "Left Analog Left"
-input_l_y_plus_axis_label = "Left Analog Down"
-input_l_y_minus_axis_label = "Left Analog Up"
-input_r_x_plus_axis_label = "Right Analog Right"
-input_r_x_minus_axis_label = "Right Analog Left"
-input_r_y_plus_axis_label = "Right Analog Down"
-input_r_y_minus_axis_label = "Right Analog Up"
+input_l_x_plus_axis_label = "Left Analog X+"
+input_l_x_minus_axis_label = "Left Analog X-"
+input_l_y_plus_axis_label = "Left Analog Y+"
+input_l_y_minus_axis_label = "Left Analog Y-"
+input_r_x_plus_axis_label = "Right Analog X+"
+input_r_x_minus_axis_label = "Right Analog X-"
+input_r_y_plus_axis_label = "Right Analog Y+"
+input_r_y_minus_axis_label = "Right Analog Y-"
 input_menu_toggle_btn_label = "PS"