ES input PS3 GamePad Default Controller Assignment Fix.

packages/sx05re/emuelec-emulationstation/config/es_input.cfg

@@ -3,32 +3,32 @@
   <inputAction type="onfinish">
     <command>bash /storage/.emulationstation/scripts/inputconfiguration.sh</command>
   </inputAction>
-  <inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller">
-	<input name="a" type="button" id="13" value="1" />
-	<input name="b" type="button" id="14" value="1" />
-	<input name="down" type="button" id="6" value="1" />
-	<input name="hotkeyenable" type="button" id="16" value="1" />
-	<input name="left" type="button" id="7" value="1" />
-	<input name="leftanalogdown" type="axis" id="1" value="1" />
-	<input name="leftanalogleft" type="axis" id="0" value="-1" />
-	<input name="leftanalogright" type="axis" id="0" value="1" />
-	<input name="leftanalogup" type="axis" id="1" value="-1" />
-	<input name="leftshoulder" type="button" id="10" value="1" />
-	<input name="leftthumb" type="button" id="1" value="1" />
-	<input name="lefttrigger" type="button" id="8" value="1" />
-	<input name="right" type="button" id="5" value="1" />
-	<input name="rightanalogdown" type="axis" id="3" value="1" />
-	<input name="rightanalogleft" type="axis" id="2" value="-1" />
-	<input name="rightanalogright" type="axis" id="2" value="1" />
-	<input name="rightanalogup" type="axis" id="3" value="-1" />
-	<input name="rightshoulder" type="button" id="11" value="1" />
-	<input name="rightthumb" type="button" id="2" value="1" />
-	<input name="righttrigger" type="button" id="9" value="1" />
-	<input name="select" type="button" id="0" value="1" />
-	<input name="start" type="button" id="3" value="1" />
-	<input name="up" type="button" id="4" value="1" />
-	<input name="x" type="button" id="12" value="1" />
-	<input name="y" type="button" id="15" value="1" />
+<inputConfig type="joystick" deviceName="Sony PLAYSTATION(R)3 Controller" deviceGUID="030000004c0500006802000011810000">
+    <input name="a" type="button" id="1" value="1" />
+    <input name="b" type="button" id="0" value="1" />
+    <input name="down" type="button" id="14" value="1" />
+    <input name="hotkeyenable" type="button" id="10" value="1" />
+    <input name="left" type="button" id="15" value="1" />
+    <input name="leftanalogdown" type="axis" id="1" value="1" />
+    <input name="leftanalogleft" type="axis" id="0" value="-1" />
+    <input name="leftanalogright" type="axis" id="0" value="1" />
+    <input name="leftanalogup" type="axis" id="1" value="-1" />
+    <input name="leftshoulder" type="button" id="4" value="1" />
+    <input name="leftthumb" type="button" id="11" value="1" />
+    <input name="lefttrigger" type="button" id="6" value="1" />
+    <input name="right" type="button" id="16" value="1" />
+    <input name="rightanalogdown" type="axis" id="4" value="1" />
+    <input name="rightanalogleft" type="axis" id="3" value="-1" />
+    <input name="rightanalogright" type="axis" id="3" value="1" />
+    <input name="rightanalogup" type="axis" id="4" value="-1" />
+    <input name="rightshoulder" type="button" id="5" value="1" />
+    <input name="rightthumb" type="button" id="12" value="1" />
+    <input name="righttrigger" type="button" id="7" value="1" />
+    <input name="select" type="button" id="8" value="1" />
+    <input name="start" type="button" id="9" value="1" />
+    <input name="up" type="button" id="13" value="1" />
+    <input name="x" type="button" id="2" value="1" />
+    <input name="y" type="button" id="3" value="1" />
 </inputConfig>
 <inputConfig type="joystick" deviceName="GZ RX CO.,LTD. RX Gamepad">
     <input name="start" type="button" id="9" value="1"/>

packages/sx05re/emuelec/gamepads/Sony PLAYSTATION(R)3 Controller.cfg

@@ -1,37 +1,41 @@
 input_device = "Sony PLAYSTATION(R)3 Controller"
 input_driver = "udev"
