Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev flycast joy fixes #1113

Merged
merged 29 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
02fa0d8
initial commit.
Langerz82 Jun 7, 2022
80f8837
add gamecontroller valid check.
Langerz82 Jun 7, 2022
e80195a
initial commit.
Langerz82 Jul 14, 2022
1c18d0e
Update setres.sh
Langerz82 Jul 18, 2022
15ce1f2
Update setres.sh
Langerz82 Jul 18, 2022
73dc9a1
Update setres.sh
Langerz82 Jul 18, 2022
374c8e1
Update setres.sh
Langerz82 Jul 18, 2022
a657cfe
Update setres.sh
Langerz82 Jul 23, 2022
896ce74
576cvbs fixes
Langerz82 Jul 23, 2022
8621d02
Update setres.sh
Langerz82 Jul 25, 2022
b5f11b0
Update setres.sh
Langerz82 Jul 27, 2022
381f5c1
Update setres.sh
Langerz82 Jul 27, 2022
975ccf7
Update joy_common.sh
Langerz82 Aug 11, 2022
fb0e3b9
Update setres.sh
Langerz82 Aug 21, 2022
4288af9
Update setres.sh
Langerz82 Sep 12, 2022
b3e6f01
Merge commit 'refs/pull/936/head' of https://github.com/EmuELEC/EmuEL…
Langerz82 Sep 14, 2022
938554f
Merge commit 'refs/pull/955/head' of https://github.com/EmuELEC/EmuEL…
Langerz82 Sep 14, 2022
d88383d
Undo test pulls.
Langerz82 Sep 14, 2022
2071888
Merge branch 'dev' of https://github.com/Langerz82/EmuELEC into dev
Langerz82 Sep 14, 2022
6d83549
merged
Langerz82 Oct 9, 2022
1a704ad
undo
Langerz82 Oct 9, 2022
ab609b9
Merge branch 'dev' of https://github.com/Langerz82/EmuELEC into dev
Langerz82 Oct 9, 2022
301ab79
removed merge markers
Langerz82 Oct 9, 2022
5f06526
Merge branch 'EmuELEC:dev' into dev
Langerz82 Nov 20, 2022
cb87fda
Merge branch 'EmuELEC:dev' into dev
Langerz82 Nov 30, 2022
907c37d
Merge branch 'dev' of https://github.com/Langerz82/EmuELEC into dev
Langerz82 Dec 24, 2022
e6e2378
Merge branch 'EmuELEC:dev' into dev
Langerz82 Jan 13, 2023
3083a8d
Update joy_common.sh
Langerz82 Jan 20, 2023
02c2c93
initial commit.
Langerz82 Jan 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/sx05re/emulators/flycastsa/scripts/flycast.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi
AUTOGP=$(get_ee_setting flycast_auto_gamepad)
if [[ "${AUTOGP}" != "0" ]]; then
mkdir -p "/storage/.config/flycast/mappings"
/usr/bin/set_flycast_joy.sh
set_flycast_joy.sh
fi

flycast "${1}"
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ clean_pad() {
[[ -f "${CONFIG_TMP_A}" ]] && rm "${CONFIG_TMP_A}"
[[ -f "${CONFIG_TMP_D}" ]] && rm "${CONFIG_TMP_D}"
[[ -f "${CONFIG_TMP_E}" ]] && rm "${CONFIG_TMP_E}"
sed -i "s/device${1}\.2.*/device${1}.2 = 10/g" "$EMU_FILE"
sed -i "s/device${1}\.1.*/device${1}.1 = 10/g" "$EMU_FILE"
sed -i "s/device${1} .*/device${1} = 10/g" "$EMU_FILE"
local i=$(( $1 - 1 ))
sed -i "s/maple_sdl_joystick_${i}.*/maple_sdl_joystick_${i} = -1/g" "$EMU_FILE"
}

# Sets pad depending on parameters.
Expand All @@ -112,10 +117,9 @@ set_pad() {
sed -i "/device${1}/d" "$EMU_FILE"
sed -i "/maple_sdl_joystick_${index}/d" "$EMU_FILE"

local DEVICE="maple_sdl_joystick_${index} = ${JSI:2}\ndevice${1} = 0\ndevice${1}.1 = 1\ndevice${1}.2 = 1\n"
local DEVICE="maple_sdl_joystick_${index} = ${index}\ndevice${1} = 0\ndevice${1}.1 = 1\ndevice${1}.2 = 1\n"
[[ "$LN" -gt "0" ]] && LN=$(( LN+1 )) && sed -i "${LN} i ${DEVICE}" "$EMU_FILE"


local CONFIG="${MAPPING_DIR}/SDL_${JOY_NAME}.cfg"
[[ -f "${CONFIG}" ]] && return

Expand Down