From c9c2c894dec82d39b73b7e5445d9a9bd5d1e0cf5 Mon Sep 17 00:00:00 2001 From: mason Date: Thu, 30 Mar 2023 13:37:42 +0000 Subject: [PATCH] Add controller configs --- .../OGU/WiiControllerProfiles/classic.ini | 30 ++++++++--------- .../OGU/WiiControllerProfiles/nunchuck.ini | 28 ++++++++-------- .../OGU/WiiControllerProfiles/remote.ini | 20 +++++------ .../config/OGU/mupen64plus.cfg | 10 +++--- .../config/OGU/default.ini | 33 +++++++++---------- .../config/common/es_input.cfg | 27 +++++++++++++++ 6 files changed, 86 insertions(+), 62 deletions(-) diff --git a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/classic.ini b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/classic.ini index b9450699c..408db60f3 100644 --- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/classic.ini +++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/classic.ini @@ -1,27 +1,27 @@ [Wiimote1] -Device = evdev/0/Microsoft X-Box 360 pad +Device = evdev/0/GO-Ultra Gamepad Extension = Classic Source = 1 Classic/Buttons/A = Button 1 Classic/Buttons/B = Button 0 -Classic/Buttons/X = Button 3 -Classic/Buttons/Y = Button 2 -Classic/Buttons/ZL = Axis 2+ -Classic/Buttons/ZR = Axis 5+ -Classic/Buttons/- = Button 6 -Classic/Buttons/+ = Button 7 +Classic/Buttons/X = Button 2 +Classic/Buttons/Y = Button 3 +Classic/Buttons/ZL = Button 6 +Classic/Buttons/ZR = Button 7 +Classic/Buttons/- = Button 12 +Classic/Buttons/+ = Button 17 Classic/Buttons/Home = Button 8 Classic/Left Stick/Up = Axis 1- Classic/Left Stick/Down = Axis 1+ Classic/Left Stick/Left = Axis 0- Classic/Left Stick/Right = Axis 0+ -Classic/Right Stick/Up = Axis 4- -Classic/Right Stick/Down = Axis 4+ -Classic/Right Stick/Left = Axis 3- -Classic/Right Stick/Right = Axis 3+ +Classic/Right Stick/Up = Axis 3- +Classic/Right Stick/Down = Axis3+ +Classic/Right Stick/Left = Axis 2- +Classic/Right Stick/Right = Axis 2+ Classic/Triggers/L = Button 4 Classic/Triggers/R = Button 5 -Classic/D-Pad/Up = Axis 7- -Classic/D-Pad/Down = Axis 7+ -Classic/D-Pad/Left = Axis 6- -Classic/D-Pad/Right = Axis 6+ +Classic/D-Pad/Up = Button 8 +Classic/D-Pad/Down = Button 9 +Classic/D-Pad/Left = Button 10 +Classic/D-Pad/Right = Button 11 diff --git a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/nunchuck.ini b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/nunchuck.ini index ce65fba9b..40775c643 100644 --- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/nunchuck.ini +++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/nunchuck.ini @@ -1,26 +1,26 @@ [Wiimote1] -Device = evdev/0/Microsoft X-Box 360 pad +Device = evdev/0/GO-Ultra Gamepad Extension = Nunchuk Buttons/A = Button 0 Buttons/B = Button 1 -Buttons/1 = Button 2 -Buttons/2 = Button 3 -Buttons/- = Button 6 -Buttons/+ = Button 7 -D-Pad/Up = Axis 7- -D-Pad/Down = Axis 7+ -D-Pad/Left = Axis 6- -D-Pad/Right = Axis 6+ -Buttons/Home = Button 8 +Buttons/1 = Button 3 +Buttons/2 = Button 2 +Buttons/- = Button 12 +Buttons/+ = Button 17 +D-Pad/Up = Button 8 +D-Pad/Down = Button 9 +D-Pad/Left = Button 10 +D-Pad/Right = Button 11 +Buttons/Home = Button 13 Shake/X = Button 4 Shake/Y = Button 4 Shake/Z = Button 4 Nunchuk/Buttons/C = Button 5 -Nunchuk/Buttons/Z = Axis 5+ +Nunchuk/Buttons/Z = Button 7 Nunchuk/Stick/Up = Axis 1- Nunchuk/Stick/Down = Axis 1+ Nunchuk/Stick/Left = Axis 0- Nunchuk/Stick/Right = Axis 0+ -Nunchuk/Shake/X = Axis 2+ -Nunchuk/Shake/Y = Axis 2+ -Nunchuk/Shake/Z = Axis 2+ +Nunchuk/Shake/X = Button 6 +Nunchuk/Shake/Y = Button 6 +Nunchuk/Shake/Z = Button 6 diff --git a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/remote.ini b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/remote.ini index 29041118a..de3610815 100644 --- a/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/remote.ini +++ b/packages/emulators/standalone/dolphin-sa/config/OGU/WiiControllerProfiles/remote.ini @@ -1,16 +1,16 @@ [Wiimote1] -Device = evdev/0/Microsoft X-Box 360 pad +Device = evdev/0/GO-Ultra Gamepad Buttons/A = Button 0 Buttons/B = Button 1 -Buttons/1 = Button 2 -Buttons/2 = Button 3 -Buttons/- = Button 6 -Buttons/+ = Button 7 -Buttons/Home = Button 8 +Buttons/1 = Button 3 +Buttons/2 = Button 2 +Buttons/- = Button 12 +Buttons/+ = Button 17 +Buttons/Home = Button 13 Shake/X = Button 4 Shake/Y = Button 4 Shake/Z = Button 4 -D-Pad/Up = Axis 7- -D-Pad/Down = Axis 7+ -D-Pad/Left = Axis 6- -D-Pad/Right = Axis 6+ +D-Pad/Up = Button 8 +D-Pad/Down = Button 9 +D-Pad/Left = Button 10 +D-Pad/Right = Button 11 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/OGU/mupen64plus.cfg b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/OGU/mupen64plus.cfg index e900f66fd..dff58193d 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/OGU/mupen64plus.cfg +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/OGU/mupen64plus.cfg @@ -110,23 +110,23 @@ Kbd Mapping Frame Advance = 47 # SDL keysym for pressing the game shark button Kbd Mapping Gameshark = 103 # Joystick event string for stopping the emulator -Joy Mapping Stop = "J0B6/B7" +Joy Mapping Stop = "J0B12/B17" # Joystick event string for switching between fullscreen/windowed modes Joy Mapping Fullscreen = "" # Joystick event string for saving the emulator state -Joy Mapping Save State = "J0B8/B5" +Joy Mapping Save State = "J0B12/B5" # Joystick event string for loading the emulator state -Joy Mapping Load State = "J0B6/B4" +Joy Mapping Load State = "J0B12/B4" # Joystick event string for advancing the save state slot Joy Mapping Increment Slot = "" # Joystick event string for resetting the emulator -Joy Mapping Reset = "J0B8/B0" +Joy Mapping Reset = "J0B12/B0" # Joystick event string for slowing down the emulator Joy Mapping Speed Down = "" # Joystick event string for speeding up the emulator Joy Mapping Speed Up = "" # Joystick event string for taking a screenshot -Joy Mapping Screenshot = "J0B8/B1" +Joy Mapping Screenshot = "J0B12/B1" # Joystick event string for pausing the emulator Joy Mapping Pause = "J0B6/B0" # Joystick event string for muting/unmuting the sound diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/OGU/default.ini b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/OGU/default.ini index bdd9dc8dd..c8ec4fab1 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/OGU/default.ini +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/OGU/default.ini @@ -1,24 +1,21 @@ -; Handheld Gamepad - default.ini -[Xbox 360 Controller] +[GO-Ultra Gamepad] plugged = True mouse = False -AnalogDeadzone = 4096,4096 +AnalogDeadzone = 0,0 AnalogPeak = 32768,32768 -DPad R = hat(0 Right) -DPad L = hat(0 Left) -DPad D = hat(0 Down) -DPad U = hat(0 Up) -Start = button(7) -Z Trig = axis(2+) -B Button = button(2) +DPad R = button(11) +DPad L = button(10) +DPad D = button(9) +DPad U = button(8) +Start = button(17) +Z Trig = button(4) button(7) +B Button = button(3) A Button = button(0) -C Button R = axis(3+,24000) -C Button L = axis(3-,24000) button(3) -C Button D = axis(4+,24000) button(1) -C Button U = axis(4-,24000) -R Trig = axis(5+) button(5) -L Trig = button(4) -Mempak switch = -Rumblepak switch = +C Button R = axis(2+) +C Button L = axis(2-) button (2) +C Button D = axis(3+) button (1) +C Button U = axis(3-) +R Trig = button(5) +L Trig = button(6) X Axis = axis(0-,0+) Y Axis = axis(1-,1+) diff --git a/packages/ui/emulationstation/config/common/es_input.cfg b/packages/ui/emulationstation/config/common/es_input.cfg index 0f6d577f1..d199b2779 100644 --- a/packages/ui/emulationstation/config/common/es_input.cfg +++ b/packages/ui/emulationstation/config/common/es_input.cfg @@ -1088,4 +1088,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +