From a3fd5215fd8963a293074b9a2cd232e39e8f3746 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 16:03:27 +0900 Subject: [PATCH 1/4] pcsx2: added config, moved all the configs in emu-configs --- com.xargon.retrodeck.yml | 8 +- emu-configs/PCSX2_ui.ini | 159 ++++++++++++++++++ .../retrodeck-retroarch.cfg | 0 3 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 emu-configs/PCSX2_ui.ini rename retrodeck-retroarch.cfg => emu-configs/retrodeck-retroarch.cfg (100%) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index fe7b623b..d2f675ef 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -988,6 +988,10 @@ modules: # Desktop entry - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop + # Setup pcsx2 + - mkdir -p /var/config/PCSX2/inis/ + - cp PCSX2_ui.ini /var/config/PCSX2/inis/PCSX2_ui.ini + #cleanup: ['*'] sources: - type: file @@ -998,8 +1002,8 @@ modules: path: es_systems.xml - type: file path: retrodeck.sh - - type: file - path: retrodeck-retroarch.cfg + - type: dir + path: emu-configs - type: file path: tools-gamelist.xml - type: dir diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2_ui.ini new file mode 100644 index 00000000..bfbd0f6c --- /dev/null +++ b/emu-configs/PCSX2_ui.ini @@ -0,0 +1,159 @@ +MainGuiPosition=169,145 +SysSettingsTabName=Cpu +McdSettingsTabName=none +ComponentsTabName= +AppSettingsTabName=none +GameDatabaseTabName=none +LanguageId=59 +LanguageCode=en_US +RecentIsoCount=20 +GzipIsoIndexTemplate=$(f).pindex.tmp +Listbook_ImageSize=32 +Toolbar_ImageSize=24 +Toolbar_ShowLabels=enabled +CurrentIso= +CurrentBlockdump= +CurrentELF= +CurrentIRX= +EnableSpeedHacks=enabled +EnableGameFixes=disabled +EnableFastBoot=enabled +EnablePresets=enabled +PresetIndex=1 +AskOnBoot=disabled +DevMode=disabled +CdvdSource=ISO +[ProgramLog] +Visible=disabled +AutoDock=enabled +DisplayPosition=265,103 +DisplaySize=680,560 +FontSize=8 +Theme=Default +[Folders] +UseDefaultBios=disabled +UseDefaultSnapshots=enabled +UseDefaultSavestates=enabled +UseDefaultMemoryCards=enabled +UseDefaultLogs=enabled +UseDefaultLangs=enabled +UseDefaultCheats=enabled +UseDefaultCheatsWS=enabled +UseDefaultTextures=enabled +Bios=~/retrodeck/bios +Snapshots=~/retrodeck/screenshots +Savestates=~/retrodeck/states/ +MemoryCards=~/retrodeck/saves/ +Logs=/var/config/PCSX2/logs +Langs=/app/share/PCSX2/resources/locale +Cheats=/var/config/PCSX2/cheats +CheatsWS=/var/config/PCSX2/cheats_ws +Cache=/var/config/PCSX2/cache +Textures= +RunIso=/var/config/PCSX2 +RunELF=/var/config/PCSX2 +RunDisc= +[GSWindow] +CloseOnEsc=enabled +DefaultToFullscreen=disabled +AlwaysHideMouse=disabled +DisableResizeBorders=disabled +DisableScreenSaver=enabled +WindowSize=640,480 +WindowPos=-1,-1 +IsMaximized=disabled +IsFullscreen=disabled +EnableVsyncWindowFlag=disabled +IsToggleFullscreenOnDoubleClick=enabled +AspectRatio=4:3 +FMVAspectRatioSwitch=Off +Zoom=100 +[InputRecording] +VirtualPadPosition=-1,-1 +m_frame_advance_amount=1 +[Capture] +EnableAudio=enabled +[UiTemplates] +LimiterUnlimited=Max +LimiterTurbo=Turbo +LimiterSlowmo=Slowmo +LimiterNormal=Normal +OutputFrame=Frame +OutputField=Field +OutputProgressive=Progressive +OutputInterlaced=Interlaced +Paused= +TitleTemplate=Slot: ${slot} | Speed: ${speed} (${vfps}) | ${videomode} | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage} +RecordingTemplate=Slot: ${slot} | Frame: ${frame}/${maxFrame} | Rec. Mode: ${mode} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} +[MemoryCards] +Slot1_Enable=enabled +Slot1_Filename=Mcd001.ps2 +Slot2_Enable=enabled +Slot2_Filename=Mcd002.ps2 +Multitap1_Slot2_Enable=disabled +Multitap1_Slot2_Filename=Mcd-Multitap1-Slot02.ps2 +Multitap1_Slot3_Enable=disabled +Multitap1_Slot3_Filename=Mcd-Multitap1-Slot03.ps2 +Multitap1_Slot4_Enable=disabled +Multitap1_Slot4_Filename=Mcd-Multitap1-Slot04.ps2 +Multitap2_Slot2_Enable=disabled +Multitap2_Slot2_Filename=Mcd-Multitap2-Slot02.ps2 +Multitap2_Slot3_Enable=disabled +Multitap2_Slot3_Filename=Mcd-Multitap2-Slot03.ps2 +Multitap2_Slot4_Enable=disabled +Multitap2_Slot4_Filename=Mcd-Multitap2-Slot04.ps2 +[Filenames] +BIOS=scph10000.bin +[Framerate] +NominalScalar=1 +TurboScalar=2 +SlomoScalar=0.5 +SkipOnLimit=disabled +SkipOnTurbo=disabled +[ConsoleLogSources] +Devel=disabled +.EEout=enabled +.IOPout=enabled +.EErecPerf=disabled +.ELF=disabled +.SysEvents=disabled +.p\&xThread=disabled +.SYSout=disabled +.PGIFout=disabled +.Input\ Recording=disabled +.Controller\ Info=disabled +[TraceLogSources] +.SIF=disabled +EE.Bios=disabled +EE.Memory=disabled +EE.Disasm.R5900=disabled +EE.Disasm.COP0=disabled +EE.Disasm.FPU=disabled +EE.Disasm.VUmacro=disabled +EE.Disasm.Cache=disabled +EE.Registers.HwRegs=disabled +EE.Registers.UnknownRegs=disabled +EE.Registers.DmaRegs=disabled +EE.Registers.IPU=disabled +EE.GIFtags=disabled +EE.VIFcodes=disabled +EE.MSKPATH3=disabled +EE.Events.DmaCtrl=disabled +EE.Events.Counters=disabled +EE.Events.MFIFO=disabled +EE.Events.VIF=disabled +EE.Events.GIF=disabled +IOP.Bios=disabled +IOP.Memorycards=disabled +IOP.Pad=disabled +IOP.Disasm.R3000A=disabled +IOP.Disasm.Memory=disabled +IOP.Registers.HwRegs=disabled +IOP.Registers.UnknownRegs=disabled +IOP.Registers.DmaRegs=disabled +IOP.Events.DmaCrl=disabled +IOP.Events.Counters=disabled +IOP.Events.CDVD=disabled +IOP.Events.MDEC=disabled +[TraceLogSources/IOP.Disasm.COP2] +GPU=disabled diff --git a/retrodeck-retroarch.cfg b/emu-configs/retrodeck-retroarch.cfg similarity index 100% rename from retrodeck-retroarch.cfg rename to emu-configs/retrodeck-retroarch.cfg From f9961de38646270edf463f65ac087e2d14f4182e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 19:40:13 +0900 Subject: [PATCH 2/4] pcsx2: fix file copy --- com.xargon.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index d2f675ef..fb039bb3 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -990,7 +990,7 @@ modules: # Setup pcsx2 - mkdir -p /var/config/PCSX2/inis/ - - cp PCSX2_ui.ini /var/config/PCSX2/inis/PCSX2_ui.ini + - cp PCSX2_ui.ini /var/config/PCSX2/inis/ #cleanup: ['*'] sources: From f9fc297e532beb690955cd7dc0392816c0adf7c4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 22:43:40 +0900 Subject: [PATCH 3/4] PCSX2: added debug line --- com.xargon.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index fb039bb3..baac5c0a 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -990,6 +990,7 @@ modules: # Setup pcsx2 - mkdir -p /var/config/PCSX2/inis/ + - ls -l /var/config/PCSX2/ #debug - cp PCSX2_ui.ini /var/config/PCSX2/inis/ #cleanup: ['*'] From ece02a7971f78a104c6423cb4128ff58cd3c084e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 23 Apr 2022 15:14:56 +0900 Subject: [PATCH 4/4] PCSX2: new logic --- com.xargon.retrodeck.yml | 7 +++---- retrodeck.sh | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index baac5c0a..d7641885 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -988,10 +988,9 @@ modules: # Desktop entry - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop - # Setup pcsx2 - - mkdir -p /var/config/PCSX2/inis/ - - ls -l /var/config/PCSX2/ #debug - - cp PCSX2_ui.ini /var/config/PCSX2/inis/ + # Pcsx2 + - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs + - cp PCSX2_ui.ini ${FLATPAK_DEST}/retrodeck/emu-configs/PCSX2_ui.ini #cleanup: ['*'] sources: diff --git a/retrodeck.sh b/retrodeck.sh index d3598eb0..32b859dd 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -72,6 +72,10 @@ then mkdir -p /var/config/retroarch/cores/ cp /app/share/libretro/cores/* /var/config/retroarch/cores/ + # pcsx2 + mkdir -p /var/config/PCSX2/inis/ + cp /var/config/retroarch/emu-configs/PCSX2_ui.ini /var/config/PCSX2/inis/PCSX2_ui.ini + touch ~/retrodeck/.lock kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n~/retrodeck/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access."