-input_r_y_plus_axis = "+3"
-input_l3_btn = "1"
-input_r_x_minus_axis = "-2"
-input_l_btn = "10"
-input_load_state_btn = "10"
-input_start_btn = "3"
-input_exit_emulator_btn = "3"
-input_l_y_minus_axis = "-1"
-input_up_btn = "4"
-input_r_y_minus_axis = "-3"
-input_a_btn = "13"
-input_b_btn = "14"
-input_reset_btn = "14"
-input_enable_hotkey_btn = "16"
-input_down_btn = "6"
+input_vendor_id = "1356"
+input_product_id = "616"
+input_r_y_plus_axis = "+4"
+input_left_btn = "15"
+input_state_slot_decrease_btn = "15"
+input_r_x_minus_axis = "-3"
+input_right_btn = "16"
+input_state_slot_increase_btn = "16"
+input_r_btn = "5"
+input_save_state_btn = "5"
+input_down_btn = "14"
+input_volume_down_btn = "14"
+input_r_y_minus_axis = "-4"
+input_l_btn = "4"
+input_load_state_btn = "4"
+input_r_x_plus_axis = "+3"
+input_y_btn = "3"
+input_x_btn = "2"
+input_menu_toggle_btn = "2"
+input_b_btn = "0"
+input_reset_btn = "0"
+input_a_btn = "1"
+input_up_btn = "13"
+input_volume_up_btn = "13"
+input_select_btn = "8"
+input_l3_btn = "11"
+input_start_btn = "9"
+input_exit_emulator_btn = "9"
 input_l_x_plus_axis = "+0"
+input_l_y_minus_axis = "-1"
+input_enable_hotkey_btn = "8"
+input_l2_axis = "+2"
+input_rewind_axis = "+2"
+input_r2_axis = "+5"
+input_toggle_fast_forward_axis = "+5"
 input_l_y_plus_axis = "+1"
-input_r_btn = "11"
-input_save_state_btn = "11"
-input_r2_btn = "9"
-input_toggle_fast_forward_btn = "9"
-input_r3_btn = "2"
-input_fps_toggle_btn = "2"
-input_right_btn = "5"
-input_state_slot_increase_btn = "5"
-input_x_btn = "12"
-input_menu_toggle_btn = "12"
-input_select_btn = "0"
+input_r3_btn = "12"
+input_fps_toggle_btn = "12"
 input_l_x_minus_axis = "-0"
-input_y_btn = "15"
-input_left_btn = "7"
-input_state_slot_decrease_btn = "7"
-input_r_x_plus_axis = "+2"
-input_l2_btn = "8"
-input_rewind_btn = "8"

packages/sx05re/tools/sysutils/SDL_GameControllerDB/package.mk

@@ -16,6 +16,7 @@ pre_configure_target() {
 sed -i "s/19000000010000000100000001010000,odroid/# 19000000010000000100000001010000,odroid/g" gamecontrollerdb.txt
 sed -i "s/19000000010000000200000011000000,odroid/# 19000000010000000200000011000000,odroid/g" gamecontrollerdb.txt
 sed -i "s/03000000d11800000094000011010000,Stadia Controller/# 03000000d11800000094000011010000,Stadia Controller/g" gamecontrollerdb.txt
+sed -i "s/030000004c0500006802000011810000,PS3 Controller/# 030000004c0500006802000011810000,PS3 Controller/g" gamecontrollerdb.txt
 }
 
 makeinstall_target() {

packages/sx05re/tools/sysutils/SDL_GameControllerDB/patches/add-emuelec-gamepads.patch

@@ -1,10 +1,11 @@
 --- a/gamecontrollerdb.txt
 +++ b/gamecontrollerdb.txt
-@@ -1,5 +1,17 @@
+@@ -1,5 +1,18 @@
  # Game Controller DB for SDL in 2.0.9 format
  # Source: https://github.com/gabomdq/SDL_GameControllerDB
 +
 +# EmuELEC extra gamepads
++030000004c0500006802000011810000,Sony PLAYSTATION(R)3 Controller,platform:Linux,dpleft:b15,rightx:a3,dpright:b16,rightshoulder:b5,dpdown:b14,righty:a4,leftshoulder:b4,y:b3,x:b2,b:b0,a:b1,dpup:b13,back:b8,leftstick:b11,start:b9,lefty:a1,guide:b8,lefttrigger:a2,righttrigger:a5,rightstick:b12,leftx:a0,
 +190000004b4800000010000000010000,GO-Advance Gamepad,platform:Linux,a:b0,b:b1,x:b3,y:b2,back:b10,start:b15,leftstick:b12,rightstick:b13,leftshoulder:b4,rightshoulder:b5,dpup:b6,dpdown:b7,dpleft:b8,dpright:b9,leftx:a0,lefty:a1,lefttrigger:b11,righttrigger:b14,
 +190000004b4800000010000001010000,GO-Advance Gamepad (rev 1.1),platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b12,guide:b13,start:b17,dpleft:b10,dpdown:b9,dpright:b11,dpup:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,rightstick:b16,leftx:a0,lefty:a1,
 +190000004b4800000011000000010000,GO-Super Gamepad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b12,guide:b16,start:b13,dpleft:b10,dpdown:b9,dpright:b11,dpup:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b14,rightstick:b17,leftx:a0,lefty:a1,rightx:a2,righty:a3,