From 02bcf8e6d8606700e4f3e9d44cd7476268e40d45 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 25 Jan 2024 13:59:05 +0100 Subject: [PATCH 01/15] RPCS3: shortcut is now defaulted [skip ci] --- es-configs/es_systems.xml | 2 +- net.retrodeck.retrodeck.appdata.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index d852a21b..832d37a9 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1471,8 +1471,8 @@ Sony PlayStation 3 %ROMPATH%/ps3 .desktop .ps3 .PS3 .ps3dir .PS3DIR - %EMULATOR_RPCS3% --no-gui %ROM% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_RPCS3% --no-gui %ROM% ps3 ps3 diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 39561709..3d6b088e 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -79,11 +79,12 @@
  • Created a quit_retrodeck function to ease the quit in the scripts.
  • Logs folder is now in retrodeck/logs (previously was .logs)
  • The post update script is initializing vita3k, mame and boilr when coming from a version ealrier that 0.8.0, this don't work in cokker and must be resetted manually (for boilr reset RetroDECK)
    • +
  • RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE

    • Fixes:

    Issues:

    From 7e553525695ab2194635e10fb7cec1ba8a71ed29 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 26 Jan 2024 14:35:57 +0100 Subject: [PATCH 02/15] PPSSPP: updated hotkeys --- emu-configs/ppssppsdl/controls.ini | 4 +- emu-configs/ppssppsdl/ppsspp.ini | 104 ++++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 3 deletions(-) diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini index 721182e1..edd1d6e8 100644 --- a/emu-configs/ppssppsdl/controls.ini +++ b/emu-configs/ppssppsdl/controls.ini @@ -18,8 +18,8 @@ An.Right = 1-40,10-4000 Analog limiter = 1-60 RapidFire = 1-113:1-48 Fast-forward = 1-113:1-157 -SpeedToggle = 1-68 -Pause = 1-111 +SpeedToggle = 1-113:1-144 +Pause = 1-113:1-41 Rewind = 1-113:1-156 Save State = 1-113:1-47 Load State = 1-113:1-29 diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini index 64135e0f..e1ba7f86 100644 --- a/emu-configs/ppssppsdl/ppsspp.ini +++ b/emu-configs/ppssppsdl/ppsspp.ini @@ -12,7 +12,7 @@ Language = en_US ForceLagSync2 = False DiscordPresence = True UISound = False -AutoLoadSaveState = 0 +AutoLoadSaveState = 2 EnableCheats = False CwCheatRefreshRate = 77 CwCheatScrollPosition = 0.000000 @@ -165,6 +165,10 @@ SkipGPUReadbacks = False GpuLogProfiler = False iShowStatusFlags = 0 DisplayIntegerScale = False +VSync = False +MultiThreading = True +UberShaderVertex = True +UberShaderFragment = True [Sound] Enable = True AudioBackend = 0 @@ -332,6 +336,100 @@ Custom6Repeat = False Custom7Repeat = False Custom8Repeat = False Custom9Repeat = False +Custom10Mapping = 0x0000000000000000 +Custom10Image = 0 +Custom10Shape = 2 +Custom10Toggle = False +Custom10Repeat = False +Custom11Mapping = 0x0000000000000000 +Custom11Image = 1 +Custom11Shape = 2 +Custom11Toggle = False +Custom11Repeat = False +Custom12Mapping = 0x0000000000000000 +Custom12Image = 2 +Custom12Shape = 2 +Custom12Toggle = False +Custom12Repeat = False +Custom13Mapping = 0x0000000000000000 +Custom13Image = 3 +Custom13Shape = 2 +Custom13Toggle = False +Custom13Repeat = False +Custom14Mapping = 0x0000000000000000 +Custom14Image = 4 +Custom14Shape = 2 +Custom14Toggle = False +Custom14Repeat = False +Custom15Mapping = 0x0000000000000000 +Custom15Image = 0 +Custom15Shape = 9 +Custom15Toggle = False +Custom15Repeat = False +Custom16Mapping = 0x0000000000000000 +Custom16Image = 1 +Custom16Shape = 9 +Custom16Toggle = False +Custom16Repeat = False +Custom17Mapping = 0x0000000000000000 +Custom17Image = 2 +Custom17Shape = 9 +Custom17Toggle = False +Custom17Repeat = False +Custom18Mapping = 0x0000000000000000 +Custom18Image = 3 +Custom18Shape = 9 +Custom18Toggle = False +Custom18Repeat = False +Custom19Mapping = 0x0000000000000000 +Custom19Image = 4 +Custom19Shape = 9 +Custom19Toggle = False +Custom19Repeat = False +fcombo10X = 0.643378 +fcombo10Y = 0.581952 +comboKeyScale10 = 1.150000 +ShowComboKey10 = False +fcombo11X = 0.763295 +fcombo11Y = 0.581952 +comboKeyScale11 = 1.150000 +ShowComboKey11 = False +fcombo12X = 0.883212 +fcombo12Y = 0.581952 +comboKeyScale12 = 1.150000 +ShowComboKey12 = False +fcombo13X = 0.643378 +fcombo13Y = 0.416206 +comboKeyScale13 = 1.150000 +ShowComboKey13 = False +fcombo14X = 0.763295 +fcombo14Y = 0.416206 +comboKeyScale14 = 1.150000 +ShowComboKey14 = False +fcombo15X = 0.355579 +fcombo15Y = 0.581952 +comboKeyScale15 = 1.150000 +ShowComboKey15 = False +fcombo16X = 0.235662 +fcombo16Y = 0.581952 +comboKeyScale16 = 1.150000 +ShowComboKey16 = False +fcombo17X = 0.115746 +fcombo17Y = 0.581952 +comboKeyScale17 = 1.150000 +ShowComboKey17 = False +fcombo18X = 0.355579 +fcombo18Y = 0.416206 +comboKeyScale18 = 1.150000 +ShowComboKey18 = False +fcombo19X = 0.235662 +fcombo19Y = 0.416206 +comboKeyScale19 = 1.150000 +ShowComboKey19 = False +AllowMappingCombos = True +RapidFileInterval = 5 +AnalogGesture = False +AnalogGestureSensibility = 1.000000 [Network] EnableWlan = False EnableAdhocServer = False @@ -367,6 +465,7 @@ WlanPowerSave = False EncryptSave = True SavedataUpgradeVersion = True MemStickSize = 16 +GameLanguage = -1 [Debugger] DisasmWindowX = -1 DisasmWindowY = -1 @@ -390,6 +489,7 @@ DrawFrameGraph = False GEWindowTabsBL = 0x00000000 GEWindowTabsBR = 0x00000000 GEWindowTabsTR = 0x00000000 +SkipFuncHashMap = [Upgrade] UpgradeMessage = UpgradeVersion = @@ -516,6 +616,8 @@ VRCameraPitch = 0 VRHeadRotationScale = 5.000000 VRHeadRotationEnabled = False VRHeadRotationSmoothing = False +VRPassthrough = False +VRCanvas3DDistance = 3.000000 [Achievements] AchievementsEnable = False AchievementsChallengeMode = False From 33022a5dba3eb2d39b3ba8f1122c4961d2bd9b3f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 26 Jan 2024 14:36:41 +0100 Subject: [PATCH 03/15] APPDATA: updated with ppsspp hotkeys --- net.retrodeck.retrodeck.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 3d6b088e..c90744e0 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -74,6 +74,7 @@
  • Added new engine: GZDOOM
  • Added new emulator: Vita3K - Reset the emulator to grap the lates changes
  • Added new emulator: MAME (Standalone)
    • +
  • PPSSPP: added hotkeys
  • Added Steam Sync (with BoilR)
  • Quit button after emulators reset should act as an actual full quit button
  • Created a quit_retrodeck function to ease the quit in the scripts.
    • From 8b5c1b8eac4c6dc4c2c8c5262a19ab05e4d27fdf Mon Sep 17 00:00:00 2001 From: Lazorne Date: Sun, 28 Jan 2024 13:09:23 +0100 Subject: [PATCH 04/15] VDF configs --- .../RetroDECK_controller_generic_standard.vdf | 216 +++++++++-- .../RetroDECK_controller_ps3_dualshock3.vdf | 210 +++++++++-- .../RetroDECK_controller_ps4_dualshock4.vdf | 247 +++++++++--- .../RetroDECK_controller_ps5_dualsense.vdf | 351 +++++++++++++++--- ...ECK_controller_steam_controller_gordon.vdf | 269 ++++++++++++-- .../RetroDECK_controller_switch_pro.vdf | 246 ++++++++++-- .../RetroDECK_controller_xbox360.vdf | 210 +++++++++-- 7 files changed, 1478 insertions(+), 271 deletions(-) mode change 100644 => 100755 emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf index 179f9d11..222021ab 100755 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf @@ -1,7 +1,7 @@ "controller_mappings" { "version" "3" - "revision" "158" + "revision" "160" "title" "RetroDECK: Generic - Standard v.1b" "description" "RetroDECK: Generic - Standard - v.1b" "creator" "" @@ -12,9 +12,9 @@ "controller_caps" "1573887" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-1035996608" + "Timestamp" "-926565536" "actions" - { + { "Default" { "title" "RetroDECK - Set" @@ -911,7 +911,7 @@ } "group" { - "id" "19" + "id" "45" "mode" "radial_menu" "name" "Global Radial" "description" "" @@ -925,7 +925,7 @@ { "bindings" { - "binding" "key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " } "settings" { @@ -985,7 +985,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1005,7 +1005,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1025,7 +1025,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1045,7 +1045,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1058,6 +1058,167 @@ } } "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1078,7 +1239,7 @@ { } } - "touch_menu_button_8" + "touch_menu_button_16" { "activators" { @@ -1086,8 +1247,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1099,7 +1260,7 @@ { } } - "touch_menu_button_9" + "touch_menu_button_17" { "activators" { @@ -1107,8 +1268,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1120,28 +1281,7 @@ { } } - "touch_menu_button_10" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, " - "binding" "key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_11" + "touch_menu_button_18" { "activators" { @@ -1162,7 +1302,7 @@ { } } - "touch_menu_button_12" + "touch_menu_button_19" { "activators" { diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf index aefdfe0f..127f592f 100755 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf @@ -1131,7 +1131,7 @@ } } "group" - { + { "id" "19" "mode" "radial_menu" "name" "Global Radial" @@ -1146,7 +1146,7 @@ { "bindings" { - "binding" "key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " } "settings" { @@ -1206,7 +1206,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1226,7 +1226,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1246,7 +1246,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1266,7 +1266,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1279,6 +1279,167 @@ } } "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1299,7 +1460,7 @@ { } } - "touch_menu_button_8" + "touch_menu_button_16" { "activators" { @@ -1307,8 +1468,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1320,7 +1481,7 @@ { } } - "touch_menu_button_9" + "touch_menu_button_17" { "activators" { @@ -1328,8 +1489,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1341,28 +1502,7 @@ { } } - "touch_menu_button_10" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, " - "binding" "key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_11" + "touch_menu_button_18" { "activators" { @@ -1383,7 +1523,7 @@ { } } - "touch_menu_button_12" + "touch_menu_button_19" { "activators" { diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf old mode 100644 new mode 100755 index 371763da..c58b0bce --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf @@ -514,7 +514,7 @@ { "bindings" { - "binding" "xinput_button SELECT, , " + "binding" "mouse_button RIGHT, , " } } } @@ -1209,7 +1209,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1229,7 +1229,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1249,7 +1249,7 @@ { "bindings" { - "binding" "key_press F4, F4, RD-F4.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1269,7 +1269,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1289,7 +1289,7 @@ { "bindings" { - "binding" "key_press F8, F8, RD-F8.png, " + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " } "settings" { @@ -1309,7 +1309,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press F1, F1, RD-F1.png, " } "settings" { @@ -1322,6 +1322,127 @@ } } "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1342,7 +1463,7 @@ { } } - "touch_menu_button_10" + "touch_menu_button_16" { "activators" { @@ -1350,8 +1471,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1363,7 +1484,7 @@ { } } - "touch_menu_button_11" + "touch_menu_button_17" { "activators" { @@ -1371,8 +1492,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1384,16 +1505,7 @@ { } } - "touch_menu_button_12" - { - "activators" - { - } - "disabled_activators" - { - } - } - "touch_menu_button_13" + "touch_menu_button_18" { "activators" { @@ -1414,7 +1526,7 @@ { } } - "touch_menu_button_14" + "touch_menu_button_19" { "activators" { @@ -1435,26 +1547,6 @@ { } } - "touch_menu_button_15" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press SPACE, Space, RD-space.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } "click" { "activators" @@ -1542,6 +1634,64 @@ } } "group" + { + "id" "41" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" + { + "id" "42" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" + { + "id" "43" + "mode" "single_button" + "name" "" + "description" "" + "inputs" + { + "click" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "mouse_button MIDDLE, , " + } + "settings" + { + "haptic_intensity" "0" + } + } + } + "disabled_activators" + { + } + } + } + } + "group" { "id" "7" "mode" "switches" @@ -1779,8 +1929,8 @@ "7" "switch active" "0" "button_diamond active" "1" "left_trackpad inactive" - "11" "left_trackpad inactive" - "15" "left_trackpad active" + "11" "left_trackpad active" + "15" "left_trackpad inactive" "2" "right_trackpad inactive" "6" "right_trackpad inactive" "10" "right_trackpad inactive" @@ -1790,7 +1940,9 @@ "5" "right_trigger active" "8" "right_joystick active" "9" "dpad active" - "35" "center_trackpad active" + "35" "center_trackpad inactive" + "43" "center_trackpad active" + "41" "gyro active" } } "preset" @@ -1814,6 +1966,7 @@ "26" "dpad active" "33" "center_trackpad inactive" "39" "center_trackpad active" + "42" "gyro active" } } "settings" diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf index eecebd74..ca88feba 100755 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "91" + "revision" "114" "title" "RetroDECK: DualSense v.1b" - "description" "RetroDECK: PS5 - DualSense v.1b" + "description" "RetroDECK: PS5 - DualSense v.1" "creator" "" "progenitor" "" - "url" "" + "url" "f" "export_type" "" "controller_type" "controller_ps5" "controller_caps" "35148799" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-906587536" + "Timestamp" "-1043740912" "actions" { "Default" @@ -514,7 +514,7 @@ { "bindings" { - "binding" "xinput_button SELECT, , " + "binding" "mouse_button RIGHT, , " } } } @@ -1149,7 +1149,7 @@ { "bindings" { - "binding" "key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " } "settings" { @@ -1209,7 +1209,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1229,7 +1229,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1249,7 +1249,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1269,7 +1269,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1282,6 +1282,167 @@ } } "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1302,7 +1463,7 @@ { } } - "touch_menu_button_8" + "touch_menu_button_16" { "activators" { @@ -1310,8 +1471,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1323,7 +1484,7 @@ { } } - "touch_menu_button_9" + "touch_menu_button_17" { "activators" { @@ -1331,8 +1492,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1344,28 +1505,7 @@ { } } - "touch_menu_button_10" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, " - "binding" "key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_11" + "touch_menu_button_18" { "activators" { @@ -1386,7 +1526,7 @@ { } } - "touch_menu_button_12" + "touch_menu_button_19" { "activators" { @@ -1434,6 +1574,124 @@ } } "group" + { + "id" "47" + "mode" "single_button" + "name" "" + "description" "" + "inputs" + { + "click" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "mouse_button MIDDLE, , " + } + "settings" + { + "haptic_intensity" "0" + } + } + } + "disabled_activators" + { + } + } + } + } + "group" + { + "id" "49" + "mode" "single_button" + "name" "" + "description" "" + "inputs" + { + "click" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "mouse_button RIGHT, , " + } + "settings" + { + "haptic_intensity" "0" + } + } + } + "disabled_activators" + { + } + } + } + } + "group" + { + "id" "50" + "mode" "single_button" + "name" "" + "description" "" + "inputs" + { + "click" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "mouse_button MIDDLE, , " + } + "settings" + { + "haptic_intensity" "0" + } + } + } + "disabled_activators" + { + } + } + } + } + "group" + { + "id" "51" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" + { + "id" "52" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" { "id" "7" "mode" "switches" @@ -1703,8 +1961,8 @@ "7" "switch active" "0" "button_diamond active" "1" "left_trackpad inactive" - "11" "left_trackpad inactive" - "26" "left_trackpad active" + "11" "left_trackpad active" + "26" "left_trackpad inactive" "2" "right_trackpad inactive" "6" "right_trackpad inactive" "10" "right_trackpad inactive" @@ -1714,7 +1972,9 @@ "5" "right_trigger active" "8" "right_joystick active" "9" "dpad active" - "41" "center_trackpad active" + "41" "center_trackpad inactive" + "47" "center_trackpad active" + "51" "gyro active" } } "preset" @@ -1725,7 +1985,8 @@ { "29" "switch active" "30" "button_diamond active" - "31" "left_trackpad active" + "31" "left_trackpad inactive" + "49" "left_trackpad active" "32" "right_trackpad active" "33" "joystick inactive" "42" "joystick inactive" @@ -1735,7 +1996,9 @@ "36" "right_joystick inactive" "43" "right_joystick active" "37" "dpad active" - "40" "center_trackpad active" + "40" "center_trackpad inactive" + "50" "center_trackpad active" + "52" "gyro active" } } "settings" diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf index c712543d..650f049c 100755 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf @@ -14,7 +14,7 @@ "minor_revision" "0" "Timestamp" "-596696880" "actions" - { +{ "Default" { "title" "RetroDECK - Set" @@ -1171,7 +1171,7 @@ { "bindings" { - "binding" "key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " } "settings" { @@ -1231,7 +1231,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1251,7 +1251,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1271,7 +1271,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1291,7 +1291,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1304,6 +1304,167 @@ } } "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1324,7 +1485,7 @@ { } } - "touch_menu_button_8" + "touch_menu_button_16" { "activators" { @@ -1332,8 +1493,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1345,7 +1506,7 @@ { } } - "touch_menu_button_9" + "touch_menu_button_17" { "activators" { @@ -1353,8 +1514,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1366,28 +1527,7 @@ { } } - "touch_menu_button_10" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, " - "binding" "key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_11" + "touch_menu_button_18" { "activators" { @@ -1408,7 +1548,7 @@ { } } - "touch_menu_button_12" + "touch_menu_button_19" { "activators" { @@ -1601,7 +1741,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 0, , " + "binding" "controller_action CHANGE_PRESET 1 0 1, , " } } "Full_Press" @@ -1707,7 +1847,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 0 0, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -1781,6 +1921,57 @@ } } } + "group" + { + "id" "40" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + "gameactions" + { + } + } + "group" + { + "id" "41" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + "gameactions" + { + } + } + "group" + { + "id" "42" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + "gameactions" + { + } + } "preset" { "id" "0" @@ -1798,6 +1989,7 @@ "4" "left_trigger active" "5" "right_trigger active" "23" "gyro inactive" + "40" "gyro active" } } "preset" @@ -1816,6 +2008,7 @@ "38" "joystick active" "15" "left_trigger active" "16" "right_trigger active" + "41" "gyro active" } } "preset" @@ -1832,6 +2025,7 @@ "32" "joystick active" "33" "left_trigger active" "34" "right_trigger active" + "42" "gyro active" } } "settings" @@ -1840,3 +2034,4 @@ "right_trackpad_mode" "0" } } +} diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf index bbdad3e9..7e3e14ba 100755 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf @@ -14,7 +14,7 @@ "minor_revision" "0" "Timestamp" "-936017792" "actions" - { + { "Default" { "title" "RetroDECK - Set" @@ -917,7 +917,7 @@ { "bindings" { - "binding" "key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " } "settings" { @@ -977,7 +977,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -997,7 +997,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1017,7 +1017,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1037,7 +1037,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1050,6 +1050,167 @@ } } "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1070,7 +1231,7 @@ { } } - "touch_menu_button_8" + "touch_menu_button_16" { "activators" { @@ -1078,8 +1239,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1091,7 +1252,7 @@ { } } - "touch_menu_button_9" + "touch_menu_button_17" { "activators" { @@ -1099,8 +1260,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1112,28 +1273,7 @@ { } } - "touch_menu_button_10" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, " - "binding" "key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_11" + "touch_menu_button_18" { "activators" { @@ -1154,7 +1294,7 @@ { } } - "touch_menu_button_12" + "touch_menu_button_19" { "activators" { @@ -1456,6 +1596,40 @@ } } } + "group" + { + "id" "24" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + "gameactions" + { + } + } + "group" + { + "id" "25" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + "gameactions" + { + } + } "preset" { "id" "0" @@ -1469,6 +1643,7 @@ "5" "right_trigger active" "8" "right_joystick active" "9" "dpad active" + "24" "gyro active" } } "preset" @@ -1487,6 +1662,7 @@ "16" "right_joystick inactive" "20" "right_joystick active" "17" "dpad active" + "25" "gyro active" } } "settings" diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf index 6b14cded..2d588454 100644 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf @@ -1131,7 +1131,7 @@ } } "group" - { + { "id" "19" "mode" "radial_menu" "name" "Global Radial" @@ -1146,7 +1146,7 @@ { "bindings" { - "binding" "key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " } "settings" { @@ -1206,7 +1206,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1226,7 +1226,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1246,7 +1246,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " } "settings" { @@ -1266,7 +1266,7 @@ { "bindings" { - "binding" "key_press F10, F10, RD-F10.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1279,6 +1279,167 @@ } } "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" { "activators" { @@ -1299,7 +1460,7 @@ { } } - "touch_menu_button_8" + "touch_menu_button_16" { "activators" { @@ -1307,8 +1468,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " } "settings" { @@ -1320,7 +1481,7 @@ { } } - "touch_menu_button_9" + "touch_menu_button_17" { "activators" { @@ -1328,8 +1489,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1341,28 +1502,7 @@ { } } - "touch_menu_button_10" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, " - "binding" "key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_11" + "touch_menu_button_18" { "activators" { @@ -1383,7 +1523,7 @@ { } } - "touch_menu_button_12" + "touch_menu_button_19" { "activators" { From c4d52c47287b19ba689db6b8ce5be8bf46f4fd44 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Jan 2024 08:37:00 +0100 Subject: [PATCH 05/15] DOLPHIN: improved wiimote pointer emulation for controllers [skip ci] --- emu-configs/dolphin/GCPadNew.ini | 2 +- emu-configs/dolphin/Hotkeys.ini | 7 ++++++- emu-configs/dolphin/WiimoteNew.ini | 2 +- net.retrodeck.retrodeck.appdata.xml | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/emu-configs/dolphin/GCPadNew.ini b/emu-configs/dolphin/GCPadNew.ini index 1882559e..7c2d8a7c 100644 --- a/emu-configs/dolphin/GCPadNew.ini +++ b/emu-configs/dolphin/GCPadNew.ini @@ -4,7 +4,7 @@ Buttons/A = SOUTH Buttons/B = EAST Buttons/X = NORTH Buttons/Y = WEST -Buttons/Z = TR +Buttons/Z = `TR` | `TL` Buttons/Start = START Main Stick/Up = `Axis 1-` Main Stick/Down = `Axis 1+` diff --git a/emu-configs/dolphin/Hotkeys.ini b/emu-configs/dolphin/Hotkeys.ini index d2912ae6..fdf30cae 100644 --- a/emu-configs/dolphin/Hotkeys.ini +++ b/emu-configs/dolphin/Hotkeys.ini @@ -21,4 +21,9 @@ Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K) Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J) General/Toggle Fullscreen = @(Ctrl+Return) General/Control NetPlay Golf Mode = @(Alt+H) -Wii/Press Sync Button = @(Alt+W) \ No newline at end of file +Wii/Press Sync Button = @(Alt+W) +Wii/Connect Wii Remote 1 = @(Alt+W+`1`) +Wii/Connect Wii Remote 2 = @(Alt+W+`2`) +Wii/Connect Wii Remote 3 = @(Alt+W+`3`) +Wii/Connect Wii Remote 4 = @(Alt+W+`4`) +Wii/Connect Balance Board = @(Alt+W+`5`) \ No newline at end of file diff --git a/emu-configs/dolphin/WiimoteNew.ini b/emu-configs/dolphin/WiimoteNew.ini index 73002a7c..79183554 100644 --- a/emu-configs/dolphin/WiimoteNew.ini +++ b/emu-configs/dolphin/WiimoteNew.ini @@ -10,7 +10,7 @@ Drums/Stick/Modifier/Range = 50.0 Turntable/Stick/Modifier/Range = 50.0 uDraw/Stylus/Modifier/Range = 50.0 Drawsome/Stylus/Modifier/Range = 50.0 -Buttons/A = SOUTH +Buttons/A = `SOUTH` | `Click 1` | `XInput2/0/Virtual core pointer:Click 1` Buttons/B = EAST Buttons/1 = WEST Buttons/2 = NORTH diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index c90744e0..138fc6a5 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -75,6 +75,7 @@
  • Added new emulator: Vita3K - Reset the emulator to grap the lates changes
  • Added new emulator: MAME (Standalone)
  • PPSSPP: added hotkeys
    • +
  • DOLPHIN: improved wiimote pointer emulation for controllers
  • Added Steam Sync (with BoilR)
  • Quit button after emulators reset should act as an actual full quit button
  • Created a quit_retrodeck function to ease the quit in the scripts.
    • From a7ad7aacd2b8e15cf7e305081b8d31875b0d2221 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Jan 2024 08:47:07 +0100 Subject: [PATCH 06/15] PPSSPP: updated to 1.17 --- net.retrodeck.retrodeck.yml | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c91612db..a97b665b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -9,15 +9,6 @@ sdk-extensions: # base-version: "6.5" # Needed for Yuzu - Disabled as we're using AppImage for Yuzu command: retrodeck.sh -add-extensions: - org.ppsspp.PPSSPP.Locale: - directory: share/locale - bundle: true - no-autodownload: false - subdirectories: false - autodelete: true - locale-subset: true - finish-args: - --socket=fallback-x11 - --socket=wayland @@ -678,8 +669,8 @@ modules: sources: - type: git url: &ppsspp-url https://github.com/hrydgard/ppsspp.git - tag: v1.16.6 - commit: ba0ce344937d17e177ec8656ab957f6b82facdda + tag: v1.17 + commit: 493122a2fcf9ff538e242fe2844f019b53afd483 x-checker-data: type: json url: https://api.github.com/repos/hrydgard/ppsspp/releases/latest @@ -687,22 +678,6 @@ modules: tag-query: .tag_name timestamp-query: .published_at - - name: ppsspp-localization - buildsystem: simple - build-commands: - - | - for LANG_FILE in assets/lang/*.ini; do - LANG_FILE_NAME="$(basename "$LANG_FILE")" - LANG_PREFIX="${LANG_FILE_NAME:0:2}" - LANG_DEST="$FLATPAK_DEST/share/locale/$LANG_PREFIX/ppsspp/$LANG_FILE_NAME"; - ln -fsr "$LANG_DEST" "$FLATPAK_DEST/share/ppsspp/$LANG_FILE" - install -Dm644 "$LANG_FILE" "$LANG_DEST" - done - sources: - - type: shell - commands: - - cp -a $FLATPAK_DEST/share/ppsspp/assets . - # PPSSPP - END # Yuzu - START From a12342471b44d91e98044646927aad8451270204 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Jan 2024 08:48:41 +0100 Subject: [PATCH 07/15] YUZU: updated to mainline-0-1696 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a97b665b..9c5f3da0 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -693,8 +693,8 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1648/yuzu-mainline-20231211-14c24e64e.AppImage - sha256: d40f61c2abf8ddd0bb53098e2d9edf0c47e1cfd89e50cf5856b8cc27dbb25bd6 + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1696/yuzu-mainline-20240128-1bd7a09e3.AppImage + sha256: d8ca508daa5ba929efda956488f4a9cbc38df9fd672fcb55cb2184625971706d # Yuzu - END From f544230fafa8727afed0ddc49f2eba8f00f6358c Mon Sep 17 00:00:00 2001 From: Lazorne Date: Mon, 29 Jan 2024 11:41:18 +0100 Subject: [PATCH 08/15] Controller: PS4, PS5 --- .../RetroDECK_controller_ps4_dualshock4.vdf | 101 +++++++----------- .../RetroDECK_controller_ps5_dualsense.vdf | 10 +- 2 files changed, 48 insertions(+), 63 deletions(-) mode change 100755 => 100644 emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf mode change 100755 => 100644 emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf old mode 100755 new mode 100644 index c58b0bce..519bab83 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf @@ -1209,7 +1209,7 @@ { "bindings" { - "binding" "key_press SPACE, Space, RD-space.png, " + "binding" "key_press TAB, Tab, RD-Tab.png, " } "settings" { @@ -1229,7 +1229,7 @@ { "bindings" { - "binding" "key_press TAB, Tab, RD-Tab.png, " + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " } "settings" { @@ -1249,7 +1249,7 @@ { "bindings" { - "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " + "binding" "key_press SPACE, Space, RD-space.png, " } "settings" { @@ -1269,7 +1269,7 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " } "settings" { @@ -1289,7 +1289,7 @@ { "bindings" { - "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + "binding" "key_press F1, F1, RD-F1.png, " } "settings" { @@ -1309,7 +1309,7 @@ { "bindings" { - "binding" "key_press F1, F1, RD-F1.png, " + "binding" "key_press F4, F4, RD-F4.png, " } "settings" { @@ -1329,7 +1329,7 @@ { "bindings" { - "binding" "key_press F4, F4, RD-F4.png, " + "binding" "key_press F5, F5, RD-F5.png, " } "settings" { @@ -1349,7 +1349,7 @@ { "bindings" { - "binding" "key_press F5, F5, RD-F5.png, " + "binding" "key_press F8, F8, RD-F8.png, " } "settings" { @@ -1369,7 +1369,7 @@ { "bindings" { - "binding" "key_press F8, F8, RD-F8.png, " + "binding" "key_press F10, F10, RD-F10.png, " } "settings" { @@ -1382,26 +1382,6 @@ } } "touch_menu_button_12" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press F10, F10, RD-F10.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_13" { "activators" { @@ -1421,7 +1401,7 @@ { } } - "touch_menu_button_14" + "touch_menu_button_13" { "activators" { @@ -1442,7 +1422,7 @@ { } } - "touch_menu_button_15" + "touch_menu_button_14" { "activators" { @@ -1463,6 +1443,27 @@ { } } + "touch_menu_button_15" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } "touch_menu_button_16" { "activators" @@ -1471,8 +1472,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " - "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, " } "settings" { @@ -1485,27 +1486,6 @@ } } "touch_menu_button_17" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " - "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "touch_menu_button_18" { "activators" { @@ -1526,7 +1506,7 @@ { } } - "touch_menu_button_19" + "touch_menu_button_18" { "activators" { @@ -1632,6 +1612,9 @@ } } } + "gameactions" + { + } } "group" { @@ -1679,10 +1662,6 @@ { "binding" "mouse_button MIDDLE, , " } - "settings" - { - "haptic_intensity" "0" - } } } "disabled_activators" @@ -1941,7 +1920,7 @@ "8" "right_joystick active" "9" "dpad active" "35" "center_trackpad inactive" - "43" "center_trackpad active" + "43" "center_trackpad inactive" "41" "gyro active" } } @@ -1965,7 +1944,7 @@ "29" "right_joystick active" "26" "dpad active" "33" "center_trackpad inactive" - "39" "center_trackpad active" + "39" "center_trackpad inactive" "42" "gyro active" } } diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf old mode 100755 new mode 100644 index ca88feba..2f3c6466 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf @@ -1602,6 +1602,9 @@ } } } + "gameactions" + { + } } "group" { @@ -1662,6 +1665,9 @@ } } } + "gameactions" + { + } } "group" { @@ -1973,7 +1979,7 @@ "8" "right_joystick active" "9" "dpad active" "41" "center_trackpad inactive" - "47" "center_trackpad active" + "47" "center_trackpad inactive" "51" "gyro active" } } @@ -1997,7 +2003,7 @@ "43" "right_joystick active" "37" "dpad active" "40" "center_trackpad inactive" - "50" "center_trackpad active" + "50" "center_trackpad inactive" "52" "gyro active" } } From d97fc2a097ffffbdf11d45d80bbf89b6587647cb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Jan 2024 12:05:34 +0100 Subject: [PATCH 09/15] PPSSPP: added previous slot hotkey --- emu-configs/ppssppsdl/controls.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini index edd1d6e8..ce4e3387 100644 --- a/emu-configs/ppssppsdl/controls.ini +++ b/emu-configs/ppssppsdl/controls.ini @@ -31,4 +31,5 @@ Toggle Fullscreen = 1-113:1-66 RightAn.Up = 10-4007 RightAn.Down = 10-4006 RightAn.Left = 10-4005 -RightAn.Right = 10-4004 \ No newline at end of file +RightAn.Right = 10-4004 +Previous Slot = 1-113:1-38 \ No newline at end of file From 2c25e651b5a65779c5e4647d90a0c0c3b7ac163d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Jan 2024 12:06:45 +0100 Subject: [PATCH 10/15] APPDATA: updated [skip ci] --- net.retrodeck.retrodeck.appdata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 138fc6a5..019c41ba 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -82,6 +82,8 @@
  • Logs folder is now in retrodeck/logs (previously was .logs)
  • The post update script is initializing vita3k, mame and boilr when coming from a version ealrier that 0.8.0, this don't work in cokker and must be resetted manually (for boilr reset RetroDECK)
  • RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE
    • +
  • Added controller config for PS4 and PS5
    • +
  • Controller config overhaul

    • Fixes:

      From c2d258e8fe84f1d6c412ff8c6d2219c1233c9155 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Jan 2024 15:26:20 +0100 Subject: [PATCH 11/15] FRAMEWORK: fix for comparing numbers starting with zeroes --- functions/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/functions.sh b/functions/functions.sh index 3b3719fb..e3456793 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -513,7 +513,7 @@ easter_eggs() { if [[ ! -z $(cat $easter_egg_checklist) ]]; then while IFS="^" read -r start_date end_date start_time end_time splash_file # Read Easter Egg checklist file and separate values do - if [[ $current_day -ge "$start_date" && $current_day -le "$end_date" && $current_time -ge "$start_time" && $current_time -le "$end_time" ]]; then # If current line specified date/time matches current date/time, set $splash_file to be deployed + if [[ "$((10#$current_day))" -ge "$((10#$start_date))" && "$((10#$current_day))" -le "$((10#$end_date))" && "$((10#$current_time))" -ge "$((10#$start_time))" && "$((10#$current_time))" -le "$((10#$end_time))" ]]; then # If current line specified date/time matches current date/time, set $splash_file to be deployed new_splash_file="$splashscreen_dir/$splash_file" break else # When there are no matches, the default splash screen is set to deploy From 23604f77af94481084d6672223881f048580229b Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 29 Jan 2024 10:46:27 -0500 Subject: [PATCH 12/15] Update presets engine to handle multiple target files Update all preset files to new syntax standard Update ABXY button swap internal preset name --- .../retrodeck/presets/citra_presets.cfg | 14 +++++------ .../retrodeck/presets/dolphin_presets.cfg | 4 +--- .../retrodeck/presets/duckstation_presets.cfg | 16 ++++++------- .../defaults/retrodeck/presets/example.txt | 8 +++---- .../defaults/retrodeck/presets/gb_presets.cfg | 24 +++++++++---------- .../retrodeck/presets/gba_presets.cfg | 24 +++++++++---------- .../retrodeck/presets/gbc_presets.cfg | 24 +++++++++---------- .../retrodeck/presets/genesis_presets.cfg | 12 ++++------ .../defaults/retrodeck/presets/gg_presets.cfg | 22 ++++++++--------- .../retrodeck/presets/n64_presets.cfg | 12 ++++------ .../retrodeck/presets/pcsx2_presets.cfg | 16 ++++++------- .../retrodeck/presets/ppsspp_presets.cfg | 7 +++--- .../retrodeck/presets/primehack_presets.cfg | 4 +--- .../retrodeck/presets/psx_ra_presets.cfg | 12 ++++------ .../retrodeck/presets/retroarch_presets.cfg | 14 +++++------ .../retrodeck/presets/snes_presets.cfg | 14 +++++------ .../retrodeck/presets/yuzu_presets.cfg | 14 +++++------ emu-configs/defaults/retrodeck/retrodeck.cfg | 2 +- functions/post_update.sh | 9 +++++++ functions/prepare_emulator.sh | 14 +++++------ functions/presets.sh | 24 +++++++------------ tools/configurator.sh | 2 +- 22 files changed, 132 insertions(+), 160 deletions(-) diff --git a/emu-configs/defaults/retrodeck/presets/citra_presets.cfg b/emu-configs/defaults/retrodeck/presets/citra_presets.cfg index 9211d5c0..05b0d7b0 100644 --- a/emu-configs/defaults/retrodeck/presets/citra_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/citra_presets.cfg @@ -1,9 +1,7 @@ config_file_format^citra -target_file^$citraconf -defaults_file^$emuconfigs/citra/qt-config.ini -change^ask_to_exit^confirmClose^true^UI -change^ask_to_exit^confirmClose\default^true^UI -change^nintendo_button_layout^profiles\1\button_a^button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls -change^nintendo_button_layout^profiles\1\button_b^button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls -change^nintendo_button_layout^profiles\1\button_x^button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls -change^nintendo_button_layout^profiles\1\button_y^button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls +change^ask_to_exit^confirmClose^true^UI^$citraconf^$emuconfigs/citra/qt-config.ini +change^ask_to_exit^confirmClose\default^true^UI^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_a^button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_b^button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_x^button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_y^button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini diff --git a/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg b/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg index 234012e9..0836e0ca 100644 --- a/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg @@ -1,4 +1,2 @@ config_file_format^dolphin -target_file^$dolphinconf -defaults_file^$emuconfigs/dolphin/Dolphin.ini -change^ask_to_exit^ConfirmStop^True^Interface +change^ask_to_exit^ConfirmStop^True^Interface^$dolphinconf^$emuconfigs/dolphin/Dolphin.ini diff --git a/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg b/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg index 76c9f926..e4a2e66a 100644 --- a/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg @@ -1,10 +1,8 @@ config_file_format^duckstation -target_file^$duckstationconf -defaults_file^$emuconfigs/duckstation/settings.ini -change^cheevos^Enabled^true^Cheevos -change^cheevos^Username^$cheevos_username^Cheevos -change^cheevos^Token^$cheevos_token^Cheevos -change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Cheevos -change^cheevos_hardcore^ChallengeMode^true^Cheevos -change^savestate_auto_save^SaveStateOnExit^true^Main -change^ask_to_exit^ConfirmPowerOff^true^Main +change^cheevos^Enabled^true^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini +change^cheevos^Username^$cheevos_username^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini +change^cheevos^Token^$cheevos_token^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini +change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini +change^cheevos_hardcore^ChallengeMode^true^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini +change^savestate_auto_save^SaveStateOnExit^true^Main^$duckstationconf^$emuconfigs/duckstation/settings.ini +change^ask_to_exit^ConfirmPowerOff^true^Main^$duckstationconf^$emuconfigs/duckstation/settings.ini diff --git a/emu-configs/defaults/retrodeck/presets/example.txt b/emu-configs/defaults/retrodeck/presets/example.txt index 53d031a4..3d64330c 100644 --- a/emu-configs/defaults/retrodeck/presets/example.txt +++ b/emu-configs/defaults/retrodeck/presets/example.txt @@ -1,9 +1,7 @@ config_file_format^retroarch # This is the config file format, used in functions like get_setting_value and set_setting_value -target_file^$examplefile # This is the target file that should be updated. This will be the actively-used config file by whatever emulator is being set up. This can be a variable name as well! -defaults_file^$emuconfigs/retroarch/retroarch.cfg # This is the file that is referenced when presets are disabled. This should be the "shipped" config file for this emulator -change^cheevos^Enabled^true^Cheevos # This is a preset configuration line. The syntax is ^^^^ -change^borders^overlay_file^/var/config/retroarch/overlays/borders/snes.cfg # This is another preset configuration line, for the preset section called "borders" in retrodeck.cfg. Also, there is no defined "setting section" on this line - +change^cheevos^Enabled^true^Cheevos^$target_file^$defaults_file # This is a preset configuration line. The syntax is ^^^^^ +change^borders^overlay_file^/var/config/retroarch/overlays/borders/snes.cfg^^target_file^defaults_file # This is another preset configuration line, for the preset section called "borders" in retrodeck.cfg. Also, there is no defined "setting section" on this line, but there must be an empty field between ^^ +enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp # This will remove the ".disabled" suffix from the target file, or add ".disabled" to the suffix of the target file if the preset is being disabled OTHER NOTES: - The name of the presets configuration file for any given system MUST be _presets.cfg diff --git a/emu-configs/defaults/retrodeck/presets/gb_presets.cfg b/emu-configs/defaults/retrodeck/presets/gb_presets.cfg index cc48e4c0..d754c374 100644 --- a/emu-configs/defaults/retrodeck/presets/gb_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gb_presets.cfg @@ -1,14 +1,12 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/Gambatte/gb.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^aspect_ratio_index^23 -change^borders^custom_viewport_height^576 -change^borders^custom_viewport_width^640 -change^borders^custom_viewport_x^320 -change^borders^custom_viewport_y^20 -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gb.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.110000 -change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.205000 -change^borders^input_overlay_y_offset_landscape^0.005000 -enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gb.rmp +change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_height^576^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_width^640^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_x^320^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_y^20^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gb.cfg^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.205000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_y_offset_landscape^0.005000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg +enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gb.rmp diff --git a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg index 21787a86..b5a4fc03 100644 --- a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg @@ -1,14 +1,12 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/mGBA/gba.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^aspect_ratio_index^23 -change^borders^custom_viewport_height^640 -change^borders^custom_viewport_width^960 -change^borders^custom_viewport_x^160 -change^borders^custom_viewport_y^0 -change^borders^input_overlay_enable^true -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.110000 -change^borders^input_overlay_scale_landscape^1.2150000 -change^borders^input_overlay_y_offset_landscape^0.020000 -enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp +change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_height^640^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_width^960^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_x^160^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_y^0^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.2150000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp diff --git a/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg b/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg index cd24b9e7..d6b2e107 100644 --- a/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg @@ -1,14 +1,12 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/Gambatte/gbc.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^aspect_ratio_index^23 -change^borders^custom_viewport_height^576 -change^borders^custom_viewport_width^640 -change^borders^custom_viewport_x^320 -change^borders^custom_viewport_y^20 -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gbc.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.110000 -change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.205000 -change^borders^input_overlay_y_offset_landscape^-0.040000 -enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp +change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_height^576^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_width^640^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_x^320^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_y^20^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gbc.cfg^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.205000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_y_offset_landscape^-0.040000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg +enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp diff --git a/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg b/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg index ef0fbc5b..c566decf 100644 --- a/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg @@ -1,8 +1,6 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/genesis.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.100000 -change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.040000 -change^widescreen^aspect_ratio_index^24 +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/genesis.cfg^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.100000^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.040000^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg +change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg diff --git a/emu-configs/defaults/retrodeck/presets/gg_presets.cfg b/emu-configs/defaults/retrodeck/presets/gg_presets.cfg index f6b8529a..2de18ce3 100644 --- a/emu-configs/defaults/retrodeck/presets/gg_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gg_presets.cfg @@ -1,13 +1,11 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/Genesis Plus GX/gg.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^aspect_ratio_index^23 -change^borders^custom_viewport_width^960 -change^borders^custom_viewport_height^720 -change^borders^custom_viewport_x^160 -change^borders^custom_viewport_y^24 -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gg.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.110000 -change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.350000 -change^borders^input_overlay_y_offset_landscape^0.020000 +change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_width^960^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_height^720^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_x^160^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^custom_viewport_y^24^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gg.cfg^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.350000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg diff --git a/emu-configs/defaults/retrodeck/presets/n64_presets.cfg b/emu-configs/defaults/retrodeck/presets/n64_presets.cfg index 542aa841..8a92b041 100644 --- a/emu-configs/defaults/retrodeck/presets/n64_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/n64_presets.cfg @@ -1,8 +1,6 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/N64.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.145000 -change^borders^input_overlay_enable^true -change^widescreen^aspect_ratio_index^24 -enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Snes9x/snes.rmp +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/N64.cfg^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.145000^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg +change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg +enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp diff --git a/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg b/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg index ba01d17c..134cd00d 100644 --- a/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg @@ -1,10 +1,8 @@ config_file_format^pcsx2 -target_file^$pcsx2conf -defaults_file^$emuconfigs/PCSX2/PCSX2.ini -change^cheevos^Enabled^true^Achievements -change^cheevos^Username^$cheevos_username^Achievements -change^cheevos^Token^$cheevos_token^Achievements -change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Achievements -change^cheevos_hardcore^ChallengeMode^true^Achievements -change^savestate_auto_save^SaveStateOnShutdown^true^EmuCore -change^ask_to_exit^ConfirmShutdown^true^UI +change^cheevos^Enabled^true^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini +change^cheevos^Username^$cheevos_username^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini +change^cheevos^Token^$cheevos_token^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini +change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini +change^cheevos_hardcore^ChallengeMode^true^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini +change^savestate_auto_save^SaveStateOnShutdown^true^EmuCore^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini +change^ask_to_exit^ConfirmShutdown^true^UI^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini diff --git a/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg b/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg index 90094d5e..061b6dee 100644 --- a/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg @@ -1,4 +1,5 @@ config_file_format^ppsspp -target_file^$ppssppconf -defaults_file^$emuconfigs/PCSX2/PCSX2.ini -change^savestate_auto_load^AutoLoadSaveState^2^General +change^savestate_auto_load^AutoLoadSaveState^2^General^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini +change^cheevos^AchievementsEnable^True^Achievements^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini +change^cheevos^AchievementsUserName^Achievements^$cheevos_username^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini +change^cheevos_hardcore^AchievementsChallengeMode^True^Achievements^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini diff --git a/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg b/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg index 3abf4ba5..3eb75c36 100644 --- a/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg @@ -1,4 +1,2 @@ config_file_format^primehack -target_file^$primehackconf -defaults_file^$emuconfigs/primehack/Dolphin.ini -change^ask_to_exit^ConfirmStop^True^Interface +change^ask_to_exit^ConfirmStop^True^Interface^$primehackconf^$emuconfigs/primehack/Dolphin.ini diff --git a/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg b/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg index f3aaa96d..f9cffa4f 100644 --- a/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg @@ -1,8 +1,6 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/SwanStation/psx.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^input_overlay^/var/config/retrodeck/overlays/borders/pegasus/psx.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.120000 -change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.040000 -change^widescreen^aspect_ratio_index^24 +change^borders^input_overlay^/var/config/retrodeck/overlays/borders/pegasus/psx.cfg^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.120000^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.040000^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg +change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg diff --git a/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg b/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg index 7a65546a..4d8c268e 100644 --- a/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg @@ -1,9 +1,7 @@ config_file_format^retroarch-all -target_file^$raconf -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^cheevos^cheevos_enable^true -change^cheevos^cheevos_token^$cheevos_token -change^cheevos^cheevos_username^$cheevos_username -change^cheevos_hardcore^cheevos_hardcore_mode_enable^true -change^savestate_auto_load^savestate_auto_load^true -change^savestate_auto_save^savestate_auto_save^true +change^cheevos^cheevos_enable^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg +change^cheevos^cheevos_token^$cheevos_token^^$raconf^$emuconfigs/retroarch/retroarch.cfg +change^cheevos^cheevos_username^$cheevos_username^^$raconf^$emuconfigs/retroarch/retroarch.cfg +change^cheevos_hardcore^cheevos_hardcore_mode_enable^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg +change^savestate_auto_load^savestate_auto_load^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg +change^savestate_auto_save^savestate_auto_save^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg diff --git a/emu-configs/defaults/retrodeck/presets/snes_presets.cfg b/emu-configs/defaults/retrodeck/presets/snes_presets.cfg index 2d71ed98..06ce7b18 100644 --- a/emu-configs/defaults/retrodeck/presets/snes_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/snes_presets.cfg @@ -1,9 +1,7 @@ config_file_format^retroarch -target_file^/var/config/retroarch/config/Snes9x/snes.cfg -defaults_file^$emuconfigs/retroarch/retroarch.cfg -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/snes87.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.305000 -change^borders^input_overlay_scale_landscape^1.050000 -change^borders^input_overlay_enable^true -change^widescreen^aspect_ratio_index^24 -enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Snes9x/snes.rmp +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/snes87.cfg^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.305000^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_scale_landscape^1.050000^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg +change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg +enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp diff --git a/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg b/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg index bfb46f5e..e03474f1 100644 --- a/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg @@ -1,9 +1,7 @@ config_file_format^yuzu -target_file^$yuzuconf -defaults_file^$emuconfigs/yuzu/qt-config.ini -change^ask_to_exit^confirmClose^true^UI -change^ask_to_exit^confirmClose\default^true^UI -change^nintendo_button_layout^player_0_button_a^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:0,pad:0"^Controls -change^nintendo_button_layout^player_0_button_b^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:1,pad:0"^Controls -change^nintendo_button_layout^player_0_button_x^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:2,pad:0"^Controls -change^nintendo_button_layout^player_0_button_y^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:3,pad:0"^Controls +change^ask_to_exit^confirmClose^true^UI^$yuzuconf^$emuconfigs/yuzu/qt-config.ini +change^ask_to_exit^confirmClose\default^true^UI^$yuzuconf^$emuconfigs/yuzu/qt-config.ini +change^abxy_button_swap^player_0_button_a^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:0,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini +change^abxy_button_swap^player_0_button_b^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:1,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini +change^abxy_button_swap^player_0_button_x^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:2,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini +change^abxy_button_swap^player_0_button_y^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:3,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg index cf88db79..da64517f 100644 --- a/emu-configs/defaults/retrodeck/retrodeck.cfg +++ b/emu-configs/defaults/retrodeck/retrodeck.cfg @@ -54,7 +54,7 @@ n64=false psx_ra=false snes=false -[nintendo_button_layout] +[abxy_button_swap] citra=false gb=false gba=false diff --git a/functions/post_update.sh b/functions/post_update.sh index bf68a2c2..99b23dac 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -234,6 +234,15 @@ post_update() { emulationstation --home /var/config/emulationstation --create-system-dirs fi + if [[ $prev_version -le "080" ]]; then + # In version 0.8.0b, the following changes were made that required config file updates/reset or other changes to the filesystem: + # - Remove RetroDECK controller profile from existing template location TODO + # - Determine if Steam is installed via normal desktop application / Flatpak / SteamOS TODO + # - Install RetroDECK controller profile in desired location TODO + # - Change section name in retrodeck.cfg for ABXY button swap preset + sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names + fi + # The following commands are run every time. if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index d7352d69..733a5116 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -132,11 +132,11 @@ prepare_emulator() { set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "n64" "retrodeck" "widescreen")" "retrodeck" "widescreen" set_setting_value "$rd_conf" "psx_ra" "$(get_setting_value "$rd_defaults" "psx_ra" "retrodeck" "widescreen")" "retrodeck" "widescreen" set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "snes" "retrodeck" "widescreen")" "retrodeck" "widescreen" - set_setting_value "$rd_conf" "gb" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" - set_setting_value "$rd_conf" "gba" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" - set_setting_value "$rd_conf" "gbc" "$(get_setting_value "$rd_defaults" "gbc" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" - set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" - set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "gb" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" + set_setting_value "$rd_conf" "gba" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" + set_setting_value "$rd_conf" "gbc" "$(get_setting_value "$rd_defaults" "gbc" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" + set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" + set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "savestate_auto_load")" "retrodeck" "savestate_auto_load" set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "savestate_auto_save")" "retrodeck" "savestate_auto_save" fi @@ -215,7 +215,7 @@ prepare_emulator() { dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures" # Reset default preset settings - set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands @@ -650,7 +650,7 @@ prepare_emulator() { fi # Reset default preset settings - set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap" set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands diff --git a/functions/presets.sh b/functions/presets.sh index 664b7893..a086928c 100644 --- a/functions/presets.sh +++ b/functions/presets.sh @@ -96,7 +96,7 @@ build_preset_config() { local read_system_name=$(get_setting_name "$system_line") if [[ "$read_system_name" == "$system_being_changed" ]]; then local read_system_enabled=$(get_setting_value "$rd_conf" "$read_system_name" "retrodeck" "$current_preset") - while IFS='^' read -r action read_preset read_setting_name new_setting_value section + while IFS='^' read -r action read_preset read_setting_name new_setting_value section target_file defaults_file do case "$action" in @@ -109,22 +109,16 @@ build_preset_config() { fi ;; - "target_file" ) - if [[ "$read_preset" = \$* ]]; then - eval read_preset=$read_preset - fi - local read_target_file="$read_preset" - ;; - - "defaults_file" ) - if [[ "$read_preset" = \$* ]]; then - eval read_preset=$read_preset - fi - local read_defaults_file="$read_preset" - ;; - "change" ) if [[ "$read_preset" == "$current_preset" ]]; then + if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable + declare -g "target_file=$target_file" + fi + local read_target_file="$target_file" + if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable + declare -g "defaults_file=$defaults_file" + fi + local read_defaults_file="$defaults_file" if [[ "$read_system_enabled" == "true" ]]; then if [[ "$new_setting_value" = \$* ]]; then eval new_setting_value=$new_setting_value diff --git a/tools/configurator.sh b/tools/configurator.sh index cebebeab..e781711d 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -242,7 +242,7 @@ configurator_global_presets_and_settings_dialog() { ;; "Swap A/B and X/Y Buttons" ) - change_preset_dialog "nintendo_button_layout" + change_preset_dialog "abxy_button_swap" configurator_global_presets_and_settings_dialog ;; From adeef5123569cf93a913a805ea55efe790894c67 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 29 Jan 2024 10:48:26 -0500 Subject: [PATCH 13/15] Add PSP as a compression target for CHD --- .../defaults/retrodeck/reference_lists/compression_targets.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg index b877ffbe..d1d7d923 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg @@ -6,6 +6,7 @@ megacd neogeocd pcenginecd pcfx +psp psx ps2 saturn From cdd695cafef73a90ad04ab7ef2fc1b63603ce3cb Mon Sep 17 00:00:00 2001 From: Lazorne Date: Tue, 30 Jan 2024 07:26:22 +0100 Subject: [PATCH 14/15] Xbox Wireless added --- .../RetroDECK_controller_xboxone.vdf | 484 ++++++++++++++++-- 1 file changed, 448 insertions(+), 36 deletions(-) mode change 100755 => 100644 emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf old mode 100755 new mode 100644 index 70a20a96..692fe9c7 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "93" - "title" "RetroDECK: Official Layout - Xbox One/S/X" - "description" "RetroDECK: Xbox One/S/X" + "revision" "101" + "title" "RetroDECK: Xbox Wireless v.1b" + "description" "RetroDECK: One/S/X - Xbox Wireless v.1b" "creator" "" "progenitor" "" "url" "" - "export_type" "" + "export_type" "personal_cloud" "controller_type" "controller_xboxone" - "controller_caps" "1590271" + "controller_caps" "9978879" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-5320" + "Timestamp" "1079645600" "actions" { "Default" @@ -832,14 +832,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Swap Screens, , " - "binding" "key_press TAB, Swap Screens, , " - } - } } "disabled_activators" { @@ -849,13 +841,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "key_press ESCAPE, , " - } - } } "disabled_activators" { @@ -865,13 +850,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "key_press RETURN, , " - } - } } "disabled_activators" { @@ -881,13 +859,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "mouse_button RIGHT, , " - } - } } "disabled_activators" { @@ -1224,6 +1195,446 @@ } } } + "group" + { + "id" "20" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_1" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press ESCAPE, Escape, RD-ESC.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_2" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press RETURN, Enter, RD-Enter.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_3" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, Space, RD-space.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Wii Sync Button, RD-notification-network-wireless.png, " + "binding" "key_press W, Wii Sync Button, RD-notification-network-wireless.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_16" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_17" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_18" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, " + "binding" "key_press W, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_19" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Swap Disc, RD-application-x-iso.png, " + "binding" "key_press D, Swap Disc, RD-application-x-iso.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "click" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "mouse_button RIGHT, , " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + } + "settings" + { + "touchmenu_button_fire_type" "0" + } + } "preset" { "id" "0" @@ -1248,7 +1659,8 @@ "10" "switch active" "11" "button_diamond active" "12" "joystick inactive" - "19" "joystick active" + "19" "joystick inactive" + "20" "joystick active" "13" "left_trigger active" "14" "right_trigger active" "15" "right_joystick inactive" From b81b83692ee5772263f5476897fa96ab7d765e15 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 30 Jan 2024 08:56:56 +0100 Subject: [PATCH 15/15] CONTROLLERS: updated Xbox One controller config --- .../RetroDECK_controller_xboxone.vdf | 484 ++++++++++++++++-- 1 file changed, 448 insertions(+), 36 deletions(-) diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf index 70a20a96..692fe9c7 100755 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "93" - "title" "RetroDECK: Official Layout - Xbox One/S/X" - "description" "RetroDECK: Xbox One/S/X" + "revision" "101" + "title" "RetroDECK: Xbox Wireless v.1b" + "description" "RetroDECK: One/S/X - Xbox Wireless v.1b" "creator" "" "progenitor" "" "url" "" - "export_type" "" + "export_type" "personal_cloud" "controller_type" "controller_xboxone" - "controller_caps" "1590271" + "controller_caps" "9978879" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-5320" + "Timestamp" "1079645600" "actions" { "Default" @@ -832,14 +832,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Swap Screens, , " - "binding" "key_press TAB, Swap Screens, , " - } - } } "disabled_activators" { @@ -849,13 +841,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "key_press ESCAPE, , " - } - } } "disabled_activators" { @@ -865,13 +850,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "key_press RETURN, , " - } - } } "disabled_activators" { @@ -881,13 +859,6 @@ { "activators" { - "Full_Press" - { - "bindings" - { - "binding" "mouse_button RIGHT, , " - } - } } "disabled_activators" { @@ -1224,6 +1195,446 @@ } } } + "group" + { + "id" "20" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_1" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press ESCAPE, Escape, RD-ESC.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_2" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press RETURN, Enter, RD-Enter.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_3" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, Space, RD-space.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_SHIFT, Shift, RD-shift.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Control, RD-ctrl.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Alt, RD-alt.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_8" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_9" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, F4, RD-F4.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_10" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_11" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F8, F8, RD-F8.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_12" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_13" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F12, F12, RD-F12.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_14" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, " + "binding" "key_press R, Restart / Reset, RD-system-reboot.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_15" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, Wii Sync Button, RD-notification-network-wireless.png, " + "binding" "key_press W, Wii Sync Button, RD-notification-network-wireless.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_16" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, " + "binding" "key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_17" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + "binding" "key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_18" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, " + "binding" "key_press W, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_19" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Swap Disc, RD-application-x-iso.png, " + "binding" "key_press D, Swap Disc, RD-application-x-iso.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "click" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "mouse_button RIGHT, , " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + } + "settings" + { + "touchmenu_button_fire_type" "0" + } + } "preset" { "id" "0" @@ -1248,7 +1659,8 @@ "10" "switch active" "11" "button_diamond active" "12" "joystick inactive" - "19" "joystick active" + "19" "joystick inactive" + "20" "joystick active" "13" "left_trigger active" "14" "right_trigger active" "15" "right_joystick inactive"