From edd7cf9403eaa94a862520005356e545486a7732 Mon Sep 17 00:00:00 2001 From: jays2kings Date: Sat, 21 Jun 2014 14:00:28 -0400 Subject: [PATCH] Version 10.55 Dimming by idle timeout synced with color/dim by Battery % setting Swipe to cycle through profiles can now be disabled. Version 10.52 Input by DS4 in profile settings now turns off when off that tab Able to use edit button to open that profile settings, even when profile settings are already open open. Version 10.51 Fix for BT disconnecting while DS4Windows is running, and Disconnect BT when stopping is checked. Version 10.5 Support for Left/Right Shift, Control, Alt in macros Better support of Tab and media keys (note: media keys can not be held between actions) Option to disconnect controller from BT if stopping/closing DS4Windows Spelling fixes Start of support for other languages, starting with very barebones support for Spanish, If anyone can help with translations of your language, please PM me here or email me here with translations for as much text as you can. Here is a link to all the text that appears in DS4Windows in English --- DS4Control/Control.cs | 16 +- DS4Control/DS4LightBar.cs | 2 +- DS4Control/Mapping.cs | 3 +- DS4Control/ScpUtil.cs | 83 +- DS4Tool/DS4Tool.csproj | 17 +- DS4Tool/Hotkeys.Designer.cs | 8 +- DS4Tool/KBM360.Designer.cs | 4 +- DS4Tool/Options.Designer.cs | 151 +- DS4Tool/Options.cs | 45 +- .../Resources.es.resx} | 6 + DS4Tool/Properties/Resources.resx | 9 + DS4Tool/Properties/Resources1.Designer.cs | 125 +- DS4Tool/RecordBox.cs | 99 +- DS4Tool/Resource.es.Designer.cs | 0 DS4Tool/SaveWhere.Designer.cs | 6 +- DS4Tool/ScpForm.Designer.cs | 725 +- DS4Tool/ScpForm.cs | 164 +- DS4Tool/ScpForm.es.resx | 6679 +++++++++++++++++ DS4Tool/ScpForm.resx | 2404 +++++- DS4Tool/WelcomeDialog.Designer.cs | 6 +- 20 files changed, 9715 insertions(+), 837 deletions(-) rename DS4Tool/{Resource.es.resx => Properties/Resources.es.resx} (97%) delete mode 100644 DS4Tool/Resource.es.Designer.cs create mode 100644 DS4Tool/ScpForm.es.resx diff --git a/DS4Control/Control.cs b/DS4Control/Control.cs index 1140f3c..5fe098b 100644 --- a/DS4Control/Control.cs +++ b/DS4Control/Control.cs @@ -127,10 +127,15 @@ namespace DS4Control for (int i = 0; i < DS4Controllers.Length; i++) { if (DS4Controllers[i] != null) - { - DS4LightBar.defualtLight = true; - DS4LightBar.updateLightBar(DS4Controllers[i], i); - System.Threading.Thread.Sleep(50); + { + if (Global.getDCBTatStop() && !DS4Controllers[i].Charging && showlog) + DS4Controllers[i].DisconnectBT(); + else + { + DS4LightBar.defualtLight = true; + DS4LightBar.updateLightBar(DS4Controllers[i], i); + System.Threading.Thread.Sleep(50); + } CurrentState[i].Battery = PreviousState[i].Battery = 0; // Reset for the next connection's initial status change. x360Bus.Unplug(i); anyUnplugged = true; @@ -574,7 +579,6 @@ namespace DS4Control public DS4State getDS4StateMapped(int ind) { return MappedState[ind]; - } - + } } } diff --git a/DS4Control/DS4LightBar.cs b/DS4Control/DS4LightBar.cs index 6ecc1c0..4f30b17 100644 --- a/DS4Control/DS4LightBar.cs +++ b/DS4Control/DS4LightBar.cs @@ -75,7 +75,7 @@ namespace DS4Control color = Global.loadColor(deviceNum); } - if (Global.getIdleDisconnectTimeout(deviceNum) > 0 && (!device.Charging || device.Battery >= 100)) + if (Global.getIdleDisconnectTimeout(deviceNum) > 0 && Global.getLedAsBatteryIndicator(deviceNum) && (!device.Charging || device.Battery >= 100)) {//Fade lightbar by idle time TimeSpan timeratio = new TimeSpan(DateTime.UtcNow.Ticks - device.lastActive.Ticks); double botratio = timeratio.TotalMilliseconds; diff --git a/DS4Control/Mapping.cs b/DS4Control/Mapping.cs index dce7036..6c57434 100644 --- a/DS4Control/Mapping.cs +++ b/DS4Control/Mapping.cs @@ -200,6 +200,7 @@ namespace DS4Control { oldnow = DateTime.UtcNow; InputMethods.performKeyPress(kvp.Key); + Console.WriteLine(((System.Windows.Forms.Keys)kvp.Key).ToString()); pressagain = false; keyshelddown = kvp.Key; } @@ -240,7 +241,7 @@ namespace DS4Control if (gkp.previous.scanCodeCount != 0) // use the last type of VK/SC { InputMethods.performSCKeyRelease(kvp.Key); - InputMethods.performKeyRelease(kvp.Key); + //InputMethods.performKeyRelease(kvp.Key); pressagain = false; } else diff --git a/DS4Control/ScpUtil.cs b/DS4Control/ScpUtil.cs index 3881d4f..16ef465 100644 --- a/DS4Control/ScpUtil.cs +++ b/DS4Control/ScpUtil.cs @@ -279,6 +279,26 @@ namespace DS4Control { return m_Config.notifications; } + + public static void setDCBTatStop(bool data) + { + m_Config.disconnectBTAtStop = data; + } + + public static bool getDCBTatStop() + { + return m_Config.disconnectBTAtStop; + } + + public static void setSwipeProfiles(bool data) + { + m_Config.swipeProfiles = data; + } + + public static bool getSwipeProfiles() + { + return m_Config.swipeProfiles; + } // New settings public static void saveLowColor(int device, byte red, byte green, byte blue) { @@ -614,6 +634,8 @@ namespace DS4Control public DateTime lastChecked; public int CheckWhen = 1; public bool notifications = true; + public bool disconnectBTAtStop = false; + public bool swipeProfiles = true; public Dictionary[] customMapKeyTypes = { null, null, null, null, null }; public Dictionary[] customMapKeys = { null, null, null, null, null }; public Dictionary[] customMapMacros = { null, null, null, null, null }; @@ -1229,6 +1251,12 @@ namespace DS4Control catch { missingSetting = true; } try { Item = m_Xdoc.SelectSingleNode("/Profile/Notifications"); Boolean.TryParse(Item.InnerText, out notifications); } catch { missingSetting = true; } + try { Item = m_Xdoc.SelectSingleNode("/Profile/Notifications"); Boolean.TryParse(Item.InnerText, out notifications); } + catch { missingSetting = true; } + try { Item = m_Xdoc.SelectSingleNode("/Profile/DisconnectBTAtStop"); Boolean.TryParse(Item.InnerText, out disconnectBTAtStop); } + catch { missingSetting = true; } + try { Item = m_Xdoc.SelectSingleNode("/Profile/SwipeProfiles"); Boolean.TryParse(Item.InnerText, out swipeProfiles); } + catch { missingSetting = true; } } } catch { } @@ -1240,45 +1268,42 @@ namespace DS4Control { Boolean Saved = true; - //try - { - XmlNode Node; + XmlNode Node; - m_Xdoc.RemoveAll(); + m_Xdoc.RemoveAll(); - Node = m_Xdoc.CreateXmlDeclaration("1.0", "utf-8", String.Empty); - m_Xdoc.AppendChild(Node); + Node = m_Xdoc.CreateXmlDeclaration("1.0", "utf-8", String.Empty); + m_Xdoc.AppendChild(Node); - Node = m_Xdoc.CreateComment(String.Format(" Profile Configuration Data. {0} ", DateTime.Now)); - m_Xdoc.AppendChild(Node); + Node = m_Xdoc.CreateComment(String.Format(" Profile Configuration Data. {0} ", DateTime.Now)); + m_Xdoc.AppendChild(Node); - Node = m_Xdoc.CreateWhitespace("\r\n"); - m_Xdoc.AppendChild(Node); + Node = m_Xdoc.CreateWhitespace("\r\n"); + m_Xdoc.AppendChild(Node); - Node = m_Xdoc.CreateNode(XmlNodeType.Element, "Profile", null); + Node = m_Xdoc.CreateNode(XmlNodeType.Element, "Profile", null); - XmlNode xmlUseExclNode = m_Xdoc.CreateNode(XmlNodeType.Element, "useExclusiveMode", null); xmlUseExclNode.InnerText = useExclusiveMode.ToString(); Node.AppendChild(xmlUseExclNode); - XmlNode xmlStartMinimized = m_Xdoc.CreateNode(XmlNodeType.Element, "startMinimized", null); xmlStartMinimized.InnerText = startMinimized.ToString(); Node.AppendChild(xmlStartMinimized); - XmlNode xmlFormWidth = m_Xdoc.CreateNode(XmlNodeType.Element, "formWidth", null); xmlFormWidth.InnerText = formWidth.ToString(); Node.AppendChild(xmlFormWidth); - XmlNode xmlFormHeight = m_Xdoc.CreateNode(XmlNodeType.Element, "formHeight", null); xmlFormHeight.InnerText = formHeight.ToString(); Node.AppendChild(xmlFormHeight); - - XmlNode xmlController1 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller1", null); xmlController1.InnerText = profilePath[0]; Node.AppendChild(xmlController1); - XmlNode xmlController2 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller2", null); xmlController2.InnerText = profilePath[1]; Node.AppendChild(xmlController2); - XmlNode xmlController3 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller3", null); xmlController3.InnerText = profilePath[2]; Node.AppendChild(xmlController3); - XmlNode xmlController4 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller4", null); xmlController4.InnerText = profilePath[3]; Node.AppendChild(xmlController4); + XmlNode xmlUseExclNode = m_Xdoc.CreateNode(XmlNodeType.Element, "useExclusiveMode", null); xmlUseExclNode.InnerText = useExclusiveMode.ToString(); Node.AppendChild(xmlUseExclNode); + XmlNode xmlStartMinimized = m_Xdoc.CreateNode(XmlNodeType.Element, "startMinimized", null); xmlStartMinimized.InnerText = startMinimized.ToString(); Node.AppendChild(xmlStartMinimized); + XmlNode xmlFormWidth = m_Xdoc.CreateNode(XmlNodeType.Element, "formWidth", null); xmlFormWidth.InnerText = formWidth.ToString(); Node.AppendChild(xmlFormWidth); + XmlNode xmlFormHeight = m_Xdoc.CreateNode(XmlNodeType.Element, "formHeight", null); xmlFormHeight.InnerText = formHeight.ToString(); Node.AppendChild(xmlFormHeight); - XmlNode xmlVersion = m_Xdoc.CreateNode(XmlNodeType.Element, "DS4Version", null); xmlVersion.InnerText = version.ToString(); Node.AppendChild(xmlVersion); - XmlNode xmlLastChecked = m_Xdoc.CreateNode(XmlNodeType.Element, "LastChecked", null); xmlLastChecked.InnerText = lastChecked.ToString(); Node.AppendChild(xmlLastChecked); - XmlNode xmlCheckWhen = m_Xdoc.CreateNode(XmlNodeType.Element, "CheckWhen", null); xmlCheckWhen.InnerText = CheckWhen.ToString(); Node.AppendChild(xmlCheckWhen); - XmlNode xmlNotifications = m_Xdoc.CreateNode(XmlNodeType.Element, "Notifications", null); xmlNotifications.InnerText = notifications.ToString(); Node.AppendChild(xmlNotifications); - m_Xdoc.AppendChild(Node); + XmlNode xmlController1 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller1", null); xmlController1.InnerText = profilePath[0]; Node.AppendChild(xmlController1); + XmlNode xmlController2 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller2", null); xmlController2.InnerText = profilePath[1]; Node.AppendChild(xmlController2); + XmlNode xmlController3 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller3", null); xmlController3.InnerText = profilePath[2]; Node.AppendChild(xmlController3); + XmlNode xmlController4 = m_Xdoc.CreateNode(XmlNodeType.Element, "Controller4", null); xmlController4.InnerText = profilePath[3]; Node.AppendChild(xmlController4); - try { m_Xdoc.Save(m_Profile); } - catch (UnauthorizedAccessException) { Saved = false; } - } - //catch { Saved = false; } + XmlNode xmlVersion = m_Xdoc.CreateNode(XmlNodeType.Element, "DS4Version", null); xmlVersion.InnerText = version.ToString(); Node.AppendChild(xmlVersion); + XmlNode xmlLastChecked = m_Xdoc.CreateNode(XmlNodeType.Element, "LastChecked", null); xmlLastChecked.InnerText = lastChecked.ToString(); Node.AppendChild(xmlLastChecked); + XmlNode xmlCheckWhen = m_Xdoc.CreateNode(XmlNodeType.Element, "CheckWhen", null); xmlCheckWhen.InnerText = CheckWhen.ToString(); Node.AppendChild(xmlCheckWhen); + XmlNode xmlNotifications = m_Xdoc.CreateNode(XmlNodeType.Element, "Notifications", null); xmlNotifications.InnerText = notifications.ToString(); Node.AppendChild(xmlNotifications); + XmlNode xmlDisconnectBT = m_Xdoc.CreateNode(XmlNodeType.Element, "DisconnectBTAtStop", null); xmlDisconnectBT.InnerText = disconnectBTAtStop.ToString(); Node.AppendChild(xmlDisconnectBT); + XmlNode xmlSwipeProfiles = m_Xdoc.CreateNode(XmlNodeType.Element, "SwipeProfiles", null); xmlSwipeProfiles.InnerText = swipeProfiles.ToString(); Node.AppendChild(xmlSwipeProfiles); + m_Xdoc.AppendChild(Node); + try { m_Xdoc.Save(m_Profile); } + catch (UnauthorizedAccessException) { Saved = false; } return Saved; } } diff --git a/DS4Tool/DS4Tool.csproj b/DS4Tool/DS4Tool.csproj index ef6a8b3..8364665 100644 --- a/DS4Tool/DS4Tool.csproj +++ b/DS4Tool/DS4Tool.csproj @@ -12,6 +12,7 @@ v4.5 512 true + C:\Users\Jonathan\Dropbox\Public\DS4 Tool\ true Web @@ -31,7 +32,6 @@ false true true - AnyCPU @@ -133,11 +133,6 @@ RecordBox.cs - - True - True - Resource.es.resx - Form @@ -179,20 +174,20 @@ Options.cs - PublicResXFileCodeGenerator + ResXFileCodeGenerator Designer Resources1.Designer.cs RecordBox.cs - - ResXFileCodeGenerator - Resource.es.Designer.cs - + SaveWhere.cs + + ScpForm.cs + ScpForm.cs diff --git a/DS4Tool/Hotkeys.Designer.cs b/DS4Tool/Hotkeys.Designer.cs index efd895f..f522e8d 100644 --- a/DS4Tool/Hotkeys.Designer.cs +++ b/DS4Tool/Hotkeys.Designer.cs @@ -197,7 +197,7 @@ this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(313, 13); this.label29.TabIndex = 14; - this.label29.Text = "Keys are interperted differently. May be needed for certain games"; + this.label29.Text = "Keys are interpreted differently. May be needed for certain games"; // // label28 // @@ -360,9 +360,9 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(193, 127); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(231, 13); + this.label5.Size = new System.Drawing.Size(237, 13); this.label5.TabIndex = 4; - this.label5.Text = "Turn off touchpad movment (clicking still works)"; + this.label5.Text = "Turn off touchpad movement (clicking still works)"; // // label17 // @@ -483,7 +483,7 @@ this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(324, 26); this.label31.TabIndex = 14; - this.label31.Text = "Hides the DS4\'s regular input (Dinput) from other progrmas\r\ncheck if you are gett" + + this.label31.Text = "Hides the DS4\'s regular input (Dinput) from other programs\r\ncheck if you are gett" + "ing double input in games or R2 pauses games"; // // lLChangelog diff --git a/DS4Tool/KBM360.Designer.cs b/DS4Tool/KBM360.Designer.cs index 62b655e..9870305 100644 --- a/DS4Tool/KBM360.Designer.cs +++ b/DS4Tool/KBM360.Designer.cs @@ -2000,9 +2000,9 @@ this.lBMacroOn.AutoSize = true; this.lBMacroOn.Location = new System.Drawing.Point(10, 6); this.lBMacroOn.Name = "lBMacroOn"; - this.lBMacroOn.Size = new System.Drawing.Size(173, 13); + this.lBMacroOn.Size = new System.Drawing.Size(322, 13); this.lBMacroOn.TabIndex = 319; - this.lBMacroOn.Text = "Macro On, Choose a key to disable"; + this.lBMacroOn.Text = "Macro On, Choose a key to disable, else close this window to save"; this.lBMacroOn.Visible = false; // // btnMacro diff --git a/DS4Tool/Options.Designer.cs b/DS4Tool/Options.Designer.cs index d92ca50..8a44955 100644 --- a/DS4Tool/Options.Designer.cs +++ b/DS4Tool/Options.Designer.cs @@ -73,7 +73,7 @@ this.blueBar = new System.Windows.Forms.TrackBar(); this.greenBar = new System.Windows.Forms.TrackBar(); this.redBar = new System.Windows.Forms.TrackBar(); - this.batteryLed = new System.Windows.Forms.CheckBox(); + this.cBLightbyBattery = new System.Windows.Forms.CheckBox(); this.lBBlue = new System.Windows.Forms.Label(); this.lBGreen = new System.Windows.Forms.Label(); this.lBspc = new System.Windows.Forms.Label(); @@ -87,14 +87,14 @@ this.nUDTouch = new System.Windows.Forms.NumericUpDown(); this.lBButtonMouseSens = new System.Windows.Forms.Label(); this.cBlowerRCOn = new System.Windows.Forms.CheckBox(); - this.touchpadJitterCompensation = new System.Windows.Forms.CheckBox(); + this.cBTouchpadJitterCompensation = new System.Windows.Forms.CheckBox(); this.lBL2 = new System.Windows.Forms.Label(); this.lBR2 = new System.Windows.Forms.Label(); this.lBIdleMinutes = new System.Windows.Forms.Label(); this.nUDIdleDisconnect = new System.Windows.Forms.NumericUpDown(); this.nUDR2 = new System.Windows.Forms.NumericUpDown(); this.tBsixaxisAccelZ = new System.Windows.Forms.TrackBar(); - this.flushHIDQueue = new System.Windows.Forms.CheckBox(); + this.cBFlushHIDQueue = new System.Windows.Forms.CheckBox(); this.tBsixaxisAccelY = new System.Windows.Forms.TrackBar(); this.leftMotorLabel = new System.Windows.Forms.Label(); this.tBsixaxisAccelX = new System.Windows.Forms.TrackBar(); @@ -133,17 +133,14 @@ this.gBOther = new System.Windows.Forms.GroupBox(); this.nUDSixaxis = new System.Windows.Forms.NumericUpDown(); this.cBControllerInput = new System.Windows.Forms.CheckBox(); - this.nUDHideMouse = new System.Windows.Forms.NumericUpDown(); - this.cBHideCursor = new System.Windows.Forms.CheckBox(); this.cBIdleDisconnect = new System.Windows.Forms.CheckBox(); - this.lBMouseMins = new System.Windows.Forms.Label(); this.gBLightbar = new System.Windows.Forms.GroupBox(); this.btnChargingColor = new System.Windows.Forms.Button(); this.rBColor = new System.Windows.Forms.RadioButton(); this.rBFade = new System.Windows.Forms.RadioButton(); this.rBNormal = new System.Windows.Forms.RadioButton(); this.rBRainbow = new System.Windows.Forms.RadioButton(); - this.label2 = new System.Windows.Forms.Label(); + this.lbWhileCharging = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.lBFlashAt = new System.Windows.Forms.Label(); this.nUDflashLED = new System.Windows.Forms.NumericUpDown(); @@ -187,7 +184,6 @@ this.gBTouchpad.SuspendLayout(); this.gBOther.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nUDHideMouse)).BeginInit(); this.gBLightbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).BeginInit(); this.gBRumble.SuspendLayout(); @@ -1028,16 +1024,16 @@ this.redBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LightBar_MouseDown); this.redBar.MouseUp += new System.Windows.Forms.MouseEventHandler(this.Lightbar_MouseUp); // - // batteryLed + // cBLightbyBattery // - this.batteryLed.AutoSize = true; - this.batteryLed.Location = new System.Drawing.Point(316, 17); - this.batteryLed.Name = "batteryLed"; - this.batteryLed.Size = new System.Drawing.Size(111, 17); - this.batteryLed.TabIndex = 162; - this.batteryLed.Text = "Color by Battery %"; - this.batteryLed.UseVisualStyleBackColor = true; - this.batteryLed.CheckedChanged += new System.EventHandler(this.ledAsBatteryIndicator_CheckedChanged); + this.cBLightbyBattery.AutoSize = true; + this.cBLightbyBattery.Location = new System.Drawing.Point(316, 17); + this.cBLightbyBattery.Name = "cBLightbyBattery"; + this.cBLightbyBattery.Size = new System.Drawing.Size(111, 17); + this.cBLightbyBattery.TabIndex = 162; + this.cBLightbyBattery.Text = "Color by Battery %"; + this.cBLightbyBattery.UseVisualStyleBackColor = true; + this.cBLightbyBattery.CheckedChanged += new System.EventHandler(this.ledAsBatteryIndicator_CheckedChanged); // // lBBlue // @@ -1212,19 +1208,19 @@ this.cBlowerRCOn.UseVisualStyleBackColor = true; this.cBlowerRCOn.CheckedChanged += new System.EventHandler(this.lowerRCOffCheckBox_CheckedChanged); // - // touchpadJitterCompensation + // cBTouchpadJitterCompensation // - this.touchpadJitterCompensation.AutoSize = true; - this.touchpadJitterCompensation.Checked = true; - this.touchpadJitterCompensation.CheckState = System.Windows.Forms.CheckState.Checked; - this.touchpadJitterCompensation.Location = new System.Drawing.Point(42, 17); - this.touchpadJitterCompensation.Name = "touchpadJitterCompensation"; - this.touchpadJitterCompensation.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.touchpadJitterCompensation.Size = new System.Drawing.Size(118, 17); - this.touchpadJitterCompensation.TabIndex = 224; - this.touchpadJitterCompensation.Text = "Jitter Compensation"; - this.touchpadJitterCompensation.UseVisualStyleBackColor = true; - this.touchpadJitterCompensation.CheckedChanged += new System.EventHandler(this.touchpadJitterCompensation_CheckedChanged); + this.cBTouchpadJitterCompensation.AutoSize = true; + this.cBTouchpadJitterCompensation.Checked = true; + this.cBTouchpadJitterCompensation.CheckState = System.Windows.Forms.CheckState.Checked; + this.cBTouchpadJitterCompensation.Location = new System.Drawing.Point(42, 17); + this.cBTouchpadJitterCompensation.Name = "cBTouchpadJitterCompensation"; + this.cBTouchpadJitterCompensation.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cBTouchpadJitterCompensation.Size = new System.Drawing.Size(118, 17); + this.cBTouchpadJitterCompensation.TabIndex = 224; + this.cBTouchpadJitterCompensation.Text = "Jitter Compensation"; + this.cBTouchpadJitterCompensation.UseVisualStyleBackColor = true; + this.cBTouchpadJitterCompensation.CheckedChanged += new System.EventHandler(this.touchpadJitterCompensation_CheckedChanged); // // lBL2 // @@ -1299,18 +1295,18 @@ this.tBsixaxisAccelZ.TabIndex = 217; this.tBsixaxisAccelZ.TickFrequency = 16384; // - // flushHIDQueue + // cBFlushHIDQueue // - this.flushHIDQueue.AccessibleName = "flushHIDQueue"; - this.flushHIDQueue.AutoSize = true; - this.flushHIDQueue.Location = new System.Drawing.Point(306, 45); - this.flushHIDQueue.Name = "flushHIDQueue"; - this.flushHIDQueue.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.flushHIDQueue.Size = new System.Drawing.Size(73, 17); - this.flushHIDQueue.TabIndex = 198; - this.flushHIDQueue.Text = "Flush HID\r\n"; - this.flushHIDQueue.UseVisualStyleBackColor = true; - this.flushHIDQueue.CheckedChanged += new System.EventHandler(this.flushHIDQueue_CheckedChanged); + this.cBFlushHIDQueue.AccessibleName = "flushHIDQueue"; + this.cBFlushHIDQueue.AutoSize = true; + this.cBFlushHIDQueue.Location = new System.Drawing.Point(306, 48); + this.cBFlushHIDQueue.Name = "cBFlushHIDQueue"; + this.cBFlushHIDQueue.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.cBFlushHIDQueue.Size = new System.Drawing.Size(73, 17); + this.cBFlushHIDQueue.TabIndex = 198; + this.cBFlushHIDQueue.Text = "Flush HID\r\n"; + this.cBFlushHIDQueue.UseVisualStyleBackColor = true; + this.cBFlushHIDQueue.CheckedChanged += new System.EventHandler(this.flushHIDQueue_CheckedChanged); // // tBsixaxisAccelY // @@ -1745,7 +1741,7 @@ // // gBTouchpad // - this.gBTouchpad.Controls.Add(this.touchpadJitterCompensation); + this.gBTouchpad.Controls.Add(this.cBTouchpadJitterCompensation); this.gBTouchpad.Controls.Add(this.cBDoubleTap); this.gBTouchpad.Controls.Add(this.cBlowerRCOn); this.gBTouchpad.Controls.Add(this.cBSlide); @@ -1765,14 +1761,11 @@ // this.gBOther.Controls.Add(this.nUDSixaxis); this.gBOther.Controls.Add(this.cBControllerInput); - this.gBOther.Controls.Add(this.nUDHideMouse); this.gBOther.Controls.Add(this.nUDIdleDisconnect); - this.gBOther.Controls.Add(this.cBHideCursor); this.gBOther.Controls.Add(this.cBIdleDisconnect); this.gBOther.Controls.Add(this.lBButtonMouseSens); this.gBOther.Controls.Add(this.numUDMouseSens); - this.gBOther.Controls.Add(this.lBMouseMins); - this.gBOther.Controls.Add(this.flushHIDQueue); + this.gBOther.Controls.Add(this.cBFlushHIDQueue); this.gBOther.Controls.Add(this.lBIdleMinutes); this.gBOther.Location = new System.Drawing.Point(7, 220); this.gBOther.Name = "gBOther"; @@ -1816,34 +1809,6 @@ this.cBControllerInput.Text = "Use a DS4 to map"; this.cBControllerInput.UseVisualStyleBackColor = true; // - // nUDHideMouse - // - this.nUDHideMouse.DecimalPlaces = 1; - this.nUDHideMouse.Location = new System.Drawing.Point(182, 14); - this.nUDHideMouse.Maximum = new decimal(new int[] { - 60, - 0, - 0, - 0}); - this.nUDHideMouse.Name = "nUDHideMouse"; - this.nUDHideMouse.Size = new System.Drawing.Size(50, 20); - this.nUDHideMouse.TabIndex = 201; - this.nUDHideMouse.Visible = false; - // - // cBHideCursor - // - this.cBHideCursor.AutoSize = true; - this.cBHideCursor.Checked = true; - this.cBHideCursor.CheckState = System.Windows.Forms.CheckState.Checked; - this.cBHideCursor.Location = new System.Drawing.Point(167, 14); - this.cBHideCursor.Name = "cBHideCursor"; - this.cBHideCursor.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.cBHideCursor.Size = new System.Drawing.Size(105, 17); - this.cBHideCursor.TabIndex = 232; - this.cBHideCursor.Text = "Hide Cursor after"; - this.cBHideCursor.UseVisualStyleBackColor = true; - this.cBHideCursor.Visible = false; - // // cBIdleDisconnect // this.cBIdleDisconnect.AutoSize = true; @@ -1858,16 +1823,6 @@ this.cBIdleDisconnect.UseVisualStyleBackColor = true; this.cBIdleDisconnect.CheckedChanged += new System.EventHandler(this.cBIdleDisconnect_CheckedChanged); // - // lBMouseMins - // - this.lBMouseMins.AutoSize = true; - this.lBMouseMins.Location = new System.Drawing.Point(205, 21); - this.lBMouseMins.Name = "lBMouseMins"; - this.lBMouseMins.Size = new System.Drawing.Size(28, 13); - this.lBMouseMins.TabIndex = 200; - this.lBMouseMins.Text = "mins"; - this.lBMouseMins.Visible = false; - // // gBLightbar // this.gBLightbar.Controls.Add(this.btnChargingColor); @@ -1875,7 +1830,7 @@ this.gBLightbar.Controls.Add(this.rBFade); this.gBLightbar.Controls.Add(this.rBNormal); this.gBLightbar.Controls.Add(this.rBRainbow); - this.gBLightbar.Controls.Add(this.label2); + this.gBLightbar.Controls.Add(this.lbWhileCharging); this.gBLightbar.Controls.Add(this.label1); this.gBLightbar.Controls.Add(this.lBFlashAt); this.gBLightbar.Controls.Add(this.pBRainbow); @@ -1884,7 +1839,7 @@ this.gBLightbar.Controls.Add(this.nUDRainbow); this.gBLightbar.Controls.Add(this.FullPanel); this.gBLightbar.Controls.Add(this.lBspc); - this.gBLightbar.Controls.Add(this.batteryLed); + this.gBLightbar.Controls.Add(this.cBLightbyBattery); this.gBLightbar.Location = new System.Drawing.Point(440, 76); this.gBLightbar.Name = "gBLightbar"; this.gBLightbar.Size = new System.Drawing.Size(438, 129); @@ -1951,14 +1906,14 @@ this.rBRainbow.UseVisualStyleBackColor = true; this.rBRainbow.CheckedChanged += new System.EventHandler(this.rBRainbow_CheckedChanged); // - // label2 + // lbWhileCharging // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 108); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 13); - this.label2.TabIndex = 236; - this.label2.Text = "While Charging:"; + this.lbWhileCharging.AutoSize = true; + this.lbWhileCharging.Location = new System.Drawing.Point(9, 108); + this.lbWhileCharging.Name = "lbWhileCharging"; + this.lbWhileCharging.Size = new System.Drawing.Size(82, 13); + this.lbWhileCharging.TabIndex = 236; + this.lbWhileCharging.Text = "While Charging:"; // // label1 // @@ -2112,7 +2067,6 @@ this.gBOther.ResumeLayout(false); this.gBOther.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDSixaxis)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nUDHideMouse)).EndInit(); this.gBLightbar.ResumeLayout(false); this.gBLightbar.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDflashLED)).EndInit(); @@ -2174,7 +2128,7 @@ private System.Windows.Forms.TrackBar blueBar; private System.Windows.Forms.TrackBar greenBar; private System.Windows.Forms.TrackBar redBar; - private System.Windows.Forms.CheckBox batteryLed; + private System.Windows.Forms.CheckBox cBLightbyBattery; private System.Windows.Forms.Label lBBlue; private System.Windows.Forms.Label lBGreen; private System.Windows.Forms.Label lBspc; @@ -2188,14 +2142,14 @@ private System.Windows.Forms.NumericUpDown nUDTouch; private System.Windows.Forms.Label lBButtonMouseSens; private System.Windows.Forms.CheckBox cBlowerRCOn; - private System.Windows.Forms.CheckBox touchpadJitterCompensation; + private System.Windows.Forms.CheckBox cBTouchpadJitterCompensation; private System.Windows.Forms.Label lBL2; private System.Windows.Forms.Label lBR2; private System.Windows.Forms.Label lBIdleMinutes; private System.Windows.Forms.NumericUpDown nUDIdleDisconnect; private System.Windows.Forms.NumericUpDown nUDR2; private System.Windows.Forms.TrackBar tBsixaxisAccelZ; - private System.Windows.Forms.CheckBox flushHIDQueue; + private System.Windows.Forms.CheckBox cBFlushHIDQueue; private System.Windows.Forms.TrackBar tBsixaxisAccelY; private System.Windows.Forms.Label leftMotorLabel; private System.Windows.Forms.TrackBar tBsixaxisAccelX; @@ -2245,13 +2199,10 @@ private System.Windows.Forms.RadioButton rBFade; private System.Windows.Forms.RadioButton rBNormal; private System.Windows.Forms.RadioButton rBRainbow; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label lbWhileCharging; private System.Windows.Forms.Button btnChargingColor; private System.Windows.Forms.RadioButton rBColor; private System.Windows.Forms.CheckBox cBIdleDisconnect; - private System.Windows.Forms.NumericUpDown nUDHideMouse; - private System.Windows.Forms.CheckBox cBHideCursor; - private System.Windows.Forms.Label lBMouseMins; } }  \ No newline at end of file diff --git a/DS4Tool/Options.cs b/DS4Tool/Options.cs index 100179c..06bf1ae 100644 --- a/DS4Tool/Options.cs +++ b/DS4Tool/Options.cs @@ -14,7 +14,7 @@ namespace ScpServer public int device; public string filename; Byte[] oldLedColor, oldLowLedColor, oldChargingColor; - Timer inputtimer = new Timer(), sixaxisTimer = new Timer(); + public Timer inputtimer = new Timer(), sixaxisTimer = new Timer(); public List