From 0c36a79b79f96e4efe2fd32aca53de1047c6cd66 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Mon, 16 Sep 2024 17:53:01 +0100 Subject: [PATCH 1/6] fix trigger axes in android/8BitDo_Pro2_updatedFW.cfg --- android/8BitDo_Pro2_updatedFW.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/8BitDo_Pro2_updatedFW.cfg b/android/8BitDo_Pro2_updatedFW.cfg index 2e451160b..fdc993a8f 100644 --- a/android/8BitDo_Pro2_updatedFW.cfg +++ b/android/8BitDo_Pro2_updatedFW.cfg @@ -22,8 +22,8 @@ input_select_btn = "109" input_menu_toggle_btn = "110" input_l_btn = "102" input_r_btn = "103" -input_l2_axis = "+8" -input_r2_axis = "+9" +input_l2_axis = "+6" +input_r2_axis = "+7" input_l3_btn = "106" input_r3_btn = "107" @@ -68,3 +68,4 @@ input_r_x_plus_axis_label = "RS Right" input_r_x_minus_axis_label = "RS Left" input_r_y_plus_axis_label = "RS Down" input_r_y_minus_axis_label = "RS Up" + From b6e277b94120342202b24490ae59497b5f8d9bb0 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Mon, 16 Sep 2024 17:54:38 +0100 Subject: [PATCH 2/6] oops --- android/8BitDo_Pro2_updatedFW.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/android/8BitDo_Pro2_updatedFW.cfg b/android/8BitDo_Pro2_updatedFW.cfg index fdc993a8f..f020c031e 100644 --- a/android/8BitDo_Pro2_updatedFW.cfg +++ b/android/8BitDo_Pro2_updatedFW.cfg @@ -68,4 +68,3 @@ input_r_x_plus_axis_label = "RS Right" input_r_x_minus_axis_label = "RS Left" input_r_y_plus_axis_label = "RS Down" input_r_y_minus_axis_label = "RS Up" - From 73dc64be62bdd00760654d7502d31f74012baead Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Mon, 16 Sep 2024 22:13:29 +0100 Subject: [PATCH 3/6] merge android/8BitDo_Pro2_{BT,USB,updatedFW}.cfg using alt. PIDs, see https://github.com/libretro/RetroArch/pull/16990 --- ...tDo_Pro2_updatedFW.cfg => 8BitDo_Pro2.cfg} | 37 +++++----- android/8BitDo_Pro2_BT.cfg | 69 ------------------- android/8BitDo_Pro2_USB.cfg | 69 ------------------- 3 files changed, 19 insertions(+), 156 deletions(-) rename android/{8BitDo_Pro2_updatedFW.cfg => 8BitDo_Pro2.cfg} (70%) delete mode 100644 android/8BitDo_Pro2_BT.cfg delete mode 100644 android/8BitDo_Pro2_USB.cfg diff --git a/android/8BitDo_Pro2_updatedFW.cfg b/android/8BitDo_Pro2.cfg similarity index 70% rename from android/8BitDo_Pro2_updatedFW.cfg rename to android/8BitDo_Pro2.cfg index f020c031e..507d2c323 100644 --- a/android/8BitDo_Pro2_updatedFW.cfg +++ b/android/8BitDo_Pro2.cfg @@ -1,31 +1,32 @@ -# 8BitDo Pro 2 - https://www.8bitdo.com/ - https://www.8bitdo.com/pro2/ -# Firmware v1.05 - https://support.8bitdo.com/ - https://support.8bitdo.com/firmware-updater.html # This is with the device started in Android (D-Input) mode. -# Note: in updated firmware the USB and Bluetooth modes have the same PID. input_driver = "android" input_device = "8BitDo Pro 2" input_device_display_name = "8BitDo Pro 2" -# Hex vid:pid and Decimal vid:pid is shown in the "log_verbosity" window, enable "log_verbosity" in retroarch.cfg and run RetroArch. -# Hex vid:pid = 2DC8:6006 -> Decimal vid:pid = 11720:24582 - +# Hex VID:PID = 2DC8:6006 -> Decimal VID:PID = 11720:24582 input_vendor_id = "11720" input_product_id = "24582" -input_a_btn = "96" +# Firmware before v1.05 has different PID depending on connection. +# Bluetooth: Hex 6103 -> Decimal 24835 +# USB : Hex 6003 -> Decimal 24579 +input_product_id_alt1 = "24835" +input_product_id_alt2 = "24579" + input_b_btn = "97" -input_x_btn = "99" input_y_btn = "100" -input_start_btn = "108" input_select_btn = "109" -input_menu_toggle_btn = "110" +input_start_btn = "108" +input_a_btn = "96" +input_x_btn = "99" 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_menu_toggle_btn = "110" input_up_btn = "h0up" input_down_btn = "h0down" @@ -41,24 +42,24 @@ input_r_x_minus_axis = "-2" input_r_y_plus_axis = "+3" input_r_y_minus_axis = "-3" -input_a_btn_label = "A" input_b_btn_label = "B" -input_x_btn_label = "X" input_y_btn_label = "Y" -input_start_btn_label = "Start" input_select_btn_label = "Select" -input_menu_toggle_btn_label = "Home" +input_start_btn_label = "Start" +input_a_btn_label = "A" +input_x_btn_label = "X" input_l_btn_label = "L" input_r_btn_label = "R" input_l2_axis_label = "L2" input_r2_axis_label = "R2" input_l3_btn_label = "LS" input_r3_btn_label = "RS" +input_menu_toggle_btn_label = "Home" -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_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_l_x_plus_axis_label = "LS Right" input_l_x_minus_axis_label = "LS Left" diff --git a/android/8BitDo_Pro2_BT.cfg b/android/8BitDo_Pro2_BT.cfg deleted file mode 100644 index 8390f24d9..000000000 --- a/android/8BitDo_Pro2_BT.cfg +++ /dev/null @@ -1,69 +0,0 @@ -# 8BitDo Pro 2 - https://www.8bitdo.com/ - https://www.8bitdo.com/pro2/ -# Firmware v1.00 - https://support.8bitdo.com/ - https://support.8bitdo.com/firmware-updater.html -# This is with the device started in Android (D-Input) mode. - -input_driver = "android" -input_device = "8BitDo Pro 2" -input_device_display_name = "8BitDo Pro 2" - -# Hex vid:pid abd Decimal vid:pid is shown in the "log_verbosity" window, enable "log_verbosity" in retroarch.cfg and run RetroArch. -# Hex vid:pid = 2DC8:6103 -> Decimal vid:pid = 11720:24835 - -input_vendor_id = "11720" -input_product_id = "24835" - -input_b_btn = "97" -input_y_btn = "100" -input_select_btn = "109" -input_start_btn = "108" -input_a_btn = "96" -input_x_btn = "99" -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_menu_toggle_btn = "110" - -input_up_btn = "h0up" -input_down_btn = "h0down" -input_left_btn = "h0left" -input_right_btn = "h0right" - -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_b_btn_label = "B" -input_y_btn_label = "Y" -input_select_btn_label = "Select" -input_start_btn_label = "Start" -input_a_btn_label = "A" -input_x_btn_label = "X" -input_l_btn_label = "L1" -input_r_btn_label = "R1" -input_l2_btn_label = "L2" -input_r2_btn_label = "R2" -input_l3_btn_label = "LS" -input_r3_btn_label = "RS" -input_menu_toggle_btn_label = "Home" - -input_up_btn_label = "Dpad Up" -input_down_btn_label = "Dpad Down" -input_left_btn_label = "Dpad Left" -input_right_btn_label = "Dpad Right" - -input_l_x_plus_axis_label = "LS Right" -input_l_x_minus_axis_label = "LS Left" -input_l_y_plus_axis_label = "LS Down" -input_l_y_minus_axis_label = "LS Up" -input_r_x_plus_axis_label = "RS Right" -input_r_x_minus_axis_label = "RS Left" -input_r_y_plus_axis_label = "RS Down" -input_r_y_minus_axis_label = "RS Up" diff --git a/android/8BitDo_Pro2_USB.cfg b/android/8BitDo_Pro2_USB.cfg deleted file mode 100644 index f3a1e396d..000000000 --- a/android/8BitDo_Pro2_USB.cfg +++ /dev/null @@ -1,69 +0,0 @@ -# 8BitDo Pro 2 - https://www.8bitdo.com/ - https://www.8bitdo.com/pro2/ -# Firmware v1.00 - https://support.8bitdo.com/ - https://support.8bitdo.com/firmware-updater.html -# This is with the device started in Android (D-Input) mode. - -input_driver = "android" -input_device = "8BitDo Pro 2" -input_device_display_name = "8BitDo Pro 2" - -# Hex vid:pid abd Decimal vid:pid is shown in the "log_verbosity" window, enable "log_verbosity" in retroarch.cfg and run RetroArch. -# Hex vid:pid = 2DC8:6003 -> Decimal vid:pid = 11720:24579 - -input_vendor_id = "11720" -input_product_id = "24579" - -input_b_btn = "97" -input_y_btn = "100" -input_select_btn = "109" -input_start_btn = "108" -input_a_btn = "96" -input_x_btn = "99" -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_menu_toggle_btn = "110" - -input_up_btn = "h0up" -input_down_btn = "h0down" -input_left_btn = "h0left" -input_right_btn = "h0right" - -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_b_btn_label = "B" -input_y_btn_label = "Y" -input_select_btn_label = "Select" -input_start_btn_label = "Start" -input_a_btn_label = "A" -input_x_btn_label = "X" -input_l_btn_label = "L1" -input_r_btn_label = "R1" -input_l2_btn_label = "L2" -input_r2_btn_label = "R2" -input_l3_btn_label = "LS" -input_r3_btn_label = "RS" -input_menu_toggle_btn_label = "Home" - -input_up_btn_label = "Dpad Up" -input_down_btn_label = "Dpad Down" -input_left_btn_label = "Dpad Left" -input_right_btn_label = "Dpad Right" - -input_l_x_plus_axis_label = "LS Right" -input_l_x_minus_axis_label = "LS Left" -input_l_y_plus_axis_label = "LS Down" -input_l_y_minus_axis_label = "LS Up" -input_r_x_plus_axis_label = "RS Right" -input_r_x_minus_axis_label = "RS Left" -input_r_y_plus_axis_label = "RS Down" -input_r_y_minus_axis_label = "RS Up" From fe4cdeb532c87ba210eac384fc77ff2905f234a9 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Tue, 17 Sep 2024 03:04:55 +0100 Subject: [PATCH 4/6] vid alt? --- android/8BitDo_Pro2.cfg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/android/8BitDo_Pro2.cfg b/android/8BitDo_Pro2.cfg index 507d2c323..2d292b516 100644 --- a/android/8BitDo_Pro2.cfg +++ b/android/8BitDo_Pro2.cfg @@ -4,14 +4,17 @@ input_driver = "android" input_device = "8BitDo Pro 2" input_device_display_name = "8BitDo Pro 2" -# Hex VID:PID = 2DC8:6006 -> Decimal VID:PID = 11720:24582 +# v1.05+ : Hex vid:pid = 2DC8:6006 -> Decimal vid:pid = 11720:24582 input_vendor_id = "11720" input_product_id = "24582" # Firmware before v1.05 has different PID depending on connection. -# Bluetooth: Hex 6103 -> Decimal 24835 -# USB : Hex 6003 -> Decimal 24579 +# Bluetooth: Hex vid:pid = 2DC8:6103 -> Decimal vid:pid = 11720:24835 +input_vendor_id_alt1 = "11720" input_product_id_alt1 = "24835" + +# USB : Hex vid:pid = 2DC8:6003 -> Decimal vid:pid = 11720:24579 +input_vendor_id_alt2 = "11720" input_product_id_alt2 = "24579" input_b_btn = "97" From cdf951accd6a4e476a46457d436e91d627a241a2 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Tue, 17 Sep 2024 05:29:31 +0100 Subject: [PATCH 5/6] add input_device_alts --- android/8BitDo_Pro2.cfg | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/android/8BitDo_Pro2.cfg b/android/8BitDo_Pro2.cfg index 2d292b516..03d20ca75 100644 --- a/android/8BitDo_Pro2.cfg +++ b/android/8BitDo_Pro2.cfg @@ -1,19 +1,22 @@ # This is with the device started in Android (D-Input) mode. - input_driver = "android" + +# Firmware v1.05 or newer input_device = "8BitDo Pro 2" +# on USB, input_device = "8BitDo 8BitDo Pro 2". See below. input_device_display_name = "8BitDo Pro 2" - -# v1.05+ : Hex vid:pid = 2DC8:6006 -> Decimal vid:pid = 11720:24582 input_vendor_id = "11720" input_product_id = "24582" -# Firmware before v1.05 has different PID depending on connection. -# Bluetooth: Hex vid:pid = 2DC8:6103 -> Decimal vid:pid = 11720:24835 +# Firmware before v1.05 has different PID depending on connection type. +input_device_alt1 = "8BitDo Pro 2" +input_device_display_name_alt1 = "8BitDo Pro 2 (old firmware, Bluetooth)" input_vendor_id_alt1 = "11720" input_product_id_alt1 = "24835" -# USB : Hex vid:pid = 2DC8:6003 -> Decimal vid:pid = 11720:24579 +# on USB, Android prepends the vendor to the product name, so 8BitDo twice. +input_device_alt2 = "8BitDo 8BitDo Pro 2" +input_device_display_name_alt2 = "8BitDo Pro 2 (old firmware, USB)" input_vendor_id_alt2 = "11720" input_product_id_alt2 = "24579" @@ -21,6 +24,10 @@ input_b_btn = "97" input_y_btn = "100" input_select_btn = "109" input_start_btn = "108" +input_up_btn = "h0up" +input_down_btn = "h0down" +input_left_btn = "h0left" +input_right_btn = "h0right" input_a_btn = "96" input_x_btn = "99" input_l_btn = "102" @@ -29,13 +36,6 @@ input_l2_axis = "+6" input_r2_axis = "+7" input_l3_btn = "106" input_r3_btn = "107" -input_menu_toggle_btn = "110" - -input_up_btn = "h0up" -input_down_btn = "h0down" -input_left_btn = "h0left" -input_right_btn = "h0right" - input_l_x_plus_axis = "+0" input_l_x_minus_axis = "-0" input_l_y_plus_axis = "+1" @@ -44,11 +44,16 @@ 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 = "B" input_y_btn_label = "Y" input_select_btn_label = "Select" input_start_btn_label = "Start" +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 = "A" input_x_btn_label = "X" input_l_btn_label = "L" @@ -57,13 +62,6 @@ input_l2_axis_label = "L2" input_r2_axis_label = "R2" input_l3_btn_label = "LS" input_r3_btn_label = "RS" -input_menu_toggle_btn_label = "Home" - -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_l_x_plus_axis_label = "LS Right" input_l_x_minus_axis_label = "LS Left" input_l_y_plus_axis_label = "LS Down" @@ -72,3 +70,4 @@ input_r_x_plus_axis_label = "RS Right" input_r_x_minus_axis_label = "RS Left" input_r_y_plus_axis_label = "RS Down" input_r_y_minus_axis_label = "RS Up" +input_menu_toggle_btn_label = "Home" From ca594f16240bae88e683828df71fc187680d71db Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Tue, 17 Sep 2024 05:34:06 +0100 Subject: [PATCH 6/6] restore comments --- android/8BitDo_Pro2.cfg | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/android/8BitDo_Pro2.cfg b/android/8BitDo_Pro2.cfg index 03d20ca75..1c913c604 100644 --- a/android/8BitDo_Pro2.cfg +++ b/android/8BitDo_Pro2.cfg @@ -1,22 +1,27 @@ +# 8BitDo Pro 2 - https://www.8bitdo.com/ - https://www.8bitdo.com/pro2/ +# Firmware v1.05 - https://support.8bitdo.com/ - https://support.8bitdo.com/firmware-updater.html # This is with the device started in Android (D-Input) mode. -input_driver = "android" -# Firmware v1.05 or newer +input_driver = "android" input_device = "8BitDo Pro 2" # on USB, input_device = "8BitDo 8BitDo Pro 2". See below. input_device_display_name = "8BitDo Pro 2" +# Hex vid:pid and Decimal vid:pid is shown in the "log_verbosity" window, enable "log_verbosity" in retroarch.cfg and run RetroArch. +# Hex vid:pid = 2DC8:6006 -> Decimal vid:pid = 11720:24582 input_vendor_id = "11720" input_product_id = "24582" # Firmware before v1.05 has different PID depending on connection type. input_device_alt1 = "8BitDo Pro 2" input_device_display_name_alt1 = "8BitDo Pro 2 (old firmware, Bluetooth)" +# Hex vid:pid = 2DC8:6103 -> Decimal vid:pid = 11720:24835 input_vendor_id_alt1 = "11720" input_product_id_alt1 = "24835" # on USB, Android prepends the vendor to the product name, so 8BitDo twice. input_device_alt2 = "8BitDo 8BitDo Pro 2" input_device_display_name_alt2 = "8BitDo Pro 2 (old firmware, USB)" +# Hex vid:pid = 2DC8:6003 -> Decimal vid:pid = 11720:24579 input_vendor_id_alt2 = "11720" input_product_id_alt2 = "24579"