From eb4b7c898402fd7357a94b96db15e5c4d2538bf0 Mon Sep 17 00:00:00 2001 From: Lazorne Date: Wed, 17 Jan 2024 21:08:31 +0100 Subject: [PATCH] Fixes --- .../wiki_controllers/nintendo/switch-pro.md | 79 +------------------ .../playstation/dualsense-edge.md | 2 +- .../wiki_controllers/playstation/dualsense.md | 2 +- .../playstation/dualshock-3.md | 2 +- .../playstation/dualshock-4.md | 2 +- .../docs/wiki_controllers/xbox/xbox-360.md | 20 +++++ .../{controllers-xbox.md => xbox-hotkeys.md} | 33 +------- .../xbox/xbox-wireless-elite.md | 20 +++++ .../wiki_controllers/xbox/xbox-wireless.md | 20 +++++ wiki-rtd/mkdocs.yml | 5 +- 10 files changed, 70 insertions(+), 115 deletions(-) create mode 100644 wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md rename wiki-rtd/docs/wiki_controllers/xbox/{controllers-xbox.md => xbox-hotkeys.md} (83%) create mode 100644 wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md create mode 100644 wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md diff --git a/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md b/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md index dc1f81a..8b1ce42 100644 --- a/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md +++ b/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md @@ -4,89 +4,12 @@ Official Controller for the Nintendo Switch -**NOTE: These inputs are part of the upcoming 0.8b update.** - ### Steam Input support Yes ### Linux Kernel Support Yes, since 5.16 - `hid-nintendo` -## What is the Official - Switch Pro RetroDECK profile called? +## What is the Official profiles called? - Switch Pro Controller: `RetroDECK: Switch Pro` - -### Switch Pro - Global Hotkeys: Nintendo Button Combos - -The global hotkeys are activated by pressing the `SELECT` button and holding it while pressing the corresponding other button input. -What follows is a list of hotkeys: - -`Function` Shows what the hotkey does.
-`Button / Combination` Shows the input you need to make to trigger the command.
-`Command` Shows what is being sent to the emulator.
-`Emulator Support` Shows what emulators support the command.
-`Comment` Just extra comments.
- - -| Function | Button / Combination| Command | Emulator Support | Comment | -| :--- | :---: | :---: | :---: | :---: | -| Pause / Resume | `SELECT + B` | `CTRL + P` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Take Screenshot | `SELECT + A` | `CTRL + X` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | -| Fullscreen Toggle | `SELECT + Y` | `CTRL + ENTER` | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Open Menu | `SELECT + X` | `CTRL + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu` | -| Quit Emulator | `SELECT + Start` | `CTRL + Q` |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | | -| Previous State Slot | `SELECT + D-Pad Left` | `CTRL + J` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | -| Next State Slot | `SELECT + D-Pad Right` | `CTRL + K` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`| -| Increase Emulation Speed | `SELECT + D-Pad Up` | `CTRL + 1` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | -| Decrease Emulation Speed | `SELECT + D-Pad Down` | `CTRL + 2` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`| | | -| Load State | `SELECT + L1` | `CTRL + A` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Save State | `SELECT + R1` | `CTRL + S` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Rewind | `SELECT + L2` | `CTRL + -` | `RetroArch` `Duckstation` | | -| Fast forward | `SELECT + R2` | `CTRL + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` | | -| Global Radial Menu | `SELECT + Left Joystick` | | Opens the Radial Menu | - -### Global Radial Menu - -The Global Radial Menu is activated by holding `SELECT` and by moving the `Left Joystick`, then by pressing `L3` allows you press the selected radial button. - -Radial Button | Keyboard Command| Emulator Support | Comment | -| :--- | :---: | :---: | :---: | -| Space | `Space` | `PC-Systems` | | -| Escape | `Escape` | `PPSSPP` `PC-Systems` | On PPPSPP it opens the Menu | -| Enter | `Enter` | `OpenBOR` `PC-Systems` | | -| F1 | `F1` | `PC-Systems` | | -| F5 | `F5` | `PC-Systems` | | -| F10 | `F10` | `PC-Systems` | | -| Wii Sync Button | `ALT + W` | `Dolphin/Primehack` | | -| Swap Dual-Screens | `CTRL + TAB` | `RetroArch` `Citra` `MelonDS` `Cemu`| | -| Change Dual-Screen Layout | `CTRL + L` | `Citra` | | -| Widescreen / Aspect Ratio | `CTRL + W` | `Dolphin/Primehack` `Duckstation` `PCSX2` | | -| Fullscreen Toggle | `CTRL + ENTER` | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | | -| Change Disc / Next Disc | `CTRL + D` | `RetroArch` `Dolphin/Primehack` `Duckstation`| | - - -### Right Joystick as Temporary Mouse - -By holding `SELECT` and moving the `Right Joystick` you can use it as a mouse for various systems that uses mouse input. - -| Function | Button / Combination| Command | Comment | -| :--- | :---: | :---: | :---: | -| Joystick as Mouse | `SELECT + Right Stick` | | Movement | -| Right Click | `SELECT + L3` | `Right Click` | | -| Left Click | `SELECT + R3` | `Left Click` | | - -### RetroArch: Additional Hotkeys - -These hotkeys also work for RetroArch and are built in. - -| Function | Button / Combination | Emulator Support | Comment | -| :--- | :---: | :---: | :---: | -| Open Menu | `L3 + R3` | `RetroArch` | | - -### Arcade Systems: Additional Hotkeys - -This hotkey work for RetroArch, MAME, FBNEO and other arcade systems. - -| Function | Button / Combination | Emulator Support | Comment | -| :--- | :---: | :---: | :---: | -| Insert Credit | `SELECT` | `RetroArch` `MAME` `FBNeo` | | diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md b/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md index 48bf23e..68192c6 100644 --- a/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md +++ b/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md @@ -8,7 +8,7 @@ Yes ### Linux Kernel Support Yes, since 6.2 - `hid-playstation` -## What are the Official profiles called? +## What is the Official profiles called? - DualSense: `RetroDECK: DualSense` diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md b/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md index 217faaf..828868f 100644 --- a/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md +++ b/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md @@ -8,7 +8,7 @@ Yes ### Linux Kernel Support Yes, since 5.14 - `hid-playstation` -## What are the Official profiles called? +## What is the Official profiles called? - DualSense: `RetroDECK: DualSense` diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md index 490be4b..8d66e9e 100644 --- a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md +++ b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md @@ -8,7 +8,7 @@ Yes ### Linux Kernel Support Yes, 2.17 `hid-sony` -## What are the Official profiles called? +## What is the Official profiles called? - Dualshock 3 / Sixaxis: `RetroDECK: Dualshock 3` diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md index e04b796..5bacc8e 100644 --- a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md +++ b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md @@ -8,7 +8,7 @@ Yes ### Linux Kernel Support Yes, 3.15 `hid-sony`, replaced in 6.2 by `hid-playstation` -## What are the Official profiles called? +## What is the Official profiles called? - DualSense: `RetroDECK: DualShock 4` diff --git a/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md new file mode 100644 index 0000000..1106768 --- /dev/null +++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md @@ -0,0 +1,20 @@ +# Xbox 360 Controller + + + +### Steam Input support +Yes + +### Linux Kernel Support +Yes + +### Related Projects + +#### The xone Project +[The xone Project](https://github.com/medusalix/xone)
+Has firmwares, udev rules and drivers might be needed to get it to run on your distribution to get the wireless connections working.
+This should not needed for the Steam Deck, SteamOS and most gaming focus Linux distroes has it included. + +## What is the Official profiles called? + +- Xbox 360 Controller: `RetroDECK: Xbox 360` diff --git a/wiki-rtd/docs/wiki_controllers/xbox/controllers-xbox.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-hotkeys.md similarity index 83% rename from wiki-rtd/docs/wiki_controllers/xbox/controllers-xbox.md rename to wiki-rtd/docs/wiki_controllers/xbox/xbox-hotkeys.md index 56bdfbb..7efe4d4 100644 --- a/wiki-rtd/docs/wiki_controllers/xbox/controllers-xbox.md +++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-hotkeys.md @@ -1,41 +1,10 @@ -# Xbox Controllers - -**Note these inputs are part of the upcoming 0.8b update.** - -Xbox Controllers are controllers made by the company Microsoft. Motion Controllers made by Microsoft are listed under the Motion Controllers entry on the wiki. - -#### The xone Project -[The xone Project](https://github.com/medusalix/xone)
-Has firmwares, udev rules and drivers might be needed to get it to run on your distribution to get the wireless connections working.
-This should not needed for the Steam Deck, SteamOS and most gaming focus Linux distroes has it included. - -## Xbox 360 Controller - - - -#### Steam Input support -Yes - -## Xbox One/S/X - Xbox Wireless Controller - - - -## Xbox One/S/X - Xbox Elite Wireless Controller Series 1/2 - - - -#### Steam Input support -Yes, but not fully. It registers as a Xbox Wireless Controller but the backbuttons can not be bound. +# Xbox: RetroDECK Hotkeys ## What are the Official profiles called? - Xbox 360 Controller: `RetroDECK: Xbox 360` - Xbox Wireless Controller/Elite Series: `RetroDECK: Xbox Wireless` -### What is the Current Version Number of the profile? - -WIP - ## Global Hotkeys: Xbox Button Combos The global hotkeys are activated by pressing the `SELECT` button and holding it while pressing the corresponding other button input. diff --git a/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md new file mode 100644 index 0000000..e3f9166 --- /dev/null +++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md @@ -0,0 +1,20 @@ +# Xbox One/S/X - Xbox Elite Wireless Controller Series 1/2 + + + +#### Steam Input support +Yes, but not fully. It registers as a Xbox Wireless Controller but the backbuttons can not be bound else i. + +### Linux Kernel Support +Yes + +### Related Projects + +#### The xone Project +[The xone Project](https://github.com/medusalix/xone)
+Has firmwares, udev rules and drivers might be needed to get it to run on your distribution to get the wireless connections working.
+This should not needed for the Steam Deck, SteamOS and most gaming focus Linux distroes has it included. + +## What is the Official profiles called? + +- Xbox Wireless Controller/Elite Series: `RetroDECK: Xbox Wireless` diff --git a/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md new file mode 100644 index 0000000..7039fad --- /dev/null +++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md @@ -0,0 +1,20 @@ +## Xbox One/S/X - Xbox Wireless Controller + + + +#### Steam Input support +Yes + +### Linux Kernel Support +Yes + +### Related Projects + +#### The xone Project +[The xone Project](https://github.com/medusalix/xone)
+Has firmwares, udev rules and drivers might be needed to get it to run on your distribution to get the wireless connections working.
+This should not needed for the Steam Deck, SteamOS and most gaming focus Linux distroes has it included. + +## What is the Official profiles called? + +- Xbox Wireless Controller/Elite Series: `RetroDECK: Xbox Wireless` diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml index 3419911..a2e2ed2 100644 --- a/wiki-rtd/mkdocs.yml +++ b/wiki-rtd/mkdocs.yml @@ -170,7 +170,10 @@ nav: - Playstation 5 - DualSense Edge: wiki_controllers/playstation/dualsense-edge.md - Controllers - Xbox (WIP): - - Xbox - Controllers (WIP): wiki_controllers/xbox/controllers-xbox.md + - Xbox - RetroDECK Hotkeys: wiki_controllers/xbox/xbox-hotkeys.md + - Xbox 360 - Controller: wiki_controllers/xbox/xbox-360.md + - Xbox One/S/X - Xbox Wireless Controller: wiki_controllers/xbox/xbox-wireless.md + - Xbox S/X - Xbox Elite Series 2: wiki_controllers/xbox/xbox-wireless-elite.md - Controllers - Steam/Valve (WIP): - Steam Deck - Controller: wiki_controllers/steam/controllers-steamdeck.md