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

Merge branch 'jay' into udpserver

Browse Source
This commit is contained in:
Travis Nickles 2018-07-23 00:06:16 -05:00
commit 5a4ed6c440
8 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS4Windows/DS4Control/ScpDevice.cs
View File

@ -3,10 +3,12 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security;
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
namespace DS4Windows namespace DS4Windows
{ {
[SuppressUnmanagedCodeSecurity]
public partial class ScpDevice : Component public partial class ScpDevice : Component
{ {
public virtual Boolean IsActive public virtual Boolean IsActive

5
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -506,6 +506,11 @@ namespace DS4Windows
get { return m_Config.minToTaskbar; } get { return m_Config.minToTaskbar; }
} }
public static bool GetMinToTaskbar()
{
return m_Config.minToTaskbar;
}
public static int FormWidth public static int FormWidth
{ {
set { m_Config.formWidth = value; } set { m_Config.formWidth = value; }

5
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -898,14 +898,15 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
protected void Form_Resize(object sender, EventArgs e) protected void Form_Resize(object sender, EventArgs e)
{ {
if (FormWindowState.Minimized == WindowState && !MinToTaskbar) bool minToTask = GetMinToTaskbar();
if (FormWindowState.Minimized == WindowState && minToTask)
{ {
Hide(); Hide();
ShowInTaskbar = false; ShowInTaskbar = false;
FormBorderStyle = FormBorderStyle.None; FormBorderStyle = FormBorderStyle.None;
} }
else if (FormWindowState.Normal == WindowState && !MinToTaskbar) else if (FormWindowState.Normal == WindowState && minToTask)
{ {
//mAllowVisible = true; //mAllowVisible = true;
Show(); Show();

4
DS4Windows/DS4Library/DS4Device.cs
View File

@ -997,9 +997,9 @@ namespace DS4Windows
{ {
pbAccel[i-6] = pbInput[i]; pbAccel[i-6] = pbInput[i];
} }
}
sixAxis.handleSixaxis(gyro, accel, cState, elapsedDeltaTime); sixAxis.handleSixaxis(pbGyro, pbAccel, cState, elapsedDeltaTime);
}
/* Debug output of incoming HID data: /* Debug output of incoming HID data:
if (cState.L2 == 0xff && cState.R2 == 0xff) if (cState.L2 == 0xff && cState.R2 == 0xff)

2
DS4Windows/DS4Library/DS4Sixaxis.cs
View File

@ -220,7 +220,7 @@ namespace DS4Windows
accelZ = temInt = (int)(temInt * (current.sensNumer / (float)current.sensDenom)); accelZ = temInt = (int)(temInt * (current.sensNumer / (float)current.sensDenom));
} }
public void handleSixaxis(byte[] gyro, byte[] accel, DS4State state, public unsafe void handleSixaxis(byte* gyro, byte* accel, DS4State state,
double elapsedDelta) double elapsedDelta)
{ {
int currentYaw = (short)((ushort)(gyro[3] << 8) | gyro[2]); int currentYaw = (short)((ushort)(gyro[3] << 8) | gyro[2]);

4
DS4Windows/Properties/AssemblyInfo.cs
View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.123")] [assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.4.123")] [assembly: AssemblyFileVersion("1.5.0")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]

6
README.md
View File

@ -8,12 +8,12 @@ You can find the latest and older versions [here](https://github.com/Ryochan7/DS
UdpServer builds for using Gyro motion controls in Cemu. UdpServer builds for using Gyro motion controls in Cemu.
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.121_UdpServer_x64.zip http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.123_UdpServer_x64.zip
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.121_ViGEm_UdpServer_x64.zip http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.123_ViGEm_UdpServer_x64.zip
ViGEm build. ViGEm build.
http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.121_ViGEm_x64.zip http://ryochan7.xyz/ds4windows/test/DS4Windows_1.4.123_ViGEm_x64.zip
This project is a fork of the work of Jays2Kings. You can find the old project This project is a fork of the work of Jays2Kings. You can find the old project
website at [ds4windows.com](http://ds4windows.com). website at [ds4windows.com](http://ds4windows.com).

1
contributors.txt
View File

@ -1,5 +1,6 @@
Travis Nickles (Ryochan7) Travis Nickles (Ryochan7)
Korney Czukowski (czukowski) Korney Czukowski (czukowski)
jdfeng jdfeng
Rajko Stojadinovic (rajkosto)
Yuki-nyan Yuki-nyan