[MERGED] android: Merge Sony_DualShock_4_Controller.cfg

android/Sony_DualShock_4_Controller.cfg

@@ -15,8 +15,12 @@ input_a_btn = "97"
 input_x_btn = "100"
 input_l_btn = "102"
 input_r_btn = "103"
-input_l2_btn = "104"
-input_r2_btn = "105"
+# RetroArch's in-app feature to create autoconfig files is flawed (https://github.com/libretro/RetroArch/issues/6920) and will attempt to create the 2 lines :
+#   input_l2_btn = "104"
+#   input_r2_btn = "105"
+# Those 2 lines are a downgrade from the 2 following lines (copied from Sony_DualShock_4_Controller_v2.cfg and they are working with a PS4 v1 controller called Datafrog 02 (https://github.com/libretro/retroarch-joypad-autoconfig/pull/1134)) which additionally allow l2/r2 to be polled as analog axises :
+input_l2_axis = "+6"
+input_r2_axis = "+7"
 input_l3_btn = "106"
 input_r3_btn = "107"
 input_l_x_plus_axis = "+0"
@@ -27,7 +31,7 @@ input_r_x_plus_axis = "+2"
 input_r_x_minus_axis = "-2"
 input_r_y_plus_axis = "+3"
 input_r_y_minus_axis = "-3"
-input_menu_toggle_btn = "109"
+input_menu_toggle_btn = "110"
 
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
@@ -37,12 +41,12 @@ input_up_btn_label = "D-Pad Up"
 input_down_btn_label = "D-Pad Down"
 input_left_btn_label = "D-Pad Left"
 input_right_btn_label = "D-Pad Right"
-input_a_btn_label = "Circle"
+input_a_btn_label = "Circle"n
 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 X+"
@@ -53,4 +57,4 @@ 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_label = "Touchpad"
+input_menu_toggle_label = "PS"

android/Sony_DualShock_4_Controller_v2.cfg

@@ -27,7 +27,7 @@ input_r_x_plus_axis = "+2"
 input_r_x_minus_axis = "-2"
 input_r_y_plus_axis = "+3"
 input_r_y_minus_axis = "-3"
-input_menu_toggle_btn = "109"
+input_menu_toggle_btn = "110"
 
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
@@ -53,4 +53,4 @@ 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 = "Touchpad"
+input_menu_toggle_btn_label = "PS"

android/Sony_DualShock_4_v2_Controller.cfg

@@ -0,0 +1,56 @@
+input_driver = "android"
+input_device = "Sony Interactive Entertainment Wireless Controller"
+input_device_display_name = "Sony DualShock 4 Controller (v2)"
+input_vendor_id = "1356"
+input_product_id = "2508"
+input_b_btn = "96"
+input_y_btn = "99"
+input_select_btn = "4"
+input_start_btn = "108"
+input_up_btn = "h0up"
+input_down_btn = "h0down"
+input_left_btn = "h0left"
+input_right_btn = "h0right"
+input_a_btn = "97"
+input_x_btn = "100"
+input_l_btn = "102"
+input_r_btn = "103"
+input_l2_axis = "+6"
+input_r2_axis = "+7"
+input_l3_btn = "106"
+input_r3_btn = "107"
+input_l_x_plus_axis = "+0"
+input_l_x_minus_axis = "-0"
+input_l_y_plus_axis = "+1"
+input_l_y_minus_axis = "-1"
+input_r_x_plus_axis = "+2"
+input_r_x_minus_axis = "-2"
+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 = "Share"
+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"
+input_right_btn_label = "D-Pad Right"
+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"
+input_r2_axis_label = "R2"
+input_l3_btn_label = "L3"
+input_r3_btn_label = "R3"
+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"