diff --git a/packages/emulators/standalone/aethersx2-sa/config/RK3588/aethersx2/inis/PCSX2.ini b/packages/emulators/standalone/aethersx2-sa/config/RK3588/aethersx2/inis/PCSX2.ini index 94c0b6f7f..3662a37b9 100644 --- a/packages/emulators/standalone/aethersx2-sa/config/RK3588/aethersx2/inis/PCSX2.ini +++ b/packages/emulators/standalone/aethersx2-sa/config/RK3588/aethersx2/inis/PCSX2.ini @@ -1,6 +1,7 @@ [UI] SettingsVersion = 1 - +StartFullscreen = true +RenderToSeparateWindow = true [EmuCore] CdvdVerboseReads = false diff --git a/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2.gptk b/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2.gptk deleted file mode 100644 index ebb4a2dd0..000000000 --- a/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2.gptk +++ /dev/null @@ -1,36 +0,0 @@ -back = f -start = u -a = q -a_hk = z -b = b -b_hk = v -x = x -x_hk = c -y = y -y_hk = t -l1 = e -l1_hk = i -l2 = n -l2_hkey = mouse_left -l3 = g -r1 = r -r1_hkey = o -r2 = m -r2_hkey = p -r3 = h -guide = mouse_left -up = up -down = down -left = left -right = right -left_analog_up = w -left_analog_down = s -left_analog_left = a -left_analog_right = d -right_analog_up = i -right_analog_down = k -right_analog_left = j -right_analog_right = l -deadzone_triggers = 3000 -mouse_scale = 6144 -mouse_delay = 16 diff --git a/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini b/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini index fea532644..f4f4426c5 100644 --- a/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini +++ b/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini @@ -1,6 +1,7 @@ [UI] SettingsVersion = 1 - +StartFullscreen = true +RenderToSeparateWindow = true [EmuCore] CdvdVerboseReads = false @@ -193,7 +194,7 @@ OutputModule = cubeb Latency = 100 SynchMode = 0 SpeakerConfiguration = 0 - +BackendName = alsa [DEV9/Eth] EthEnable = false @@ -318,26 +319,27 @@ RawInput = false [Hotkeys] ToggleFullscreen = -CycleAspectRatio = +CycleAspectRatio = SDL-0/Back & SDL-0/Y CycleInterlaceMode = CycleMipmapMode = GSDumpMultiFrame = -Screenshot = +Screenshot = SDL-0/Back & SDL-0/A GSDumpSingleFrame = ToggleSoftwareRendering = ZoomIn = ZoomOut = InputRecToggleMode = -LoadStateFromSlot = Keyboard/I -SaveStateToSlot = Keyboard/O +LoadStateFromSlot = SDL-0/Back & SDL-0/LeftShoulder +SaveStateToSlot = SDL-0/Back & SDL-0/RightShoulder NextSaveStateSlot = PreviousSaveStateSlot = -OpenPauseMenu = Keyboard/T +OpenPauseMenu = SDL-0/Back & SDL-0/X ToggleFrameLimit = TogglePause = ToggleSlowMotion = -ToggleTurbo = Keyboard/P +ToggleTurbo = SDL-0/Back & SDL-0/+RightTrigger HoldTurbo = +ResetVM = SDL-0/Back & SDL-0/B [Pad] @@ -356,30 +358,31 @@ AxisScale = 1.330000 LargeMotorScale = 1.000000 SmallMotorScale = 1.000000 PressureModifier = 0.500000 -Up = Keyboard/Up -Right = Keyboard/Right -Down = Keyboard/Down -Left = Keyboard/Left -Triangle = Keyboard/X -Circle = Keyboard/A -Cross = Keyboard/B -Square = Keyboard/Y -Select = Keyboard/F -Start = Keyboard/U -L1 = Keyboard/E -L2 = Keyboard/N -R1 = Keyboard/R -R2 = Keyboard/M -L3 = Keyboard/G -R3 = Keyboard/H -LUp = Keyboard/W -LRight = Keyboard/D -LDown = Keyboard/S -LLeft = Keyboard/A -RUp = Keyboard/I -RRight = Keyboard/L -RDown = Keyboard/K -RLeft = Keyboard/J +Up = SDL-0/DPadUp +Right = SDL-0/DPadRight +Down = SDL-0/DPadDown +Left = SDL-0/DPadLeft +Triangle = SDL-0/X +Circle = SDL-0/A +Cross = SDL-0/B +Square = SDL-0/Y +Select = SDL-0/Back +Start = SDL-0/Start +L1 = SDL-0/LeftShoulder +L2 = SDL-0/+LeftTrigger +R1 = SDL-0/RightShoulder +R2 = SDL-0/+RightTrigger +L3 = SDL-0/LeftStick +R3 = SDL-0/RightStick +LUp = SDL-0/-LeftY +LRight = SDL-0/+LeftX +LDown = SDL-0/+LeftY +LLeft = SDL-0/-LeftX +RUp = SDL-0/-RightY +RRight = SDL-0/+RightX +RDown = SDL-0/+RightY +RLeft = SDL-0/-RightX + [Pad2] Type = None diff --git a/packages/emulators/standalone/aethersx2-sa/package.mk b/packages/emulators/standalone/aethersx2-sa/package.mk index b7601529d..7463d16f9 100644 --- a/packages/emulators/standalone/aethersx2-sa/package.mk +++ b/packages/emulators/standalone/aethersx2-sa/package.mk @@ -16,7 +16,7 @@ makeinstall_target() { export STRIP=true mkdir -p ${INSTALL}/usr/bin cp ${PKG_BUILD}/${PKG_NAME}-${PKG_VERSION}.AppImage ${INSTALL}/usr/bin/${PKG_NAME} - cp -rf ${PKG_DIR}/scripts/${DEVICE}/start_aethersx2.sh ${INSTALL}/usr/bin + cp -rf ${PKG_DIR}/scripts/start_aethersx2.sh ${INSTALL}/usr/bin sed -e "s/@APPIMAGE@/${PKG_NAME}/g" -i ${INSTALL}/usr/bin/start_aethersx2.sh chmod 755 ${INSTALL}/usr/bin/* mkdir -p ${INSTALL}/usr/config diff --git a/packages/emulators/standalone/aethersx2-sa/scripts/RK3588/start_aethersx2.sh b/packages/emulators/standalone/aethersx2-sa/scripts/RK3588/start_aethersx2.sh deleted file mode 100755 index e4ba09945..000000000 --- a/packages/emulators/standalone/aethersx2-sa/scripts/RK3588/start_aethersx2.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) - -. /etc/profile - -export PAN_MESA_DEBUG=gl3,gofaster - -#Check if aethersx2 exists in .config -if [ ! -d "/storage/.config/aethersx2" ]; then - mkdir -p "/storage/.config/aethersx2" - cp -r "/usr/config/aethersx2" "/storage/.config/" -fi - -#Make Aethersx2 bios folder -if [ ! -d "/storage/roms/bios/aethersx2" ]; then - mkdir -p "/storage/roms/bios/aethersx2" -fi - -#Create PS2 savestates folder -if [ ! -d "/storage/roms/savestates/ps2" ]; then - mkdir -p "/storage/roms/savestastes/ps2" -fi - - #Emulation Station Features - GAME=$(echo "${1}"| sed "s#^/.*/##") - SUI=$(get_setting start_ui switch "${GAME}") - -#Set QT enviornment to wayland -export QT_QPA_PLATFORM=wayland - -#Run Aethersx2 emulator - if [ "$SUI" = "1" ] - then - /usr/bin/@APPIMAGE@ -fullscreen - else - /usr/bin/@APPIMAGE@ -fullscreen "${1}" - fi diff --git a/packages/emulators/standalone/aethersx2-sa/scripts/S922X/start_aethersx2.sh b/packages/emulators/standalone/aethersx2-sa/scripts/S922X/start_aethersx2.sh deleted file mode 100755 index e1c5c33c3..000000000 --- a/packages/emulators/standalone/aethersx2-sa/scripts/S922X/start_aethersx2.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) - -. /etc/profile - -#Check if aethersx2 exists in .config -if [ ! -d "/storage/.config/aethersx2" ]; then - mkdir -p "/storage/.config/aethersx2" - cp -r "/usr/config/aethersx2" "/storage/.config/" -fi - -#Check for aethersx2.gptk -if [ ! -f "/storage/.config/aethersx2/aethersx2.gptk" ]; then - mkdir -p "/storage/.config/aethersx2" - cp -r "/usr/config/aethersx2/aethersx2.gptk" "/storage/.config/aethersx2/aethersx2.gptk" -fi - -#Make Aethersx2 bios folder -if [ ! -d "/storage/roms/bios/aethersx2" ]; then - mkdir -p "/storage/roms/bios/aethersx2" -fi - -#Create PS2 savestates folder -if [ ! -d "/storage/roms/savestates/ps2" ]; then - mkdir -p "/storage/roms/savestastes/ps2" -fi - - #Emulation Station Features - GAME=$(echo "${1}"| sed "s#^/.*/##") - SUI=$(get_setting start_ui switch "${GAME}") - -#Set QT enviornment to wayland -export QT_QPA_PLATFORM=wayland - - -#Run Aethersx2 emulator -if [ "$SUI" = "1" ] -then - /usr/bin/@APPIMAGE@ -fullscreen -else - control-gen_init.sh - source /storage/.config/gptokeyb/control.ini - get_controls - GAMEDIR=/storage/.config/aethersx2 - cd $GAMEDIR - export PCKILLMODE="Y" - - $ESUDO chmod 666 /dev/uinput - $GPTOKEYB "aethersx2" -c "aethersx2.gptk" & - SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig" /usr/bin/aethersx2-sa -fullscreen "${1}" 2>&1 | tee ./log.txt - $ESUDO kill -9 $(pidof gptokeyb) -fi diff --git a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh new file mode 100755 index 000000000..d5a195610 --- /dev/null +++ b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +. /etc/profile + +#Check if aethersx2 exists in .config +if [ ! -d "/storage/.config/aethersx2" ]; then + mkdir -p "/storage/.config/aethersx2" + cp -r "/usr/config/aethersx2" "/storage/.config/" +fi + +#Make Aethersx2 bios folder +if [ ! -d "/storage/roms/bios/aethersx2" ]; then + mkdir -p "/storage/roms/bios/aethersx2" +fi + +#Create PS2 savestates folder +if [ ! -d "/storage/roms/savestates/ps2" ]; then + mkdir -p "/storage/roms/savestastes/ps2" +fi + + #Emulation Station Features + GAME=$(echo "${1}"| sed "s#^/.*/##") + ASPECT=$(get_setting aspect_ratio ps2 "${GAME}") + FPS=$(get_setting show_fps ps2 "${GAME}") + GRENDERER=$(get_setting graphics_backend ps2 "${GAME}") + VSYNC=$(get_setting vsync ps2 "${GAME}") + + + #Aspect Ratio + if [ "$ASPECT" = "0" ] + then + sed -i '/^AspectRatio =/c\AspectRatio = 4:3' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$ASPECT" = "1" ] + then + sed -i '/^AspectRatio =/c\AspectRatio = 16:9' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$ASPECT" = "2" ] + then + sed -i '/^AspectRatio =/c\AspectRatio = Stretch' /storage/.config/aethersx2/inis/PCSX2.ini + fi + + #Graphics Backend + if [ "$GRENDERER" = "0" ] + then + sed -i '/^Renderer =/c\Renderer = 12' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$GRENDERER" = "1" ] + then + sed -i '/^Renderer =/c\Renderer = 14' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$GRENDERER" = "2" ] + then + sed -i '/^Renderer =/c\Renderer = 13' /storage/.config/aethersx2/inis/PCSX2.ini + fi + + #Show FPS + if [ "$FPS" = "false" ] + then + sed -i '/^OsdShowFPS =/c\OsdShowFPS = false' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$FPS" = "true" ] + then + sed -i '/^OsdShowFPS =/c\OsdShowFPS = true' /storage/.config/aethersx2/inis/PCSX2.ini + fi + + #Vsync + if [ "$VSYNC" = "0" ] + then + sed -i '/^VsyncEnable =/c\VsyncEnable = 0' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$VSYNC" = "1" ] + then + sed -i '/^VsyncEnable =/c\VsyncEnable = 1' /storage/.config/aethersx2/inis/PCSX2.ini + fi + +#Set QT enviornment to wayland + export QT_QPA_PLATFORM=wayland + +#Run Aethersx2 emulator + /usr/bin/@APPIMAGE@ -fullscreen "${1}" diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg index da16bd746..be9404374 100644 --- a/packages/ui/emulationstation/config/common/es_features.cfg +++ b/packages/ui/emulationstation/config/common/es_features.cfg @@ -293,7 +293,21 @@ - + + + + + + + + + + + + + + +