The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-23 01:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change plugin and unplug routines with ScpVBus

Browse Source
This commit is contained in:
Travis Nickles 2017-05-11 06:41:18 -07:00
parent 72108184d0
commit 81b54a7dd9
4 changed files with 86 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
DS4Windows/DS4Control/ControlSerivce.cs
View File

@ -135,8 +135,19 @@ namespace DS4Windows
if (!getDInputOnly(i)) if (!getDInputOnly(i))
{ {
LogDebug("Plugging in X360 Controller #" + (x360Bus.FirstController + i)); int xinputIndex = x360Bus.FirstController + i;
x360Bus.Plugin(i); LogDebug("Plugging in X360 Controller #" + xinputIndex);
bool xinputResult = x360Bus.Plugin(i);
if (xinputResult)
{
LogDebug("X360 Controller # " + xinputIndex + " connected");
useDInputOnly[i] = false;
}
else
{
LogDebug("X360 Controller # " + xinputIndex + " failed. Using DInput only mode");
useDInputOnly[i] = true;
}
} }
device.Report += this.On_Report; device.Report += this.On_Report;
@ -226,6 +237,7 @@ namespace DS4Windows
CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change. CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change.
x360Bus.Unplug(i); x360Bus.Unplug(i);
useDInputOnly[i] = false;
anyUnplugged = true; anyUnplugged = true;
DS4Controllers[i] = null; DS4Controllers[i] = null;
touchPad[i] = null; touchPad[i] = null;
@ -319,8 +331,19 @@ namespace DS4Windows
device.Report += this.On_Report; device.Report += this.On_Report;
if (!getDInputOnly(Index)) if (!getDInputOnly(Index))
{ {
LogDebug("Plugging in X360 Controller #" + (x360Bus.FirstController + Index)); int xinputIndex = x360Bus.FirstController + i;
x360Bus.Plugin(Index); LogDebug("Plugging in X360 Controller #" + xinputIndex);
bool xinputResult = x360Bus.Plugin(i);
if (xinputResult)
{
LogDebug("X360 Controller # " + xinputIndex + " connected");
useDInputOnly[i] = false;
}
else
{
LogDebug("X360 Controller # " + xinputIndex + " failed. Using DInput only mode");
useDInputOnly[i] = true;
}
} }
TouchPadOn(Index, device); TouchPadOn(Index, device);
@ -517,7 +540,6 @@ namespace DS4Windows
return Properties.Resources.NoneText; return Properties.Resources.NoneText;
} }
private int XINPUT_UNPLUG_SETTLE_TIME = 250; // Inhibit races that occur with the asynchronous teardown of ScpVBus -> X360 driver instance.
//Called when DS4 is disconnected or timed out //Called when DS4 is disconnected or timed out
protected virtual void On_DS4Removal(object sender, EventArgs e) protected virtual void On_DS4Removal(object sender, EventArgs e)
{ {
@ -548,7 +570,9 @@ namespace DS4Windows
string removed = Properties.Resources.ControllerWasRemoved.Replace("*Mac address*", (ind + 1).ToString()); string removed = Properties.Resources.ControllerWasRemoved.Replace("*Mac address*", (ind + 1).ToString());
if (device.getBattery() <= 20 && if (device.getBattery() <= 20 &&
device.getConnectionType() == ConnectionType.BT && !device.isCharging()) device.getConnectionType() == ConnectionType.BT && !device.isCharging())
{
removed += ". " + Properties.Resources.ChargeController; removed += ". " + Properties.Resources.ChargeController;
}
LogDebug(removed); LogDebug(removed);
Log.LogToTray(removed); Log.LogToTray(removed);
@ -558,6 +582,7 @@ namespace DS4Windows
touchPad[ind] = null; touchPad[ind] = null;
lag[ind] = false; lag[ind] = false;
inWarnMonitor[ind] = false; inWarnMonitor[ind] = false;
useDInputOnly[ind] = false;
OnControllerRemoved(this, ind); OnControllerRemoved(this, ind);
//ControllerStatusChanged(this); //ControllerStatusChanged(this);
} }
@ -639,7 +664,7 @@ namespace DS4Windows
// Update the GUI/whatever. // Update the GUI/whatever.
DS4LightBar.updateLightBar(device, ind, cState, ExposedState[ind], touchPad[ind]); DS4LightBar.updateLightBar(device, ind, cState, ExposedState[ind], touchPad[ind]);
if (!getDInputOnly(ind)) if (!useDInputOnly[ind])
{ {
x360Bus.Parse(cState, processingData[ind].Report, ind); x360Bus.Parse(cState, processingData[ind].Report, ind);
// We push the translated Xinput state, and simultaneously we // We push the translated Xinput state, and simultaneously we

63
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -217,8 +217,10 @@ namespace DS4Windows
static string exepath = Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName; static string exepath = Directory.GetParent(Assembly.GetExecutingAssembly().Location).FullName;
public static string appdatapath; public static string appdatapath;
public static bool runHotPlug = false; public static bool runHotPlug = false;
public const int XINPUT_UNPLUG_SETTLE_TIME = 250; // Inhibit races that occur with the asynchronous teardown of ScpVBus -> X360 driver instance.
public static string[] tempprofilename = new string[5] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty }; public static string[] tempprofilename = new string[5] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
public static bool[] tempprofileDistance = new bool[5] { false, false, false, false, false }; public static bool[] tempprofileDistance = new bool[5] { false, false, false, false, false };
public static bool[] useDInputOnly = new bool[5] { false, false, false, false, false };
public static X360Controls[] defaultButtonMapping = { X360Controls.None, X360Controls.LXNeg, X360Controls.LXPos, public static X360Controls[] defaultButtonMapping = { X360Controls.None, X360Controls.LXNeg, X360Controls.LXPos,
X360Controls.LYNeg, X360Controls.LYPos, X360Controls.RXNeg, X360Controls.RXPos, X360Controls.RYNeg, X360Controls.RYPos, X360Controls.LYNeg, X360Controls.LYPos, X360Controls.RXNeg, X360Controls.RXPos, X360Controls.RYNeg, X360Controls.RYPos,
@ -480,6 +482,7 @@ namespace DS4Windows
{ {
return m_Config.dinputOnly[index]; return m_Config.dinputOnly[index];
} }
public static bool[] StartTouchpadOff => m_Config.startTouchpadOff; public static bool[] StartTouchpadOff => m_Config.startTouchpadOff;
public static bool[] UseTPforControls => m_Config.useTPforControls; public static bool[] UseTPforControls => m_Config.useTPforControls;
public static bool getUseTPforControls(int index) public static bool getUseTPforControls(int index)
@ -826,14 +829,15 @@ namespace DS4Windows
public static Dictionary<DS4Controls, DS4KeyType> getShiftCustomKeyTypes(int device) => m_Config.shiftCustomMapKeyTypes[device]; */ public static Dictionary<DS4Controls, DS4KeyType> getShiftCustomKeyTypes(int device) => m_Config.shiftCustomMapKeyTypes[device]; */
public static bool Load() => m_Config.Load(); public static bool Load() => m_Config.Load();
public static void LoadProfile(int device, bool launchprogram, ControlService control) public static void LoadProfile(int device, bool launchprogram, ControlService control, bool xinputChange = true)
{ {
m_Config.LoadProfile(device, launchprogram, control); m_Config.LoadProfile(device, launchprogram, control, "", xinputChange);
tempprofilename[device] = string.Empty; tempprofilename[device] = string.Empty;
tempprofileDistance[device] = false; tempprofileDistance[device] = false;
} }
public static void LoadTempProfile(int device, string name, bool launchprogram, ControlService control) public static void LoadTempProfile(int device, string name, bool launchprogram,
ControlService control, bool xinputChange = true)
{ {
m_Config.LoadProfile(device, launchprogram, control, appdatapath + @"\Profiles\" + name + ".xml"); m_Config.LoadProfile(device, launchprogram, control, appdatapath + @"\Profiles\" + name + ".xml");
tempprofilename[device] = name; tempprofilename[device] = name;
@ -1747,7 +1751,7 @@ namespace DS4Windows
return "Unbound"; return "Unbound";
} }
public Boolean LoadProfile(int device, bool launchprogram, ControlService control, string propath = "") public Boolean LoadProfile(int device, bool launchprogram, ControlService control, string propath = "", bool xinputChange = true)
{ {
Boolean Loaded = true; Boolean Loaded = true;
Dictionary<DS4Controls, DS4KeyType> customMapKeyTypes = new Dictionary<DS4Controls, DS4KeyType>(); Dictionary<DS4Controls, DS4KeyType> customMapKeyTypes = new Dictionary<DS4Controls, DS4KeyType>();
@ -1767,6 +1771,7 @@ namespace DS4Windows
profilepath = Global.appdatapath + @"\Profiles\" + profilePath[device] + ".xml"; profilepath = Global.appdatapath + @"\Profiles\" + profilePath[device] + ".xml";
else else
profilepath = propath; profilepath = propath;
if (File.Exists(profilepath)) if (File.Exists(profilepath))
{ {
XmlNode Item; XmlNode Item;
@ -2022,14 +2027,52 @@ namespace DS4Windows
try try
{ {
Item = m_Xdoc.SelectSingleNode("/" + rootname + "/DinputOnly"); Item = m_Xdoc.SelectSingleNode("/" + rootname + "/DinputOnly");
Boolean.TryParse(Item.InnerText, out dinputOnly[device]); bool.TryParse(Item.InnerText, out dinputOnly[device]);
if (device < 4)
{
if (dinputOnly[device] == true) control.x360Bus.Unplug(device);
else if (control.DS4Controllers[device] != null && control.DS4Controllers[device].IsAlive()) control.x360Bus.Plugin(device);
}
} }
catch { missingSetting = true; } catch { missingSetting = true; }
Global.useDInputOnly[device] = dinputOnly[device];
// Only change xinput devices under certain conditions. Avoid
// performing this upon program startup before loading devices.
if (xinputChange)
{
bool changed = false;
if (device < 4)
{
DS4Device tempDevice = control.DS4Controllers[device];
if (dinputOnly[device] == true)
{
bool xinputResult = control.x360Bus.Unplug(device);
if (xinputResult)
{
int xinputIndex = control.x360Bus.FirstController + device;
Log.LogToGui("X360 Controller # " + xinputIndex + " unplugged", false);
Global.useDInputOnly[device] = false;
}
changed = true;
}
else if (tempDevice != null && tempDevice.IsAlive())
{
bool xinputResult = control.x360Bus.Plugin(device);
if (xinputResult)
{
int xinputIndex = control.x360Bus.FirstController + device;
Log.LogToGui("X360 Controller # " + xinputIndex + " connected", false);
Global.useDInputOnly[device] = true;
}
changed = true;
}
}
if (changed)
{
System.Threading.Thread.Sleep(Global.XINPUT_UNPLUG_SETTLE_TIME);
}
}
try try
{ {
Item = m_Xdoc.SelectSingleNode("/" + rootname + "/StartTouchpadOff"); Item = m_Xdoc.SelectSingleNode("/" + rootname + "/StartTouchpadOff");

2
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -311,7 +311,7 @@ namespace DS4Windows
//NewVersion(); //NewVersion();
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
LoadProfile(i, false, Program.rootHub); LoadProfile(i, false, Program.rootHub, false);
if (UseCustomLed[i]) if (UseCustomLed[i])
lights[i].BackColor = CustomColor[i].ToColorA; lights[i].BackColor = CustomColor[i].ToColorA;
else else

3
DS4Windows/DS4Forms/Options.cs
View File

@ -1673,7 +1673,7 @@ namespace DS4Windows
private void Options_FormClosing(object sender, FormClosingEventArgs e) private void Options_FormClosing(object sender, FormClosingEventArgs e)
{ {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
LoadProfile(i, false, Program.rootHub); //Refreshes all profiles in case other controllers are using the same profile LoadProfile(i, false, Program.rootHub); // Refreshes all profiles in case other controllers are using the same profile
if (olddinputcheck != cBDinput.Checked) if (olddinputcheck != cBDinput.Checked)
{ {
@ -2202,7 +2202,6 @@ namespace DS4Windows
StartTouchpadOff[device] = cbStartTouchpadOff.Checked; StartTouchpadOff[device] = cbStartTouchpadOff.Checked;
} }
private void Items_MouseHover(object sender, EventArgs e) private void Items_MouseHover(object sender, EventArgs e)
{ {
string name = ((Control)sender).Name; string name = ((Control)sender).Name;