Version 1.4.0.71

Rumble motors swapped to be correct
Bug fixes, including crashes and a small windows when minimized on Win7
This commit is contained in:
jays2kings 2014-10-14 14:54:42 -04:00
parent 0f4297bd9e
commit b43ee4f4e3
6 changed files with 146 additions and 151 deletions

View File

@ -425,7 +425,7 @@ namespace DS4Control
if (processingData[ind].Rumble[1] == 0x08)
{
setRumble(Small, Big, ind);
setRumble(Big, Small, ind);
}
}

View File

@ -665,8 +665,6 @@ namespace DS4Control
Global.getShiftCustomKey(device, customButton.Key) == 0 &&
Global.getShiftCustomButton(device, customButton.Key) == X360Controls.None))
{
if (customButton.Key == DS4Controls.Square)
Console.WriteLine("hello");
DS4KeyType keyType = Global.getCustomKeyType(device, customButton.Key);
int keyvalue = 0;
switch (customButton.Value)

View File

@ -132,6 +132,7 @@ namespace ScpServer
nUDIdleDisconnect.Value = Math.Round((decimal)(Global.getIdleDisconnectTimeout(device) / 60d), 1);
cBIdleDisconnect.Checked = Global.getIdleDisconnectTimeout(device) > 0;
numUDMouseSens.Value = Global.getButtonMouseSensitivity(device);
cBMouseAccel.Checked = Global.getMouseAccel(device);
// Force update of color choosers
alphacolor = Math.Max(redBar.Value, Math.Max(greenBar.Value, blueBar.Value));
reg = Color.FromArgb(color.red, color.green, color.blue);

View File

@ -32,5 +32,5 @@ 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.4.0.7")]
[assembly: AssemblyFileVersion("1.4.0.7")]
[assembly: AssemblyVersion("1.4.0.71")]
[assembly: AssemblyFileVersion("1.4.0.71")]

View File

@ -889,7 +889,6 @@
this.Controls.Add(this.pnlButton);
this.Name = "ScpForm";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScpForm_Closing);
this.Load += new System.EventHandler(this.Form_Load);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragEnter);
this.Resize += new System.EventHandler(this.Form_Resize);

View File

@ -93,50 +93,7 @@ namespace ScpServer
if (File.Exists(appdatapath + "\\Profiles.xml"))
tt.SetToolTip(linkUninstall, Properties.Resources.IfRemovingDS4Windows);
tt.SetToolTip(cBSwipeProfiles, Properties.Resources.TwoFingerSwipe);
}
public static string GetTopWindowName()
{
IntPtr hWnd = GetForegroundWindow();
uint lpdwProcessId;
GetWindowThreadProcessId(hWnd, out lpdwProcessId);
IntPtr hProcess = OpenProcess(0x0410, false, lpdwProcessId);
StringBuilder text = new StringBuilder(1000);
GetModuleFileNameEx(hProcess, IntPtr.Zero, text, text.Capacity);
CloseHandle(hProcess);
return text.ToString();
}
private void OnPowerChange(object s, PowerModeChangedEventArgs e)
{
switch (e.Mode)
{
case PowerModes.Resume:
if (btnStartStop.Text == Properties.Resources.StartText && wasrunning)
{
DS4LightBar.shuttingdown = false;
wasrunning = false;
btnStartStop_Clicked();
}
break;
case PowerModes.Suspend:
if (btnStartStop.Text == Properties.Resources.StopText)
{
DS4LightBar.shuttingdown = true;
btnStartStop_Clicked();
wasrunning = true;
}
break;
}
}
protected void Form_Load(object sender, EventArgs e)
{
SetupArrays();
var AppCollectionThread = new System.Threading.Thread(() => CheckDrivers());
AppCollectionThread.IsBackground = true;
AppCollectionThread.Start();
@ -221,7 +178,7 @@ namespace ScpServer
startMinimizedCheckBox.CheckedChanged += startMinimizedCheckBox_CheckedChanged;
if (startMinimizedCheckBox.Checked)
this.WindowState = FormWindowState.Minimized;
Form_Resize(sender, e);
Form_Resize(null, null);
RefreshProfiles();
for (int i = 0; i < 4; i++)
{
@ -276,6 +233,46 @@ namespace ScpServer
linkUninstall.Visible = false;
StartWindowsCheckBox.Checked = File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk");
}
}
public static string GetTopWindowName()
{
IntPtr hWnd = GetForegroundWindow();
uint lpdwProcessId;
GetWindowThreadProcessId(hWnd, out lpdwProcessId);
IntPtr hProcess = OpenProcess(0x0410, false, lpdwProcessId);
StringBuilder text = new StringBuilder(1000);
GetModuleFileNameEx(hProcess, IntPtr.Zero, text, text.Capacity);
CloseHandle(hProcess);
return text.ToString();
}
private void OnPowerChange(object s, PowerModeChangedEventArgs e)
{
switch (e.Mode)
{
case PowerModes.Resume:
if (btnStartStop.Text == Properties.Resources.StartText && wasrunning)
{
DS4LightBar.shuttingdown = false;
wasrunning = false;
btnStartStop_Clicked();
}
break;
case PowerModes.Suspend:
if (btnStartStop.Text == Properties.Resources.StopText)
{
DS4LightBar.shuttingdown = true;
btnStartStop_Clicked();
wasrunning = true;
}
break;
}
}
private void test_Tick(object sender, EventArgs e)
{
@ -552,14 +549,14 @@ namespace ScpServer
{
this.Hide();
this.ShowInTaskbar = false;
this.FormBorderStyle = FormBorderStyle.SizableToolWindow;
//this.FormBorderStyle = FormBorderStyle.SizableToolWindow;
}
else if (FormWindowState.Normal == this.WindowState)
{
this.Show();
this.ShowInTaskbar = true;
this.FormBorderStyle = FormBorderStyle.Sizable;
//this.FormBorderStyle = FormBorderStyle.Sizable;
}
chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
}