From 2e554b27989aeb8e13ec305b3efd6fb088dfe9a3 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Tue, 6 Aug 2024 11:40:06 +0200 Subject: [PATCH 01/16] Update Sony_DualShock_4_Controller_v2.cfg input_menu_toggle_btn = "110" input_menu_toggle_label = "PS" --- android/Sony_DualShock_4_Controller_v2.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Sony_DualShock_4_Controller_v2.cfg b/android/Sony_DualShock_4_Controller_v2.cfg index 66cbae514..0f8963d0c 100644 --- a/android/Sony_DualShock_4_Controller_v2.cfg +++ b/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" From c2f7252a26b3525d621dad2a9dd46b3db9fdc203 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Tue, 6 Aug 2024 11:45:27 +0200 Subject: [PATCH 02/16] Update Sony_DualShock_4_Controller_v2.cfg Analog trigger comments --- android/Sony_DualShock_4_Controller_v2.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/Sony_DualShock_4_Controller_v2.cfg b/android/Sony_DualShock_4_Controller_v2.cfg index 0f8963d0c..7d4907ddc 100644 --- a/android/Sony_DualShock_4_Controller_v2.cfg +++ b/android/Sony_DualShock_4_Controller_v2.cfg @@ -15,6 +15,10 @@ input_a_btn = "97" input_x_btn = "100" input_l_btn = "102" input_r_btn = "103" +# 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 which additionally allow l2/r2 to be polled as analog axises : input_l2_axis = "+6" input_r2_axis = "+7" input_l3_btn = "106" From 86eb68f3b6775f767d519772739e00cd11b8e493 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Sat, 10 Aug 2024 20:58:28 +0200 Subject: [PATCH 03/16] Update Sony_DualShock_4_Controller_v2.cfg Sony DualShock 4 v2 Controller --- android/Sony_DualShock_4_Controller_v2.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/Sony_DualShock_4_Controller_v2.cfg b/android/Sony_DualShock_4_Controller_v2.cfg index 7d4907ddc..1f3473719 100644 --- a/android/Sony_DualShock_4_Controller_v2.cfg +++ b/android/Sony_DualShock_4_Controller_v2.cfg @@ -1,6 +1,6 @@ input_driver = "android" input_device = "Sony Interactive Entertainment Wireless Controller" -input_device_display_name = "Sony DualShock 4 Controller (v2)" +input_device_display_name = "Sony DualShock 4 v2 Controller" input_vendor_id = "1356" input_product_id = "2508" input_b_btn = "96" From 9564a81a3ac580dc004feb771c7c12fac492604e Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Sun, 18 Aug 2024 16:15:28 +0200 Subject: [PATCH 04/16] Update and rename Sony_DualShock_4_Controller_v2.cfg to Wireless Controller.cfg RetroArch 1.19.1 generates "Wireless Controller" in multiple Android versions. --- ...ny_DualShock_4_Controller_v2.cfg => Wireless Controller.cfg} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename android/{Sony_DualShock_4_Controller_v2.cfg => Wireless Controller.cfg} (96%) diff --git a/android/Sony_DualShock_4_Controller_v2.cfg b/android/Wireless Controller.cfg similarity index 96% rename from android/Sony_DualShock_4_Controller_v2.cfg rename to android/Wireless Controller.cfg index 1f3473719..020b63374 100644 --- a/android/Sony_DualShock_4_Controller_v2.cfg +++ b/android/Wireless Controller.cfg @@ -1,5 +1,5 @@ input_driver = "android" -input_device = "Sony Interactive Entertainment Wireless Controller" +input_device = "Wireless Controller" input_device_display_name = "Sony DualShock 4 v2 Controller" input_vendor_id = "1356" input_product_id = "2508" From 0fd5674a533b658362f1d27d5a50ce9d9638ed2b Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Sun, 18 Aug 2024 16:21:42 +0200 Subject: [PATCH 05/16] Update Wireless Controller.cfg input_select_btn = "109" --- android/Wireless Controller.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index 020b63374..098a0f658 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -5,7 +5,7 @@ input_vendor_id = "1356" input_product_id = "2508" input_b_btn = "96" input_y_btn = "99" -input_select_btn = "4" +input_select_btn = "109" input_start_btn = "108" input_up_btn = "h0up" input_down_btn = "h0down" From a79ad67dfc57a60ceba25e9189153e5d5f44b078 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Tue, 20 Aug 2024 06:52:53 +0200 Subject: [PATCH 06/16] Update Wireless Controller.cfg input_l2_axis_label = "L2 Analog" input_r2_axis_label = "R2 Analog" --- android/Wireless Controller.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index 098a0f658..558f0055f 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -45,8 +45,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" -input_r2_axis_label = "R2" +input_l2_axis_label = "L2 Analog" +input_r2_axis_label = "R2 Analog" input_l3_btn_label = "L3" input_r3_btn_label = "R3" input_l_x_plus_axis_label = "Left Analog X+" From 225b617f58554789b60bbe16c65b9a1ad386e833 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Fri, 23 Aug 2024 10:15:43 +0200 Subject: [PATCH 07/16] Update Wireless Controller.cfg # Analog indication verified in Remote RetroPad: Yes --- android/Wireless Controller.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index 558f0055f..89d582108 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -19,8 +19,8 @@ input_r_btn = "103" # input_l2_btn = "104" # input_r2_btn = "105" # Those 2 lines are a downgrade from the 2 following lines which additionally allow l2/r2 to be polled as analog axises : -input_l2_axis = "+6" -input_r2_axis = "+7" +input_l2_axis = "+6" # Analog indication verified in Remote RetroPad: Yes +input_r2_axis = "+7" # Analog indication verified in Remote RetroPad: Yes input_l3_btn = "106" input_r3_btn = "107" input_l_x_plus_axis = "+0" From 2c1e5bc8cd5ad5f101e22a7b9c9c0b5d02868c57 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Fri, 23 Aug 2024 16:19:06 +0200 Subject: [PATCH 08/16] Update Wireless Controller.cfg Unnecessary input_device in autoconfig files generated by the android, and sdl2 controller drivers - https://github.com/libretro/RetroArch/issues/16920 --- android/Wireless Controller.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index 89d582108..493dd118f 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -1,5 +1,4 @@ input_driver = "android" -input_device = "Wireless Controller" input_device_display_name = "Sony DualShock 4 v2 Controller" input_vendor_id = "1356" input_product_id = "2508" From e82cbc66c34e72d4c0606977099120ddd35fd946 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Fri, 23 Aug 2024 16:47:44 +0200 Subject: [PATCH 09/16] Update Wireless Controller.cfg Removed the final comments --- android/Wireless Controller.cfg | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index 493dd118f..d9aeb9beb 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -14,12 +14,8 @@ input_a_btn = "97" input_x_btn = "100" input_l_btn = "102" input_r_btn = "103" -# 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 which additionally allow l2/r2 to be polled as analog axises : -input_l2_axis = "+6" # Analog indication verified in Remote RetroPad: Yes -input_r2_axis = "+7" # Analog indication verified in Remote RetroPad: Yes +input_l2_axis = "+6" +input_r2_axis = "+7" input_l3_btn = "106" input_r3_btn = "107" input_l_x_plus_axis = "+0" From 2ec1e16bed0f478f85a20b7c821d50e7ff5f42bb Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Sat, 24 Aug 2024 08:20:54 +0200 Subject: [PATCH 10/16] Update Wireless Controller.cfg From 02cb987efabd2621d0ae5f6854b1b8ef896ebe96 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Sun, 25 Aug 2024 10:20:46 +0200 Subject: [PATCH 11/16] Update Wireless Controller.cfg --- android/Wireless Controller.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index d9aeb9beb..fc2e577f0 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -27,7 +27,6 @@ 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" From 9b705a0029503376dbdccc5f5676ec1f73257c42 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Wed, 4 Sep 2024 15:27:44 +0200 Subject: [PATCH 12/16] Update Wireless Controller.cfg Solved: https://github.com/libretro/RetroArch/issues/16920 --- android/Wireless Controller.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index fc2e577f0..689652846 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -1,4 +1,5 @@ input_driver = "android" +input_device = "Sony Interactive Entertainment Wireless Controller" input_device_display_name = "Sony DualShock 4 v2 Controller" input_vendor_id = "1356" input_product_id = "2508" From 9cf834bc55fd4b8a2ba3b4521c6f5502d0366c6c Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Wed, 4 Sep 2024 15:29:06 +0200 Subject: [PATCH 13/16] Update Wireless Controller.cfg input_device = "Wireless Controller" --- android/Wireless Controller.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index 689652846..bb14690c1 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -1,5 +1,5 @@ input_driver = "android" -input_device = "Sony Interactive Entertainment Wireless Controller" +input_device = "Wireless Controller" input_device_display_name = "Sony DualShock 4 v2 Controller" input_vendor_id = "1356" input_product_id = "2508" From 056443e5c0116856410e16a4e035ca2ced710133 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Thu, 5 Sep 2024 00:27:42 +0200 Subject: [PATCH 14/16] Update Wireless Controller.cfg input_l2_axis_label = "L2 Trigger" input_r2_axis_label = "R2 Trigger" --- android/Wireless Controller.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index bb14690c1..b960d1a84 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -40,8 +40,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+" From bc93669b64d4432f0ecc8ef174c0346aa18fd5ef Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Fri, 13 Sep 2024 00:33:49 +0200 Subject: [PATCH 15/16] Update Wireless Controller.cfg https://github.com/libretro/RetroArch/pull/16990 --- android/Wireless Controller.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/Wireless Controller.cfg b/android/Wireless Controller.cfg index b960d1a84..b72ca8360 100644 --- a/android/Wireless Controller.cfg +++ b/android/Wireless Controller.cfg @@ -1,8 +1,12 @@ input_driver = "android" input_device = "Wireless Controller" -input_device_display_name = "Sony DualShock 4 v2 Controller" +input_device_display_name = "Wireless Controller (DualShock 4 v2)" input_vendor_id = "1356" input_product_id = "2508" +input_device_alt1 = "Sony Computer Entertainment Wireless Controller" +input_device_display_name_alt1 = "Sony Computer Entertainment Wireless Controller (DualShock 4 v1)" +input_vendor_id_alt1 = "1356" +input_product_id_alt1 = "1476" input_b_btn = "96" input_y_btn = "99" input_select_btn = "109" From f7a398e6ebd7c62aeebb932668295f76882db824 Mon Sep 17 00:00:00 2001 From: David Hedlund Date: Fri, 13 Sep 2024 00:36:56 +0200 Subject: [PATCH 16/16] Delete android/Sony_DualShock_4_Controller.cfg Merged to Wireless Controller.cfg See https://github.com/libretro/RetroArch/pull/16990 --- android/Sony_DualShock_4_Controller.cfg | 56 ------------------------- 1 file changed, 56 deletions(-) delete mode 100644 android/Sony_DualShock_4_Controller.cfg diff --git a/android/Sony_DualShock_4_Controller.cfg b/android/Sony_DualShock_4_Controller.cfg deleted file mode 100644 index c3a82b6c9..000000000 --- a/android/Sony_DualShock_4_Controller.cfg +++ /dev/null @@ -1,56 +0,0 @@ -input_driver = "android" -input_device = "Sony Computer Entertainment Wireless Controller" -input_device_display_name = "Sony DualShock 4 Controller" -input_vendor_id = "1356" -input_product_id = "1476" -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_btn = "104" -input_r2_btn = "105" -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 = "109" - -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_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+" -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_label = "Touchpad"