Skip to content

Commit

Permalink
Merge pull request JustEnoughLinuxOS#3037 from r3claimer/dev
Browse files Browse the repository at this point in the history 
Remap Odroid Go Super and R36S controls
  • Loading branch information
@r3claimer
r3claimer committed Mar 13, 2024
2 parents 349d7cf + 89825f2 commit 88602ba
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 93 deletions.
32 changes: 16 additions & 16 deletions packages/emulators/standalone/drastic-sa/config/RK3326/drastic.cfg.ogs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ frameskip_type = 2
frameskip_value = 4
safe_frameskip = 0
show_frame_counter = 0
screen_orientation = 1
screen_orientation = 0
screen_swap = 0
savestate_number = 0
fast_forward = 0
Expand Down Expand Up @@ -33,38 +33,38 @@ firmware.favorite_color = 0
firmware.birthday_month = 1
firmware.birthday_day = 1
enable_cheats = 1
controls_a[CONTROL_INDEX_UP] = 1032
controls_a[CONTROL_INDEX_DOWN] = 1033
controls_a[CONTROL_INDEX_LEFT] = 1034
controls_a[CONTROL_INDEX_RIGHT] = 1035
controls_a[CONTROL_INDEX_UP] = 1036
controls_a[CONTROL_INDEX_DOWN] = 1037
controls_a[CONTROL_INDEX_LEFT] = 1038
controls_a[CONTROL_INDEX_RIGHT] = 1039
controls_a[CONTROL_INDEX_A] = 1025
controls_a[CONTROL_INDEX_B] = 1024
controls_a[CONTROL_INDEX_X] = 1026
controls_a[CONTROL_INDEX_Y] = 1027
controls_a[CONTROL_INDEX_L] = 1028
controls_a[CONTROL_INDEX_R] = 1029
controls_a[CONTROL_INDEX_START] = 1037
controls_a[CONTROL_INDEX_SELECT] = 1036
controls_a[CONTROL_INDEX_START] = 1033
controls_a[CONTROL_INDEX_SELECT] = 1032
controls_a[CONTROL_INDEX_HINGE] = 65535
controls_a[CONTROL_INDEX_TOUCH_CURSOR_UP] = 1219
controls_a[CONTROL_INDEX_TOUCH_CURSOR_DOWN] = 1155
controls_a[CONTROL_INDEX_TOUCH_CURSOR_LEFT] = 1218
controls_a[CONTROL_INDEX_TOUCH_CURSOR_RIGHT] = 1154
controls_a[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 1040
controls_a[CONTROL_INDEX_MENU] = 1038
controls_a[CONTROL_INDEX_TOUCH_CURSOR_PRESS] = 1035
controls_a[CONTROL_INDEX_MENU] = 1040
controls_a[CONTROL_INDEX_SAVE_STATE] = 1031
controls_a[CONTROL_INDEX_LOAD_STATE] = 1030
controls_a[CONTROL_INDEX_FAST_FORWARD] = 65535
controls_a[CONTROL_INDEX_SWAP_SCREENS] = 65535
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_A] = 1039
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_A] = 1034
controls_a[CONTROL_INDEX_SWAP_ORIENTATION_B] = 1041
controls_a[CONTROL_INDEX_LOAD_GAME] = 65535
controls_a[CONTROL_INDEX_QUIT] = 65535
controls_a[CONTROL_INDEX_FAKE_MICROPHONE] = 65535
controls_a[CONTROL_INDEX_UI_UP] = 1032
controls_a[CONTROL_INDEX_UI_DOWN] = 1033
controls_a[CONTROL_INDEX_UI_LEFT] = 1034
controls_a[CONTROL_INDEX_UI_RIGHT] = 1035
controls_a[CONTROL_INDEX_UI_UP] = 1036
controls_a[CONTROL_INDEX_UI_DOWN] = 1037
controls_a[CONTROL_INDEX_UI_LEFT] = 1038
controls_a[CONTROL_INDEX_UI_RIGHT] = 1039
controls_a[CONTROL_INDEX_UI_SELECT] = 1025
controls_a[CONTROL_INDEX_UI_BACK] = 1026
controls_a[CONTROL_INDEX_UI_EXIT] = 1024
Expand Down Expand Up @@ -103,9 +103,9 @@ controls_b[CONTROL_INDEX_UI_UP] = 1217
controls_b[CONTROL_INDEX_UI_DOWN] = 1153
controls_b[CONTROL_INDEX_UI_LEFT] = 1216
controls_b[CONTROL_INDEX_UI_RIGHT] = 1152
controls_b[CONTROL_INDEX_UI_SELECT] = 1037
controls_b[CONTROL_INDEX_UI_SELECT] = 1033
controls_b[CONTROL_INDEX_UI_BACK] = 65535
controls_b[CONTROL_INDEX_UI_EXIT] = 1036
controls_b[CONTROL_INDEX_UI_EXIT] = 1032
controls_b[CONTROL_INDEX_UI_PAGE_UP] = 65535
controls_b[CONTROL_INDEX_UI_PAGE_DOWN] = 65535
controls_b[CONTROL_INDEX_UI_SWITCH] = 65535
18 changes: 9 additions & 9 deletions ...emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3326/mupen64plus.cfg.ogs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ 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 = "J0B12/B13"
Joy Mapping Stop = "J0B08/B13"
# Joystick event string for switching between fullscreen/windowed modes
Joy Mapping Fullscreen = ""
# Joystick event string for saving the emulator state
Joy Mapping Save State = "J0B12/B5"
Joy Mapping Save State = "J08/B5"
# Joystick event string for loading the emulator state
Joy Mapping Load State = "J0B12/B4"
Joy Mapping Load State = "J08/B4"
# Joystick event string for advancing the save state slot
Joy Mapping Increment Slot = ""
# Joystick event string for resetting the emulator
Expand All @@ -128,15 +128,15 @@ Joy Mapping Speed Up = ""
# Joystick event string for taking a screenshot
Joy Mapping Screenshot = ""
# Joystick event string for pausing the emulator
Joy Mapping Pause = "J0B12/B0"
Joy Mapping Pause = "J08/B0"
# Joystick event string for muting/unmuting the sound
Joy Mapping Mute = ""
# Joystick event string for increasing the volume
Joy Mapping Increase Volume = ""
# Joystick event string for decreasing the volume
Joy Mapping Decrease Volume = ""
# Joystick event string for fast-forward
Joy Mapping Fast Forward = "J0B12/B14"
Joy Mapping Fast Forward = "J08/B07"
# Joystick event string for advancing by one frame when paused
Joy Mapping Frame Advance = ""
# Joystick event string for pressing the game shark button
Expand Down Expand Up @@ -190,10 +190,10 @@ plugged = True
mouse = False
AnalogDeadzone = 0,0
AnalogPeak = 32768,32768
DPad R = button(11)
DPad L = button(10)
DPad D = button(9)
DPad U = button(8)
DPad R = button(15)
DPad L = button(14)
DPad D = button(13)
DPad U = button(12)
Start = button(13)
Z Trig = button(4)
B Button = button(3)
Expand Down
8 changes: 4 additions & 4 deletions ...es/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3326/default.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ plugged = True
mouse = False
AnalogDeadzone = 0,0
AnalogPeak = 32768,32768
DPad R = button(11)
DPad L = button(10)
DPad D = button(9)
DPad U = button(8)
DPad R = button(15)
DPad L = button(14)
DPad D = button(13)
DPad U = button(12)
Start = button(13)
Z Trig = button(4)
B Button = button(3)
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/tools/gamecontrollerdb/config/gamecontrollerdb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
03002758091200000031000011010000,OpenSimHardware OSH PB Controller,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b7,start:b6,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,rightshoulder:b5,righttrigger:b11,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,
19000226010000000100000001010000,odroidgo2_joypad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b10,start:b13,dpleft:b8,dpdown:b7,dpright:b9,dpup:b6,leftshoulder:b4,lefttrigger:b11,rightshoulder:b5,righttrigger:b12,leftx:a0,lefty:a1,
1900dea8010000000200000001010000,odroidgo2_v11_joypad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b8,start:b9,dpleft:b14,dpdown:b13,dpright:b15,dpup:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,
1900c3ea010000000100000001010000,odroidgo3_joypad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b12,start:b13,dpleft:b10,dpdown:b9,dpright:b11,dpup:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b15,rightstick:b16,leftx:a0,lefty:a1,rightx:a2,righty:a3,
19009b4d4b4800000111000000020000,retrogame_joypad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b8,start:b9,dpleft:b15,dpdown:b14,dpright:b16,dpup:b13,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b11,rightstick:b12,leftx:a0,lefty:a1,rightx:a2,righty:a3,
19009b4d4b4800000111000000010000,retrogame_joypad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b8,start:b9,dpleft:b15,dpdown:b14,dpright:b16,dpup:b13,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b11,rightstick:b12,leftx:a0,lefty:a1,rightx:a2,righty:a3,
0300fcb7341200007856000000000000,JELOS Gamepad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b8,start:b9,dpleft:b15,dpdown:b14,dpright:b16,dpup:b13,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b11,rightstick:b12,leftx:a0,lefty:a1,rightx:a3,righty:a4,
Expand All @@ -12,3 +11,4 @@
1900e5914b4800007711000077010000,RGB20S Gamepad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b12,start:b13,dpleft:b10,dpdown:b9,dpright:b11,dpup:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b14,rightstick:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,
1900e7444b4800000111000034020000,rg552_joypad,platform:Linux,x:b2,a:b1,b:b0,y:b3,back:b8,start:b9,dpleft:b15,dpdown:b14,dpright:b16,dpup:b13,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b11,rightstick:b12,leftx:a0,lefty:a1,rightx:a2,righty:a3,
03001a3447616d65466f726365204100,GameForce ACE Gamepad,a:b1,b:b0,dpdown:b13,dpleft:b14,+lefty:-a1,-leftx:-a0,+leftx:+a0,-lefty:+a1,leftshoulder:b5,leftstick:b10,lefttrigger:-a2,dpright:b15,+righty:+a4,-rightx:-a3,+rightx:+a3,-righty:-a4,rightshoulder:b6,rightstick:b11,righttrigger:-a5,back:b7,start:b8,dpup:b12,x:b3,y:b4,platform:Linux,
1900c3ea010000000100000001010000,odroidgo3_joypad,a:b1,b:b0,dpdown:b13,dpleft:b14,+lefty:+a1,-leftx:-a0,+leftx:+a0,-lefty:-a1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,dpright:b15,+righty:+a3,-rightx:-a2,+rightx:+a2,-righty:-a3,rightshoulder:b5,rightstick:b11,righttrigger:b7,back:b8,start:b9,dpup:b12,x:b2,y:b3,platform:Linux,
20 changes: 10 additions & 10 deletions packages/emulators/tools/retroarch-joypads/gamepads/odroidgo3_joypad.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ input_device_display_name = "Odroid GO Super"

