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 43eac407..179f9d11 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,8 +1,8 @@ "controller_mappings" { "version" "3" - "revision" "94" - "title" "RetroDECK: Generic - Standard" + "revision" "158" + "title" "RetroDECK: Generic - Standard v.1b" "description" "RetroDECK: Generic - Standard - v.1b" "creator" "" "progenitor" "" @@ -12,9 +12,9 @@ "controller_caps" "1573887" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-1092650192" + "Timestamp" "-1035996608" "actions" - { + { "Default" { "title" "RetroDECK - Set" @@ -826,6 +826,14 @@ "binding" "key_press TAB, Swap Screens, , " } } + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_ALT, , " + "binding" "key_press W, , " + } + } } "disabled_activators" { @@ -902,6 +910,306 @@ } } "group" + { + "id" "19" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, 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 TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "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_8" + { + "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_9" + { + "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_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" + { + "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_12" + { + "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" + } + } + "group" { "id" "10" "mode" "switches" @@ -934,7 +1242,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 1, RetroDECK - Set, , " + "binding" "controller_action CHANGE_PRESET 1 0 0, RetroDECK - Set, , " } } "Full_Press" @@ -1056,7 +1364,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 0 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 0, , " } } } @@ -1154,7 +1462,8 @@ "10" "switch active" "11" "button_diamond active" "12" "joystick inactive" - "18" "joystick active" + "18" "joystick inactive" + "19" "joystick active" "13" "left_trigger active" "14" "right_trigger active" "15" "right_joystick inactive" 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 old mode 100644 new mode 100755 index 35be1556..aefdfe0f --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "90" - "title" "RetroDECK: DualShock 3" + "revision" "93" + "title" "RetroDECK: DualShock 3 v.1b" "description" "RetroDECK: PS3 - DualShock 3 - v.1b" "creator" "" "progenitor" "" "url" "" - "export_type" "personal_local" + "export_type" "" "controller_type" "controller_ps3" "controller_caps" "1590271" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-630034944" + "Timestamp" "-925476208" "actions" { "Default" @@ -934,7 +934,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 1, RetroDECK - Set, , " + "binding" "controller_action CHANGE_PRESET 1 0 0, RetroDECK - Set, , " } } "Full_Press" @@ -1056,7 +1056,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 0 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 0, , " } } } @@ -1130,6 +1130,306 @@ } } } + "group" + { + "id" "19" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, 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 TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "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_8" + { + "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_9" + { + "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_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" + { + "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_12" + { + "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" @@ -1154,7 +1454,8 @@ "10" "switch active" "11" "button_diamond active" "12" "joystick inactive" - "18" "joystick active" + "18" "joystick inactive" + "19" "joystick active" "13" "left_trigger active" "14" "right_trigger active" "15" "right_joystick inactive" 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 01846558..eecebd74 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,9 +1,9 @@ "controller_mappings" { "version" "3" - "revision" "84" - "title" "RetroDECK: DualSense" - "description" "RetroDECK: PS5 - DualSense - v.1b" + "revision" "91" + "title" "RetroDECK: DualSense v.1b" + "description" "RetroDECK: PS5 - DualSense v.1b" "creator" "" "progenitor" "" "url" "" @@ -12,7 +12,7 @@ "controller_caps" "35148799" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-1064394560" + "Timestamp" "-906587536" "actions" { "Default" @@ -1134,6 +1134,306 @@ } } "group" + { + "id" "45" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, 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 TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "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_8" + { + "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_9" + { + "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_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" + { + "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_12" + { + "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" + } + } + "group" { "id" "7" "mode" "switches" @@ -1172,7 +1472,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 0 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 0, , " } } } @@ -1295,7 +1595,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 1, , " + "binding" "controller_action CHANGE_PRESET 1 0 0, , " } } "Full_Press" @@ -1428,7 +1728,8 @@ "31" "left_trackpad active" "32" "right_trackpad active" "33" "joystick inactive" - "42" "joystick active" + "42" "joystick inactive" + "45" "joystick active" "34" "left_trigger active" "35" "right_trigger active" "36" "right_joystick inactive" 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 cd5152c0..c712543d 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 @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "70" - "title" "RetroDECK: Steam Controller - Gordon" - "description" "RetroDECK: Steam Controller - Gordon - v.1b" + "revision" "73" + "title" "RetroDECK: Steam Controller - Gordon v.1b" + "description" "RetroDECK: Steam Controller - Gordon v.1b" "creator" "" "progenitor" "" "url" "" - "export_type" "personal_local" + "export_type" "" "controller_type" "controller_steamcontroller_gordon" "controller_caps" "2179063" "major_revision" "1" "minor_revision" "0" - "Timestamp" "-1090008992" + "Timestamp" "-596696880" "actions" { "Default" @@ -1156,6 +1156,306 @@ } } "group" + { + "id" "38" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, 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 TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "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_8" + { + "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_9" + { + "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_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" + { + "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_12" + { + "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" + } + } + "group" { "id" "7" "mode" "switches" @@ -1301,7 +1601,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 1, , " + "binding" "controller_action CHANGE_PRESET 1 0 0, , " } } "Full_Press" @@ -1407,7 +1707,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 0 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 0, , " } } } @@ -1512,7 +1812,8 @@ "13" "right_trackpad inactive" "20" "right_trackpad active" "14" "joystick inactive" - "26" "joystick active" + "26" "joystick inactive" + "38" "joystick active" "15" "left_trigger active" "16" "right_trigger active" } 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 6ec112cc..bbdad3e9 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 @@ -2,19 +2,19 @@ { "version" "3" "revision" "83" - "title" "RetroDECK: Switch Pro" - "description" "RetroDECK: Switch - Pro - v.1b" + "title" "RetroDECK: Switch Pro v.1b" + "description" "RetroDECK: Switch - Pro Controller - v.1b" "creator" "" "progenitor" "" "url" "" - "export_type" "personal_local" + "export_type" "" "controller_type" "controller_switch_pro" "controller_caps" "77087743" "major_revision" "0" "minor_revision" "0" "Timestamp" "-936017792" "actions" - { + { "Default" { "title" "RetroDECK - Set" @@ -488,8 +488,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Pause / Resume, , " - "binding" "key_press P, Pause / Resume, , " + "binding" "key_press LEFT_CONTROL, Take Screenshot, , " + "binding" "key_press X, Take Screenshot, , " } } } @@ -505,8 +505,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Take Screenshot, , " - "binding" "key_press X, Take Screenshot, , " + "binding" "key_press LEFT_CONTROL, Pause / Resume, , " + "binding" "key_press P, Pause / Resume, , " } } } @@ -522,8 +522,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Fullscreen Toggle, , " - "binding" "key_press RETURN, Fullscreen Toggle, , " + "binding" "key_press LEFT_CONTROL, Open Menu, , " + "binding" "key_press M, Open Menu, , " } } } @@ -539,8 +539,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, Open Menu, , " - "binding" "key_press M, Open Menu, , " + "binding" "key_press LEFT_CONTROL, Fullscreen Toggle, , " + "binding" "key_press RETURN, Fullscreen Toggle, , " } } } @@ -902,6 +902,306 @@ } } "group" + { + "id" "22" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, 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 TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "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_8" + { + "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_9" + { + "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_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" + { + "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_12" + { + "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" + } + } + "group" { "id" "7" "mode" "switches" @@ -934,7 +1234,7 @@ "bindings" { "binding" "xinput_button SELECT, , " - "binding" "controller_action CHANGE_PRESET 2 0 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 0, , " } } } @@ -1057,7 +1357,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 1, , " + "binding" "controller_action CHANGE_PRESET 1 0 0, , " } } "Full_Press" @@ -1180,7 +1480,8 @@ "11" "switch active" "12" "button_diamond active" "13" "joystick inactive" - "19" "joystick active" + "19" "joystick inactive" + "22" "joystick active" "14" "left_trigger active" "15" "right_trigger active" "16" "right_joystick inactive" 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 1d9eabad..6b14cded 100644 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf @@ -2,7 +2,7 @@ { "version" "3" "revision" "84" - "title" "RetroDECK: Xbox 360" + "title" "RetroDECK: Xbox 360 v.1b" "description" "RetroDECK: Xbox 360 - v.1b" "creator" "" "progenitor" "" @@ -934,7 +934,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 0 1, RetroDECK - Set, , " + "binding" "controller_action CHANGE_PRESET 1 0 0, RetroDECK - Set, , " } } "Full_Press" @@ -1056,7 +1056,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 0 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 0, , " } } } @@ -1130,6 +1130,306 @@ } } } + "group" + { + "id" "19" + "mode" "radial_menu" + "name" "Global Radial" + "description" "" + "inputs" + { + "touch_menu_button_0" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press SPACE, 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 TAB, Tab, RD-Tab.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F1, F1, RD-F1.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_5" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F5, F5, RD-F5.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_6" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F10, F10, RD-F10.png, " + } + "settings" + { + "haptic_intensity" "2" + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_7" + { + "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_8" + { + "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_9" + { + "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_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" + { + "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_12" + { + "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" @@ -1154,7 +1454,8 @@ "10" "switch active" "11" "button_diamond active" "12" "joystick inactive" - "18" "joystick active" + "18" "joystick inactive" + "19" "joystick active" "13" "left_trigger active" "14" "right_trigger active" "15" "right_joystick inactive"