Fix Retroarch, add controller configs

packages/emulators/standalone/dolphin-sa/config/OGU/GCPadNew.ini

@@ -1,23 +1,23 @@
 [GCPad1]
-Device = evdev/0/Microsoft X-Box 360 pad
-Buttons/A = Button 1
-Buttons/B = Button 0
-Buttons/Start = Button 6
-Buttons/X = Button 3
+Device = evdev/0/GO-Ultra Gamepad
+Buttons/A = Button 0
+Buttons/B = Button 3
+Buttons/Start = Button 12
+Buttons/X = Button 1
 Buttons/Y = Button 2
-Buttons/Z = Button 5
-Buttons/Hotkey = Button 7
+Buttons/Z = Button 7
+Buttons/Hotkey = Button 17
 C-Stick/Dead Zone = 25.000000000000000
-C-Stick/Down = Axis 4+
-C-Stick/Left = Axis 3-
+C-Stick/Down = Axis 3+
+C-Stick/Left = Axis 2-
 C-Stick/Modifier = Control_L
 C-Stick/Modifier/Range = 50.000000000000000
-C-Stick/Right = Axis 3+
-C-Stick/Up = Axis 4-
-D-Pad/Down = Axis 7+
-D-Pad/Left = Axis 6-
-D-Pad/Right = Axis 6+
-D-Pad/Up = Axis 7-
+C-Stick/Right = Axis 2+
+C-Stick/Up = Axis 3-
+D-Pad/Down = Button 9
+D-Pad/Left = Button 10
+D-Pad/Right = Button 11
+D-Pad/Up = Button 8
 Main Stick/Dead Zone = 25.000000000000000
 Main Stick/Down = Axis 1+
 Main Stick/Left = Axis 0-
@@ -25,5 +25,5 @@ Main Stick/Modifier = Shift_L
 Main Stick/Modifier/Range = 50.000000000000000
 Main Stick/Right = Axis 0+
 Main Stick/Up = Axis 1-
-Triggers/L = Axis 2+
-Triggers/R = Axis 5+
+Triggers/L = Button 4
+Triggers/R = Button 5

packages/emulators/standalone/duckstation-sa/config/OGU/settings.ini

@@ -252,17 +252,17 @@ Right = SDL-0/DPadRight
 Down = SDL-0/DPadDown
 Left = SDL-0/DPadLeft
 Triangle = SDL-0/X
-Circle = SDL-0/A
-Cross = SDL-0/B
+Circle = SDL-0/B
+Cross = SDL-0/A
 Square = SDL-0/Y
-Select = SDL-0/Back
-Start = SDL-0/Start
+Select = SDL-0/Button12
+Start = SDL-0/Button17
 L1 = SDL-0/LeftShoulder
 R1 = SDL-0/RightShoulder
 L2 = SDL-0/+LeftTrigger
 R2 = SDL-0/+RightTrigger
-L3 = SDL-0/LeftStick & SDL-0/-LeftX
-R3 = SDL-0/RightStick
+L3 = SDL-0/Button14
+R3 = SDL-0/Button15
 LLeft = SDL-0/-LeftX
 LRight = SDL-0/+LeftX
 LDown = SDL-0/+LeftY
@@ -303,25 +303,25 @@ Type = None
 
 [Hotkeys]
 Screenshot = SDL-0/Back & SDL-0/A
-ToggleWidescreen = SDL-0/Back & SDL-0/Y
-OpenPauseMenu = SDL-0/Back & SDL-0/X
-LoadSelectedSaveState = SDL-0/Back & SDL-0/LeftShoulder
-SaveSelectedSaveState = SDL-0/Back & SDL-0/RightShoulder
+ToggleWidescreen = SDL-0/Button12 & SDL-0/Y
+OpenPauseMenu = SDL-0/Button12 & SDL-0/X
+LoadSelectedSaveState = SDL-0/Button12 & SDL-0/LeftShoulder
+SaveSelectedSaveState = SDL-0/Button12 & SDL-0/RightShoulder
 SelectPreviousSaveStateSlot = SDL-0/Back & SDL-0/+RightY
 SelectNextSaveStateSlot = SDL-0/Back & SDL-0/-RightY
-ToggleFastForward = SDL-0/Back & SDL-0/+RightTrigger
-PowerOff = SDL-0/Back & SDL-0/Start
+ToggleFastForward = SDL-0/Button12 & SDL-0/+RightTrigger
+PowerOff = SDL-0/Button12 & SDL-0/Button17
 Reset = SDL-0/Back & SDL-0/B
 ChangeDisc = SDL-0/Back & SDL-0/-RightX
 SwapMemoryCards = SDL-0/Back & SDL-0/+RightX
-Rewind = SDL-0/Back & SDL-0/+LeftTrigger
+Rewind = SDL-0/Button12 & SDL-0/+LeftTrigger
 
 
 [NoGUI]
 WindowX = 0
 WindowY = 0
-WindowWidth = 1920
-WindowHeight = 1152
+WindowWidth = 854
+WindowHeight = 480
 
 
 [GameList]

packages/emulators/tools/retroarch-joypads/gamepads/GO-Ultra Gamepad.cfg

@@ -0,0 +1,51 @@
+input_device = "GO-Ultra Gamepad"
+input_driver = "udev"
+
+input_b_btn = "0"
+input_a_btn = "1"
+input_x_btn = "2"
+input_y_btn = "3"
+input_l_btn = "4"
+input_r_btn = "5"
+input_l2_btn = "6"
+input_r2_btn = "7"
+
+input_up_btn = "8"
+input_down_btn = "9"
+input_left_btn = "10"
+input_right_btn = "11"
+
+input_select_btn = "12"
+input_start_btn = "17"
+
+input_l3_btn = "14"
+input_r3_btn = "15"
+
+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"
+
+
+# Hotkeys
+input_enable_hotkey_btn = "12"
+input_exit_emulator_btn = "13"
+
+input_screenshot_btn = "0"
+input_pause_toggle_btn = "1"
+input_menu_toggle_btn = "2"
+input_fps_toggle_btn = "3"
+
+input_state_slot_increase_btn = "8"
+input_state_slot_decrease_btn = "9"
+
+input_load_state_btn = "4"
+input_save_state_btn = "5"
+
+input_rewind_btn = "6" 
+input_toggle_fast_forward_btn = "7"

projects/Amlogic/packages/linux/package.mk

@@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"
 
 case ${DEVICE} in
   OGU)
-    PKG_VERSION="525f871874b3bbb724a333f45a4ae2002a201329"
+    PKG_VERSION="ebbf6b19d27cd2a11be22c0282a7bbfdab64bbe3"
     PKG_URL="https://github.com/mdrjr/linux.git"
     GET_HANDLER_SUPPORT="git"
     PKG_GIT_CLONE_BRANCH="odroidg12-6.1.y"