input_b_btn = "0"
input_y_btn = "3"
input_select_btn = "12"
input_start_btn = "13"
input_select_btn = "8"
input_start_btn = "9"
input_a_btn = "1"
input_x_btn = "2"
input_l_btn = "4"
input_r_btn = "5"
input_l2_btn = "6"
input_r2_btn = "7"
input_l3_btn = "15"
input_r3_btn = "16"
input_l3_btn = "10"
input_r3_btn = "11"

input_up_btn = "8"
input_down_btn = "9"
input_left_btn = "10"
input_right_btn = "11"
input_up_btn = "12"
input_down_btn = "13"
input_left_btn = "14"
input_right_btn = "15"

input_l_x_plus_axis = "+0"
input_l_x_minus_axis = "-0"
Expand All @@ -31,8 +31,8 @@ input_r_y_plus_axis = "+3"
input_r_y_minus_axis = "-3"

# Hotkeys
input_enable_hotkey_btn = "12"
input_exit_emulator_btn = "13"
input_enable_hotkey_btn = "8"
input_exit_emulator_btn = "9"

input_menu_toggle_btn = "2"
input_fps_toggle_btn = "3"
Expand Down
23 changes: 10 additions & 13 deletions packages/hardware/quirks/devices/Game Console R36S/050-game-configs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,25 @@ else
cat <<EOF >/storage/.config/ppsspp/PSP/SYSTEM/controls.ini
#R36S
[ControlMapping]
Up = 10-19
Down = 10-20
Left = 10-21
Right = 10-22
Up = 10-106
Down = 10-107
Left = 10-4010
Right = 10-197
Circle = 10-189
Cross = 10-190
Square = 10-188
Triangle = 10-191
Start = 10-197
Select = 10-196
Start = 10-22
Select = 10-21
L = 10-193
R = 10-192
An.Up = 10-4003
An.Down = 10-4002
An.Left = 10-4001
An.Right = 10-4000
Pause = 10-106
Save State = 10-4010
Load State = 10-4008
RightAn.Up = 10-4007
RightAn.Down = 10-4006
RightAn.Left = 10-4005
RightAn.Right = 10-4004
Pause = 10-109,10-104,1-111
Save State = 10-20
Load State = 10-19
Fast-forward = 1-61
EOF
fi
23 changes: 10 additions & 13 deletions packages/hardware/quirks/devices/ODROID-GO Super/050-game_configs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,25 @@ else
cat <<EOF >/storage/.config/ppsspp/PSP/SYSTEM/controls.ini
#OGS
[ControlMapping]
Up = 10-19
Down = 10-20
Left = 10-21
Right = 10-22
Up = 10-106
Down = 10-107
Left = 10-4010
Right = 10-197
Circle = 10-189
Cross = 10-190
Square = 10-188
Triangle = 10-191
Start = 10-197
Select = 10-196
Start = 10-22
Select = 10-21
L = 10-193
R = 10-192
An.Up = 10-4003
An.Down = 10-4002
An.Left = 10-4001
An.Right = 10-4000
Pause = 10-106
Save State = 10-4010
Load State = 10-4008
RightAn.Up = 10-4007
RightAn.Down = 10-4006
RightAn.Left = 10-4005
RightAn.Right = 10-4004
Pause = 10-109,10-104,1-111
Save State = 10-20
Load State = 10-19
Fast-forward = 1-61
EOF
fi
2 changes: 1 addition & 1 deletion packages/jelos/sources/post-update
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fi

