Merge EA to public #1035
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,9 @@ | |
| using Nefarius.ViGEm.Client; | ||
| using System; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using System.Windows; | ||
| using static HandheldCompanion.Managers.ControllerManager; | ||
|
|
||
| namespace HandheldCompanion.Managers | ||
| { | ||
|
|
@@ -26,7 +28,7 @@ public static class VirtualManager | |
| public static ushort ProductId = 0x28E; // Xbox 360 | ||
| public static ushort VendorId = 0x45E; // Microsoft | ||
| public static ushort FakeVendorId = 0x76B; // HC | ||
| private static object threadLock = new(); | ||
|
|
||
| public static bool IsInitialized; | ||
|
|
||
|
|
@@ -144,12 +146,15 @@ private static void SettingsManager_SettingValueChanged(string name, object valu | |
| } | ||
| } | ||
|
|
||
| private static async void ProfileManager_Applied(Profile profile, UpdateSource source) | ||
| { | ||
| // SetControllerMode takes care of ignoring identical mode switching | ||
| if (HIDmode == profile.HID || profile.HID == HIDmode.NotSelected) | ||
| return; | ||
|
|
||
| while (ControllerManager.managerStatus == ControllerManagerStatus.Busy) | ||
| await Task.Delay(1000); | ||
|
|
||
| switch (profile.HID) | ||
| { | ||
| case HIDmode.Xbox360Controller: | ||
|
|
@@ -161,8 +166,11 @@ private static void ProfileManager_Applied(Profile profile, UpdateSource source) | |
| } | ||
| } | ||
|
|
||
| private static async void ProfileManager_Discarded(Profile profile) | ||
| { | ||
| while (ControllerManager.managerStatus == ControllerManagerStatus.Busy) | ||
| await Task.Delay(1000); | ||
|
|
||
| // restore default HID mode | ||
| if (profile.HID != HIDmode.NotSelected) | ||
| SetControllerMode(defaultHIDmode); | ||
|
|
@@ -178,107 +186,93 @@ private static void SetDSUStatus(bool started) | |
|
|
||
| public static void SetControllerMode(HIDmode mode) | ||
| { | ||
| lock (threadLock) | ||
| { | ||
| // do not disconnect if similar to previous mode and connected | ||
| if (HIDmode == mode) | ||
| { | ||
| if (HIDstatus == HIDstatus.Disconnected) | ||
| return; | ||
| else if (vTarget is not null && vTarget.IsConnected) | ||
| return; | ||
| } | ||
|
|
||
| // disconnect current virtual controller | ||
| if (vTarget is not null) | ||
| { | ||
| vTarget.Disconnect(); | ||
| vTarget.Dispose(); | ||
| vTarget = null; | ||
| } | ||
|
|
||
| switch (mode) | ||
| { | ||
| default: | ||
| case HIDmode.NoController: | ||
| if (vTarget is not null) | ||
| { | ||
| vTarget.Disconnect(); | ||
| vTarget.Dispose(); | ||
| vTarget = null; | ||
| } | ||
| break; | ||
|
|
||
| case HIDmode.DualShock4Controller: | ||
| vTarget = new DualShock4Target(); | ||
| break; | ||
|
|
||
| case HIDmode.Xbox360Controller: | ||
| // Generate a new random ProductId to help the controller pick empty slot rather than getting its previous one | ||
| VendorId = (ushort)new Random().Next(ushort.MinValue, ushort.MaxValue); | ||
| ProductId = (ushort)new Random().Next(ushort.MinValue, ushort.MaxValue); | ||
| vTarget = new Xbox360Target(VendorId, ProductId); | ||
| break; | ||
| } | ||
|
|
||
| ControllerSelected?.Invoke(mode); | ||
|
|
||
| // failed to initialize controller | ||
| if (vTarget is null) | ||
| { | ||
| if (mode != HIDmode.NoController) | ||
| LogManager.LogError("Failed to initialise virtual controller with HIDmode: {0}", mode); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| vTarget.Connected += OnTargetConnected; | ||
| vTarget.Disconnected += OnTargetDisconnected; | ||
| vTarget.Vibrated += OnTargetVibrated; | ||
|
|
||
| // update current HIDmode | ||
| HIDmode = mode; | ||
| } | ||
|
|
||
| // update status | ||
| SetControllerStatus(HIDstatus); | ||
| } | ||
|
|
||
| public static void SetControllerStatus(HIDstatus status) | ||
| { | ||
| lock (threadLock) | ||
| { | ||
| if (vTarget is null) | ||
| return; | ||
|
|
||
| switch (status) | ||
| { | ||
| default: | ||
| case HIDstatus.Connected: | ||
| vTarget.Connect(); | ||
| break; | ||
| case HIDstatus.Disconnected: | ||
| vTarget.Disconnect(); | ||
| break; | ||
| } | ||
|
|
||
| // update current HIDstatus | ||
| HIDstatus = status; | ||
| } | ||
| } | ||
|
|
||
| private static void OnTargetConnected(ViGEmTarget target) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The RTSS version number is inconsistent with the defined constant.
Committable suggestion