From b536ca3a830292138e055f2718b68efb63d32c8a Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Wed, 13 Mar 2019 18:41:10 -0500 Subject: [PATCH 1/6] Fixed SonyWA disconnect on Windows 7 Was broken since 1.6.4 with change to sending output packets --- DS4Windows/DS4Library/DS4Device.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/DS4Windows/DS4Library/DS4Device.cs b/DS4Windows/DS4Library/DS4Device.cs index 974ea76..e78bb6c 100644 --- a/DS4Windows/DS4Library/DS4Device.cs +++ b/DS4Windows/DS4Library/DS4Device.cs @@ -735,6 +735,7 @@ namespace DS4Windows ds4InactiveFrame = true; idleInput = true; bool syncWriteReport = conType != ConnectionType.BT; + bool forceWrite = false; int maxBatteryValue = 0; int tempBattery = 0; @@ -1022,7 +1023,14 @@ namespace DS4Windows { runCalib = synced = controllerSynced; SyncChange?.Invoke(this, EventArgs.Empty); - sendOutputReport(true, true); + if (synced) + { + forceWrite = true; + } + else + { + standbySw.Reset(); + } } } @@ -1101,7 +1109,8 @@ namespace DS4Windows if (Report != null) Report(this, EventArgs.Empty); - sendOutputReport(syncWriteReport); + sendOutputReport(syncWriteReport, forceWrite); + forceWrite = false; if (!string.IsNullOrEmpty(currerror)) error = currerror; From 27a68196e446acffbd980fef0e9509a4624cc0bc Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sun, 17 Mar 2019 01:28:16 -0500 Subject: [PATCH 2/6] Deprecate old mouse acceleration option. Make new default value false --- DS4Windows/DS4Control/ScpUtil.cs | 4 ++-- DS4Windows/DS4Forms/Options.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs index e385b31..ce71194 100644 --- a/DS4Windows/DS4Control/ScpUtil.cs +++ b/DS4Windows/DS4Control/ScpUtil.cs @@ -1508,7 +1508,7 @@ namespace DS4Windows 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 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[] gyroMouseDZ = new int[5] { MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE, MouseCursor.GYRO_MOUSE_DEADZONE, @@ -3990,7 +3990,7 @@ namespace DS4Windows touchpadInvert[device] = 0; rainbow[device] = 0; flashAt[device] = 0; - mouseAccel[device] = true; + mouseAccel[device] = false; btPollRate[device] = 4; m_LowLeds[device] = new DS4Color(Color.Black); diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs index fa68bbc..457bc30 100644 --- a/DS4Windows/DS4Forms/Options.cs +++ b/DS4Windows/DS4Forms/Options.cs @@ -780,7 +780,7 @@ namespace DS4Windows nUDIdleDisconnect.Value = 5; cBIdleDisconnect.Checked = true; numUDMouseSens.Value = 25; - cBMouseAccel.Checked = true; + cBMouseAccel.Checked = false; pBHoveredButton.Image = null; nUDRainbow.Value = 0; From 6564ff125a337a2fd167177d3bd58cc3ed7312cc Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sun, 17 Mar 2019 14:44:32 -0500 Subject: [PATCH 3/6] Changed driver message in Welcome dialog. The old message was confusing and led to the wrong impression about the purpose of the driver --- DS4Windows/DS4Forms/WelcomeDialog.resx | 528 ++++++++++++------------- 1 file changed, 249 insertions(+), 279 deletions(-) diff --git a/DS4Windows/DS4Forms/WelcomeDialog.resx b/DS4Windows/DS4Forms/WelcomeDialog.resx index 169bb5d..2633d7b 100644 --- a/DS4Windows/DS4Forms/WelcomeDialog.resx +++ b/DS4Windows/DS4Forms/WelcomeDialog.resx @@ -117,260 +117,162 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - If this window reappears after installing, you may need to reboot your pc or wait 10-15mins for Windows to notice the driver - - - 0 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 146, 544 + + 29, 8 - - TopCenter + + 259, 23 - - 390, 80 + + + 1 - - - Bottom + + Step 1: Install the ScpVBus Driver - - Top, Left, Right + + bnStep1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 29, 81 + + + 259, 23 + + + 1 + + + Step 2: If on Windows 7 or below, Install 360 Driver + + + button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this 3 - - 4, 4, 4, 4 - - - label1 - - - 8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5, 5, 5, 5 - - - Bottom, Left, Right - - + + Bottom - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 36, 238 - - 4, 4, 4, 4 - - - labelBluetooth2 - - - $this - - - $this - - - 120, 120 - - - pictureBox1 - - - Top, Left, Right - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 391, 49 - - - $this - - - bnFinish - - - 4 - - - 2 - - - $this - - - linkBluetoothSettings - - - 3 - - - 3 - - - $this + + 245, 132 StretchImage - - $this + + 2 - - 0 - - - 1 - - - 1, 40 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 45, 298 - - - labelBluetooth - - - 4, 0, 4, 0 - - - 36, 10 + + pictureBox1 System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + $this - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - Step 1: Install the DS4 Driver + + Top, Left, Right - - 94, 29 + + 1, 178 - - CenterScreen + + 312, 39 - - bnStep1 + + 3 - + + To set up bluetooth (optional): +Hold the PS Button and Share for 3 seconds +The lightbar will begin to double flash + + TopCenter - - 4, 4, 4, 4 + + labelBluetooth - - 1, 466 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 - - + $this - - 4, 0, 4, 0 + + 1 - - 4, 0, 4, 0 + + Top, Left, Right - - 306, 165 + + 0, 130 - - Bottom + + 313, 39 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - Finish + + Step 3: Connecting the DualShock 4 controller +To set up wired/usb: +Simply plug a micro usb into your PC and DualShock 4 - - 7 - - - $this - - - 324, 29 - - - 4, 0, 4, 0 + + TopCenter labelUSB - - 36, 101 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 0, 4, 0 + + $this - - TopCenter + + 8 - - label2 + + Bottom, Left, Right - - 390, 49 + + 1, 373 - - TopCenter + + 312, 64 - - 392, 57 - - - 123, 17 - - - WelcomeDialog - - - 1, 223 - - - 6 - - - Welcome to DS4Windows + + 3 Once flashing go to your Bluetooth Settings @@ -378,92 +280,160 @@ and Connect to "Wireless Controller" If asked, enter pair code "0000" Once paired, you're ready. Have fun! - - If you've used a 360 Controller on this PC, you can skip this - - - 394, 28 - - - To set up bluetooth (optional): -Hold the PS Button and Share for 3 seconds -The lightbar will begin to double flash - - - True - - - 0, 132 - - - button2 - - - 3 - - - 211, 466 - - - Step 3: Connecting the DualShock 4 controller -To set up wired/usb: -Simply plug a micro usb into your PC and DualShock 4 - - - Step 2: If on Windows 7 or below, Install 360 Driver - - - $this - - - $this - - - 1 - - - 0, 162 - - - 3 - - - 4, 4, 4, 4 - - - 1 - - - 394, 579 - - - 324, 29 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Left, Right - - + TopCenter - + + labelBluetooth2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Left, Right - - - 4, 0, 4, 0 - - - Bluetooth Settings + + $this 9 + + Top, Left, Right + + + 1, 32 + + + 314, 46 + + + 3 + + + If this window reappears after installing, you may need to reboot your pc or wait 10-15mins for Windows to notice the driver + + + TopCenter + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Left, Right + + + 0, 106 + + + 315, 22 + + + 3 + + + If you've used a 360 Controller on this PC, you can skip this + + + TopCenter + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Bottom + + + 117, 435 + + + 75, 23 + + + 0 + + + Finish + + + bnFinish + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Bottom + + + True + + + 169, 373 + + + 93, 13 + + + 4 + + + Bluetooth Settings + + + linkBluetoothSettings + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True + + 96, 96 + + + 315, 463 + + + 4, 4, 4, 4 + + + CenterScreen + + + Welcome to DS4Windows + + + WelcomeDialog + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file From 248aebae00f286e5926c09d6161b7e8ba3c4fcb1 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sun, 17 Mar 2019 14:46:39 -0500 Subject: [PATCH 4/6] Replaced message in another location --- DS4Windows/Properties/Resources.Designer.cs | 2 +- DS4Windows/Properties/Resources.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DS4Windows/Properties/Resources.Designer.cs b/DS4Windows/Properties/Resources.Designer.cs index 58a5158..df0e8e7 100644 --- a/DS4Windows/Properties/Resources.Designer.cs +++ b/DS4Windows/Properties/Resources.Designer.cs @@ -1820,7 +1820,7 @@ namespace DS4Windows.Properties { } /// - /// 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. /// public static string Step1 { get { diff --git a/DS4Windows/Properties/Resources.resx b/DS4Windows/Properties/Resources.resx index 9860dce..2005d42 100644 --- a/DS4Windows/Properties/Resources.resx +++ b/DS4Windows/Properties/Resources.resx @@ -674,7 +674,7 @@ Start - Step 1: Install the DS4 Driver + Step 1: Install the ScpVBus Driver Stop Heavy From 42a6f935add9f29f42b9facae0fe6da4cb139f56 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sun, 17 Mar 2019 20:31:46 -0500 Subject: [PATCH 5/6] Updated newest file --- DS4Windows/newest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DS4Windows/newest.txt b/DS4Windows/newest.txt index d4ca915..5577648 100644 --- a/DS4Windows/newest.txt +++ b/DS4Windows/newest.txt @@ -1 +1 @@ -1.6.13 +1.6.14 From df96a91269cb6403089a69e7c10adabe3a75975e Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sun, 17 Mar 2019 20:32:01 -0500 Subject: [PATCH 6/6] Version 1.6.14 --- DS4Windows/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DS4Windows/Properties/AssemblyInfo.cs b/DS4Windows/Properties/AssemblyInfo.cs index 4afbad8..3d59d92 100644 --- a/DS4Windows/Properties/AssemblyInfo.cs +++ b/DS4Windows/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.13")] -[assembly: AssemblyFileVersion("1.6.13")] +[assembly: AssemblyVersion("1.6.14")] +[assembly: AssemblyFileVersion("1.6.14")] [assembly: NeutralResourcesLanguage("en")]