## 20240312 clean config files on specific rk3326 devices
model=$(cat /sys/firmware/devicetree/base/model)
clean_list="ODROID-GO Advance Black Edition Powkiddy RGB10"
clean_list="ODROID-GO Advance Black Edition Powkiddy RGB10 Game Console R36S ODROID-GO Super"
if echo "${clean_list}" | grep "$model"; then
rm -rf /storage/.config/mupen64plus
rm -rf /storage/.config/drastic
Expand Down
52 changes: 26 additions & 26 deletions packages/ui/emulationstation/config/common/es_input.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,33 +1213,33 @@
<input name="x" type="button" id="2" value="1" />
<input name="y" type="button" id="3" value="1" />
</inputConfig>
<inputConfig type="joystick" deviceName="odroidgo3_joypad" deviceGUID="1900c3ea010000000100000001010000">
<input name="a" type="button" id="1" value="1" />
<input name="b" type="button" id="0" value="1" />
<input name="down" type="button" id="9" value="1" />
<input name="hotkeyenable" type="button" id="12" value="1" />
<input name="left" type="button" id="10" 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="15" value="1" />
<input name="lefttrigger" type="button" id="6" value="1" />
<input name="right" type="button" id="11" 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" />
<inputConfig type="joystick" deviceName="odroidgo3_joypad" deviceGUID="1900c3ea010000000100000001010000">
<input name="a" type="button" id="1" value="1" />
<input name="b" type="button" id="0" value="1" />
<input name="down" type="button" id="13" value="1" />
<input name="hotkeyenable" type="button" id="8" value="1" />
<input name="left" type="button" id="14" 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="10" value="1" />
<input name="lefttrigger" type="button" id="6" value="1" />
<input name="right" type="button" id="15" 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="5" value="1" />
<input name="rightthumb" type="button" id="16" value="1" />
<input name="righttrigger" type="button" id="7" value="1" />
<input name="select" type="button" id="12" value="1" />
<input name="start" type="button" id="13" value="1" />
<input name="up" type="button" id="8" value="1" />
<input name="x" type="button" id="2" value="1" />
<input name="y" type="button" id="3" value="1" />
</inputConfig>
<input name="rightthumb" type="button" id="11" 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="12" 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="retrogame_joypad" deviceGUID="190000004b4800000111000000010000">
<input name="a" type="button" id="1" value="1" />
<input name="b" type="button" id="0" value="1" />
Expand Down

0 comments on commit 88602ba

Please sign in to comment.