The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-25 08:01:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' into vigem-udpserver

Browse Source
This commit is contained in:
Travis Nickles 2019-03-17 21:18:59 -05:00
commit 22e212999d
8 changed files with 268 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -1508,7 +1508,7 @@ namespace DS4Windows
public int[] touchpadInvert = new int[5] { 0, 0, 0, 0, 0 }; public int[] touchpadInvert = new int[5] { 0, 0, 0, 0, 0 };
public double[] rainbow = new double[5] { 0.0, 0.0, 0.0, 0.0, 0.0 }; public double[] rainbow = new double[5] { 0.0, 0.0, 0.0, 0.0, 0.0 };
public int[] flashAt = new int[5] { 0, 0, 0, 0, 0 }; public int[] flashAt = new int[5] { 0, 0, 0, 0, 0 };
public bool[] mouseAccel = new bool[5] { true, true, true, true, true }; public bool[] mouseAccel = new bool[5] { false, false, false, false, false };
public int[] btPollRate = new int[5] { 4, 4, 4, 4, 4 }; public int[] btPollRate = new int[5] { 4, 4, 4, 4, 4 };
public int[] gyroMouseDZ = new int[5] { MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE, public int[] gyroMouseDZ = new int[5] { MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE,
MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE,
@ -3974,7 +3974,7 @@ namespace DS4Windows
touchpadInvert[device] = 0; touchpadInvert[device] = 0;
rainbow[device] = 0; rainbow[device] = 0;
flashAt[device] = 0; flashAt[device] = 0;
mouseAccel[device] = true; mouseAccel[device] = false;
btPollRate[device] = 4; btPollRate[device] = 4;
m_LowLeds[device] = new DS4Color(Color.Black); m_LowLeds[device] = new DS4Color(Color.Black);

2
DS4Windows/DS4Forms/Options.cs
View File

@ -780,7 +780,7 @@ namespace DS4Windows
nUDIdleDisconnect.Value = 5; nUDIdleDisconnect.Value = 5;
cBIdleDisconnect.Checked = true; cBIdleDisconnect.Checked = true;
numUDMouseSens.Value = 25; numUDMouseSens.Value = 25;
cBMouseAccel.Checked = true; cBMouseAccel.Checked = false;
pBHoveredButton.Image = null; pBHoveredButton.Image = null;
nUDRainbow.Value = 0; nUDRainbow.Value = 0;

528
DS4Windows/DS4Forms/WelcomeDialog.resx
View File

@ -117,260 +117,162 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="labelBluetooth2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>If this window reappears after installing, you may need to reboot your pc or wait 10-15mins for Windows to notice the driver</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;labelBluetooth2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bnFinish.Location" type="System.Drawing.Point, System.Drawing"> <data name="bnStep1.Location" type="System.Drawing.Point, System.Drawing">
<value>146, 544</value> <value>29, 8</value>
</data> </data>
<data name="labelUSB.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="bnStep1.Size" type="System.Drawing.Size, System.Drawing">
<value>TopCenter</value> <value>259, 23</value>
</data> </data>
<data name="labelBluetooth2.Size" type="System.Drawing.Size, System.Drawing"> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<value>390, 80</value> <data name="bnStep1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data> </data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="bnStep1.Text" xml:space="preserve">
<data name="linkBluetoothSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <value>Step 1: Install the ScpVBus Driver</value>
<value>Bottom</value>
</data> </data>
<data name="label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="&gt;&gt;bnStep1.Name" xml:space="preserve">
<value>Top, Left, Right</value> <value>bnStep1</value>
</data>
<data name="&gt;&gt;bnStep1.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;bnStep1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;bnStep1.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing">
<value>29, 81</value>
</data>
<data name="button2.Size" type="System.Drawing.Size, System.Drawing">
<value>259, 23</value>
</data>
<data name="button2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="button2.Text" xml:space="preserve">
<value>Step 2: If on Windows 7 or below, Install 360 Driver</value>
</data>
<data name="&gt;&gt;button2.Name" xml:space="preserve">
<value>button2</value>
</data>
<data name="&gt;&gt;button2.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;button2.Parent" xml:space="preserve">
<value>$this</value>
</data> </data>
<data name="&gt;&gt;button2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
<value>3</value> <value>3</value>
</data> </data>
<data name="bnFinish.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<value>4, 4, 4, 4</value> <data name="pictureBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;labelUSB.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;labelBluetooth.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="labelBluetooth2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left, Right</value>
</data>
<data name="bnFinish.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="pictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms"> <data name="pictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value /> <value />
</data> </data>
<data name="&gt;&gt;linkBluetoothSettings.Type" xml:space="preserve"> <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>36, 238</value>
</data> </data>
<data name="bnStep1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>4, 4, 4, 4</value> <value>245, 132</value>
</data>
<data name="&gt;&gt;labelBluetooth2.Name" xml:space="preserve">
<value>labelBluetooth2</value>
</data>
<data name="&gt;&gt;pictureBox1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;button2.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>120, 120</value>
</data>
<data name="&gt;&gt;pictureBox1.Name" xml:space="preserve">
<value>pictureBox1</value>
</data>
<data name="labelUSB.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="&gt;&gt;bnStep1.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="labelUSB.Size" type="System.Drawing.Size, System.Drawing">
<value>391, 49</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;bnFinish.Name" xml:space="preserve">
<value>bnFinish</value>
</data>
<data name="linkBluetoothSettings.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;bnFinish.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.Name" xml:space="preserve">
<value>linkBluetoothSettings</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;labelBluetooth.Parent" xml:space="preserve">
<value>$this</value>
</data> </data>
<data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> <data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>StretchImage</value> <value>StretchImage</value>
</data> </data>
<data name="&gt;&gt;bnStep1.Parent" xml:space="preserve"> <data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
<value>$this</value> <value>2</value>
</data> </data>
<data name="bnFinish.TabIndex" type="System.Int32, mscorlib"> <data name="&gt;&gt;pictureBox1.Name" xml:space="preserve">
<value>0</value> <value>pictureBox1</value>
</data>
<data name="button2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 40</value>
</data>
<data name="&gt;&gt;labelUSB.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>45, 298</value>
</data>
<data name="&gt;&gt;labelBluetooth.Name" xml:space="preserve">
<value>labelBluetooth</value>
</data>
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="bnStep1.Location" type="System.Drawing.Point, System.Drawing">
<value>36, 10</value>
</data> </data>
<data name="&gt;&gt;pictureBox1.Type" xml:space="preserve"> <data name="&gt;&gt;pictureBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;bnFinish.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pictureBox1.Parent" xml:space="preserve">
<value>5</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;bnFinish.Type" xml:space="preserve"> <data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>2</value>
</data> </data>
<data name="bnStep1.Text" xml:space="preserve"> <data name="labelBluetooth.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Step 1: Install the DS4 Driver</value> <value>Top, Left, Right</value>
</data> </data>
<data name="bnFinish.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelBluetooth.Location" type="System.Drawing.Point, System.Drawing">
<value>94, 29</value> <value>1, 178</value>
</data> </data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> <data name="labelBluetooth.Size" type="System.Drawing.Size, System.Drawing">
<value>CenterScreen</value> <value>312, 39</value>
</data> </data>
<data name="&gt;&gt;bnStep1.Name" xml:space="preserve"> <data name="labelBluetooth.TabIndex" type="System.Int32, mscorlib">
<value>bnStep1</value> <value>3</value>
</data> </data>
<data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="labelBluetooth.Text" xml:space="preserve">
<value>To set up bluetooth (optional):
Hold the PS Button and Share for 3 seconds
The lightbar will begin to double flash</value>
</data>
<data name="labelBluetooth.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value> <value>TopCenter</value>
</data> </data>
<data name="pictureBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="&gt;&gt;labelBluetooth.Name" xml:space="preserve">
<value>4, 4, 4, 4</value> <value>labelBluetooth</value>
</data> </data>
<data name="labelBluetooth2.Location" type="System.Drawing.Point, System.Drawing"> <data name="&gt;&gt;labelBluetooth.Type" xml:space="preserve">
<value>1, 466</value> <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;bnStep1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;labelBluetooth.Parent" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;labelBluetooth2.Parent" xml:space="preserve">
<value>$this</value> <value>$this</value>
</data> </data>
<data name="linkBluetoothSettings.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="&gt;&gt;labelBluetooth.ZOrder" xml:space="preserve">
<value>4, 0, 4, 0</value> <value>1</value>
</data> </data>
<data name="labelBluetooth.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="labelUSB.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>4, 0, 4, 0</value> <value>Top, Left, Right</value>
</data> </data>
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelUSB.Location" type="System.Drawing.Point, System.Drawing">
<value>306, 165</value> <value>0, 130</value>
</data> </data>
<data name="pictureBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="labelUSB.Size" type="System.Drawing.Size, System.Drawing">
<value>Bottom</value> <value>313, 39</value>
</data> </data>
<data name="&gt;&gt;button2.Type" xml:space="preserve"> <data name="labelUSB.TabIndex" type="System.Int32, mscorlib">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>3</value>
</data> </data>
<data name="bnFinish.Text" xml:space="preserve"> <data name="labelUSB.Text" xml:space="preserve">
<value>Finish</value> <value>Step 3: Connecting the DualShock 4 controller
To set up wired/usb:
Simply plug a micro usb into your PC and DualShock 4</value>
</data> </data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve"> <data name="labelUSB.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>7</value> <value>TopCenter</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="bnStep1.Size" type="System.Drawing.Size, System.Drawing">
<value>324, 29</value>
</data>
<data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data> </data>
<data name="&gt;&gt;labelUSB.Name" xml:space="preserve"> <data name="&gt;&gt;labelUSB.Name" xml:space="preserve">
<value>labelUSB</value> <value>labelUSB</value>
</data> </data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing"> <data name="&gt;&gt;labelUSB.Type" xml:space="preserve">
<value>36, 101</value> <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="labelBluetooth2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="&gt;&gt;labelUSB.Parent" xml:space="preserve">
<value>4, 0, 4, 0</value> <value>$this</value>
</data> </data>
<data name="label2.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="&gt;&gt;labelUSB.ZOrder" xml:space="preserve">
<value>TopCenter</value> <value>8</value>
</data> </data>
<data name="&gt;&gt;label2.Name" xml:space="preserve"> <data name="labelBluetooth2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>label2</value> <value>Bottom, Left, Right</value>
</data> </data>
<data name="labelBluetooth.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelBluetooth2.Location" type="System.Drawing.Point, System.Drawing">
<value>390, 49</value> <value>1, 373</value>
</data> </data>
<data name="labelBluetooth2.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="labelBluetooth2.Size" type="System.Drawing.Size, System.Drawing">
<value>TopCenter</value> <value>312, 64</value>
</data> </data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelBluetooth2.TabIndex" type="System.Int32, mscorlib">
<value>392, 57</value> <value>3</value>
</data>
<data name="linkBluetoothSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 17</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>WelcomeDialog</value>
</data>
<data name="labelBluetooth.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 223</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Welcome to DS4Windows</value>
</data> </data>
<data name="labelBluetooth2.Text" xml:space="preserve"> <data name="labelBluetooth2.Text" xml:space="preserve">
<value>Once flashing go to your Bluetooth Settings <value>Once flashing go to your Bluetooth Settings
@ -378,92 +280,160 @@ and Connect to "Wireless Controller"
If asked, enter pair code "0000" If asked, enter pair code "0000"
Once paired, you're ready. Have fun!</value> Once paired, you're ready. Have fun!</value>
</data> </data>
<data name="label2.Text" xml:space="preserve"> <data name="labelBluetooth2.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>If you've used a 360 Controller on this PC, you can skip this</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>394, 28</value>
</data>
<data name="labelBluetooth.Text" xml:space="preserve">
<value>To set up bluetooth (optional):
Hold the PS Button and Share for 3 seconds
The lightbar will begin to double flash</value>
</data>
<data name="linkBluetoothSettings.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 132</value>
</data>
<data name="&gt;&gt;button2.Name" xml:space="preserve">
<value>button2</value>
</data>
<data name="labelBluetooth.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="linkBluetoothSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>211, 466</value>
</data>
<data name="labelUSB.Text" xml:space="preserve">
<value>Step 3: Connecting the DualShock 4 controller
To set up wired/usb:
Simply plug a micro usb into your PC and DualShock 4</value>
</data>
<data name="button2.Text" xml:space="preserve">
<value>Step 2: If on Windows 7 or below, Install 360 Driver</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;labelUSB.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="bnStep1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="labelUSB.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 162</value>
</data>
<data name="labelUSB.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="button2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="&gt;&gt;labelBluetooth.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>394, 579</value>
</data>
<data name="button2.Size" type="System.Drawing.Size, System.Drawing">
<value>324, 29</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="labelBluetooth.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="labelBluetooth.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value> <value>TopCenter</value>
</data> </data>
<data name="&gt;&gt;label1.Type" xml:space="preserve"> <data name="&gt;&gt;labelBluetooth2.Name" xml:space="preserve">
<value>labelBluetooth2</value>
</data>
<data name="&gt;&gt;labelBluetooth2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="&gt;&gt;labelBluetooth2.Parent" xml:space="preserve">
<value>Top, Left, Right</value> <value>$this</value>
</data>
<data name="labelUSB.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="linkBluetoothSettings.Text" xml:space="preserve">
<value>Bluetooth Settings</value>
</data> </data>
<data name="&gt;&gt;labelBluetooth2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;labelBluetooth2.ZOrder" xml:space="preserve">
<value>9</value> <value>9</value>
</data> </data>
<data name="label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 32</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>314, 46</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>If this window reappears after installing, you may need to reboot your pc or wait 10-15mins for Windows to notice the driver</value>
</data>
<data name="label1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 106</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>315, 22</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>If you've used a 360 Controller on this PC, you can skip this</value>
</data>
<data name="label2.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>TopCenter</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="bnFinish.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom</value>
</data>
<data name="bnFinish.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 435</value>
</data>
<data name="bnFinish.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="bnFinish.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="bnFinish.Text" xml:space="preserve">
<value>Finish</value>
</data>
<data name="&gt;&gt;bnFinish.Name" xml:space="preserve">
<value>bnFinish</value>
</data>
<data name="&gt;&gt;bnFinish.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;bnFinish.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;bnFinish.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="linkBluetoothSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom</value>
</data>
<data name="linkBluetoothSettings.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="linkBluetoothSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>169, 373</value>
</data>
<data name="linkBluetoothSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 13</value>
</data>
<data name="linkBluetoothSettings.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="linkBluetoothSettings.Text" xml:space="preserve">
<value>Bluetooth Settings</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.Name" xml:space="preserve">
<value>linkBluetoothSettings</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;linkBluetoothSettings.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>315, 463</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Welcome to DS4Windows</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>WelcomeDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root> </root>

13
DS4Windows/DS4Library/DS4Device.cs
View File

@ -735,6 +735,7 @@ namespace DS4Windows
ds4InactiveFrame = true; ds4InactiveFrame = true;
idleInput = true; idleInput = true;
bool syncWriteReport = conType != ConnectionType.BT; bool syncWriteReport = conType != ConnectionType.BT;
bool forceWrite = false;
int maxBatteryValue = 0; int maxBatteryValue = 0;
int tempBattery = 0; int tempBattery = 0;
@ -1022,7 +1023,14 @@ namespace DS4Windows
{ {
runCalib = synced = controllerSynced; runCalib = synced = controllerSynced;
SyncChange?.Invoke(this, EventArgs.Empty); SyncChange?.Invoke(this, EventArgs.Empty);
sendOutputReport(true, true); if (synced)
{
forceWrite = true;
}
else
{
standbySw.Reset();
}
} }
} }
@ -1101,7 +1109,8 @@ namespace DS4Windows
if (Report != null) if (Report != null)
Report(this, EventArgs.Empty); Report(this, EventArgs.Empty);
sendOutputReport(syncWriteReport); sendOutputReport(syncWriteReport, forceWrite);
forceWrite = false;
if (!string.IsNullOrEmpty(currerror)) if (!string.IsNullOrEmpty(currerror))
error = currerror; error = currerror;

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.6.13")] [assembly: AssemblyVersion("1.6.14")]
[assembly: AssemblyFileVersion("1.6.13")] [assembly: AssemblyFileVersion("1.6.14")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]

2
DS4Windows/Properties/Resources.Designer.cs generated
View File

@ -1820,7 +1820,7 @@ namespace DS4Windows.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Step 1: Install the DS4 Driver. /// Looks up a localized string similar to Step 1: Install the ScpVBus Driver.
/// </summary> /// </summary>
public static string Step1 { public static string Step1 {
get { get {

2
DS4Windows/Properties/Resources.resx
View File

@ -674,7 +674,7 @@
<value>Start</value> <value>Start</value>
</data> </data>
<data name="Step1" xml:space="preserve"> <data name="Step1" xml:space="preserve">
<value>Step 1: Install the DS4 Driver</value> <value>Step 1: Install the ScpVBus Driver</value>
</data> </data>
<data name="StopHText" xml:space="preserve"> <data name="StopHText" xml:space="preserve">
<value>Stop Heavy</value> <value>Stop Heavy</value>

2
DS4Windows/newest.txt
View File

@ -1 +1 @@
1.6.13 1.6.14