MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Feature: Auto-Assign Controllers #706

Open
uncavo-hdmi wants to merge 31 commits from uncavo-hdmi/auto-assign-controller into master
pull from: uncavo-hdmi/auto-assign-controller
merge into: MeloNX:master
Conversation 5 Commits 31 Files Changed 19 +3 -3
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 24cef89b6c - Show all commits

1
src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
View File

@ -175,7 +175,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
private void Remap() private void Remap()
{ {
Logger.Warning?.Print(LogClass.Hid, $"Connected controllers");
// Remap/Init if necessary // Remap/Init if necessary
for (int i = 0; i < MaxControllers; ++i) for (int i = 0; i < MaxControllers; ++i)
{ {

2
src/Ryujinx.Input/HLE/NpadManager.cs
View File

@ -173,7 +173,7 @@ namespace Ryujinx.Input.HLE
NpadController controller; NpadController controller;
int index = controllers.FindIndex(x => x == activeController); int index = controllers.FindIndex(x => x == activeController);
// TODO: Implement a function to determine if pro controller or single joycon (L/R) and to create the appropriate config. // TODO: Implement a function to determine if pro controller or single joycon (L/R) and create the appropriate config.
// Also if old controller exists, try to reuse it (and create their config too). // Also if old controller exists, try to reuse it (and create their config too).
bool isNintendoStyle = controllers.FirstOrDefault(x => x.Id == activeController.Id).Name.Contains("Nintendo"); bool isNintendoStyle = controllers.FirstOrDefault(x => x.Id == activeController.Id).Name.Contains("Nintendo");
string id = activeController.Id.Split(" ")[0]; string id = activeController.Id.Split(" ")[0];

2
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@ -638,7 +638,7 @@ namespace Ryujinx.Ava.UI.ViewModels
config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks; config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
config.System.DramSize.Value = DramSize; config.System.DramSize.Value = DramSize;
config.System.IgnoreMissingServices.Value = IgnoreMissingServices; config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
config.System.IgnoreApplet.Value = IgnoreApplet; config.System.IgnoreApplet.Value = (EnableAutoAssign) || IgnoreApplet;
// CPU // CPU
config.System.EnablePtc.Value = EnablePptc; config.System.EnablePtc.Value = EnablePptc;

1
src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
View File

@ -313,6 +313,7 @@
<TextBlock Text="{ext:Locale SettingsTabSystemIgnoreMissingServices}" /> <TextBlock Text="{ext:Locale SettingsTabSystemIgnoreMissingServices}" />
</CheckBox> </CheckBox>
<CheckBox <CheckBox
IsEnabled="{Binding !EnableAutoAssign}"
IsChecked="{Binding IgnoreApplet}" IsChecked="{Binding IgnoreApplet}"
ToolTip.Tip="{ext:Locale IgnoreAppletTooltip}"> ToolTip.Tip="{ext:Locale IgnoreAppletTooltip}">
<TextBlock Text="{ext:Locale SettingsTabSystemIgnoreApplet}" /> <TextBlock Text="{ext:Locale SettingsTabSystemIgnoreApplet}" />