diff --git a/ControllerCommon/Profile.cs b/ControllerCommon/Profile.cs index 3a1f1c504..a6e28a1d2 100644 --- a/ControllerCommon/Profile.cs +++ b/ControllerCommon/Profile.cs @@ -20,15 +20,6 @@ public enum InputStyle Mouse = 3 } - public enum HapticIntensity - { - Low = 0, - Medium = 1, - High = 2, - Extreme = 3, - Insane = 4 // are you crazy !? - } - public class ProfileButton : DualShock4Button { public ProfileButton(int id, string name, ushort value) : base(id, name, value) @@ -55,13 +46,15 @@ public class Profile public bool umc_enabled { get; set; } = false; public InputStyle umc_input { get; set; } = InputStyle.None; - public float umc_sensivity { get; set; } = 500.0f; - public HapticIntensity umc_intensity { get; set; } = HapticIntensity.Low; + public float umc_sensivity { get; set; } = 2.0f; + public float umc_intensity { get; set; } = 1.0f; + public int umc_trigger { get; set; } = 0; [JsonIgnore] public ProfileErrorCode error; [JsonIgnore] public string fullpath { get; set; } + [JsonIgnore] public bool IsDefault { get; set; } = false; public Profile() { @@ -74,22 +67,14 @@ public Profile(string name, string path) this.fullpath = path; } + public float GetSensiviy() + { + return umc_sensivity * 500.0f; + } + public float GetIntensity() { - switch (umc_intensity) - { - default: - case HapticIntensity.Low: - return 1.0f; - case HapticIntensity.Medium: - return 0.8f; - case HapticIntensity.High: - return 0.6f; - case HapticIntensity.Extreme: - return 0.4f; - case HapticIntensity.Insane: - return 0.2f; - } + return 1.0f - (umc_intensity / 20.0f) + 0.1f; } public override string ToString() diff --git a/ControllerCommon/Utils.cs b/ControllerCommon/Utils.cs index 1ec5163a4..edc20af70 100644 --- a/ControllerCommon/Utils.cs +++ b/ControllerCommon/Utils.cs @@ -61,7 +61,7 @@ public static byte NormalizeInput(short input) public static short ComputeInput(short value, float input, float sensivity, float curve) { - float compute = (float)(Math.Sign(input) * Math.Pow(Math.Abs(input) / 25.0f, curve) * 25.0f); + float compute = (float)(Math.Sign(input) * Math.Pow(Math.Abs(input) / 20.0f, curve) * 20.0f); return (short)Math.Max(-32767, Math.Min(32767, value + compute * sensivity)); } diff --git a/ControllerHelper/ControllerHelper.Designer.cs b/ControllerHelper/ControllerHelper.Designer.cs index 67ba35151..c851b551a 100644 --- a/ControllerHelper/ControllerHelper.Designer.cs +++ b/ControllerHelper/ControllerHelper.Designer.cs @@ -92,9 +92,9 @@ private void InitializeComponent() this.b_CreateProfile = new System.Windows.Forms.Button(); this.lB_Profiles = new System.Windows.Forms.ListBox(); this.gB_ProfileGyro = new System.Windows.Forms.GroupBox(); + this.tB_UMCIntensity = new System.Windows.Forms.TrackBar(); this.cB_UMCInputButton = new System.Windows.Forms.ListBox(); this.lb_UMCInputButton = new System.Windows.Forms.Label(); - this.cB_UMCIntensity = new System.Windows.Forms.ComboBox(); this.lb_UMCIntensity = new System.Windows.Forms.Label(); this.tB_UMCSensivity = new System.Windows.Forms.TrackBar(); this.lb_UMCSensivity = new System.Windows.Forms.Label(); @@ -138,6 +138,7 @@ private void InitializeComponent() this.gB_ProfileDetails.SuspendLayout(); this.gB_Profiles.SuspendLayout(); this.gB_ProfileGyro.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tB_UMCIntensity)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tB_UMCSensivity)).BeginInit(); this.tabSettings.SuspendLayout(); this.gb_SettingsUDP.SuspendLayout(); @@ -148,64 +149,59 @@ private void InitializeComponent() // // notifyIcon1 // - resources.ApplyResources(this.notifyIcon1, "notifyIcon1"); this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1; + resources.ApplyResources(this.notifyIcon1, "notifyIcon1"); this.notifyIcon1.DoubleClick += new System.EventHandler(this.notifyIcon1_DoubleClick); // // contextMenuStrip1 // - resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.quitToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.toolTip1.SetToolTip(this.contextMenuStrip1, resources.GetString("contextMenuStrip1.ToolTip")); + resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); // // quitToolStripMenuItem // - resources.ApplyResources(this.quitToolStripMenuItem, "quitToolStripMenuItem"); this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; + resources.ApplyResources(this.quitToolStripMenuItem, "quitToolStripMenuItem"); this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); // // tabControl1 // - resources.ApplyResources(this.tabControl1, "tabControl1"); this.tabControl1.Controls.Add(this.tabDevices); this.tabControl1.Controls.Add(this.tabProfiles); this.tabControl1.Controls.Add(this.tabSettings); + resources.ApplyResources(this.tabControl1, "tabControl1"); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.toolTip1.SetToolTip(this.tabControl1, resources.GetString("tabControl1.ToolTip")); // // tabDevices // - resources.ApplyResources(this.tabDevices, "tabDevices"); this.tabDevices.Controls.Add(this.gB_DeviceDetails); this.tabDevices.Controls.Add(this.gB_HIDDetails); this.tabDevices.Controls.Add(this.gB_XinputDetails); this.tabDevices.Controls.Add(this.gB_XinputDevices); + resources.ApplyResources(this.tabDevices, "tabDevices"); this.tabDevices.Name = "tabDevices"; - this.toolTip1.SetToolTip(this.tabDevices, resources.GetString("tabDevices.ToolTip")); this.tabDevices.UseVisualStyleBackColor = true; // // gB_DeviceDetails // - resources.ApplyResources(this.gB_DeviceDetails, "gB_DeviceDetails"); this.gB_DeviceDetails.Controls.Add(this.cB_touchpad); this.gB_DeviceDetails.Controls.Add(this.lb_touchpad); this.gB_DeviceDetails.Controls.Add(this.lb_gyro); this.gB_DeviceDetails.Controls.Add(this.cB_accelero); this.gB_DeviceDetails.Controls.Add(this.cB_gyro); this.gB_DeviceDetails.Controls.Add(this.lb_accelero); + resources.ApplyResources(this.gB_DeviceDetails, "gB_DeviceDetails"); this.gB_DeviceDetails.Name = "gB_DeviceDetails"; this.gB_DeviceDetails.TabStop = false; - this.toolTip1.SetToolTip(this.gB_DeviceDetails, resources.GetString("gB_DeviceDetails.ToolTip")); // // cB_touchpad // resources.ApplyResources(this.cB_touchpad, "cB_touchpad"); this.cB_touchpad.Name = "cB_touchpad"; - this.toolTip1.SetToolTip(this.cB_touchpad, resources.GetString("cB_touchpad.ToolTip")); this.cB_touchpad.UseVisualStyleBackColor = true; this.cB_touchpad.CheckedChanged += new System.EventHandler(this.cB_touchpad_CheckedChanged); // @@ -213,46 +209,40 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_touchpad, "lb_touchpad"); this.lb_touchpad.Name = "lb_touchpad"; - this.toolTip1.SetToolTip(this.lb_touchpad, resources.GetString("lb_touchpad.ToolTip")); // // lb_gyro // resources.ApplyResources(this.lb_gyro, "lb_gyro"); this.lb_gyro.Name = "lb_gyro"; - this.toolTip1.SetToolTip(this.lb_gyro, resources.GetString("lb_gyro.ToolTip")); // // cB_accelero // resources.ApplyResources(this.cB_accelero, "cB_accelero"); this.cB_accelero.Name = "cB_accelero"; - this.toolTip1.SetToolTip(this.cB_accelero, resources.GetString("cB_accelero.ToolTip")); this.cB_accelero.UseVisualStyleBackColor = true; // // cB_gyro // resources.ApplyResources(this.cB_gyro, "cB_gyro"); this.cB_gyro.Name = "cB_gyro"; - this.toolTip1.SetToolTip(this.cB_gyro, resources.GetString("cB_gyro.ToolTip")); this.cB_gyro.UseVisualStyleBackColor = true; // // lb_accelero // resources.ApplyResources(this.lb_accelero, "lb_accelero"); this.lb_accelero.Name = "lb_accelero"; - this.toolTip1.SetToolTip(this.lb_accelero, resources.GetString("lb_accelero.ToolTip")); // // gB_HIDDetails // - resources.ApplyResources(this.gB_HIDDetails, "gB_HIDDetails"); this.gB_HIDDetails.Controls.Add(this.tB_VibrationStr); this.gB_HIDDetails.Controls.Add(this.lb_VibrationStr); this.gB_HIDDetails.Controls.Add(this.tB_PullRate); this.gB_HIDDetails.Controls.Add(this.lb_PullRate); this.gB_HIDDetails.Controls.Add(this.lb_HidMode); this.gB_HIDDetails.Controls.Add(this.cB_HidMode); + resources.ApplyResources(this.gB_HIDDetails, "gB_HIDDetails"); this.gB_HIDDetails.Name = "gB_HIDDetails"; this.gB_HIDDetails.TabStop = false; - this.toolTip1.SetToolTip(this.gB_HIDDetails, resources.GetString("gB_HIDDetails.ToolTip")); // // tB_VibrationStr // @@ -263,7 +253,6 @@ private void InitializeComponent() this.tB_VibrationStr.Name = "tB_VibrationStr"; this.tB_VibrationStr.SmallChange = 2; this.tB_VibrationStr.TickFrequency = 10; - this.toolTip1.SetToolTip(this.tB_VibrationStr, resources.GetString("tB_VibrationStr.ToolTip")); this.tB_VibrationStr.Value = 50; this.tB_VibrationStr.ValueChanged += new System.EventHandler(this.tB_VibrationStr_Scroll); // @@ -271,7 +260,6 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_VibrationStr, "lb_VibrationStr"); this.lb_VibrationStr.Name = "lb_VibrationStr"; - this.toolTip1.SetToolTip(this.lb_VibrationStr, resources.GetString("lb_VibrationStr.ToolTip")); // // tB_PullRate // @@ -282,7 +270,6 @@ private void InitializeComponent() this.tB_PullRate.Name = "tB_PullRate"; this.tB_PullRate.SmallChange = 5; this.tB_PullRate.TickFrequency = 5; - this.toolTip1.SetToolTip(this.tB_PullRate, resources.GetString("tB_PullRate.ToolTip")); this.tB_PullRate.Value = 10; this.tB_PullRate.ValueChanged += new System.EventHandler(this.tB_PullRate_Scroll); // @@ -290,25 +277,21 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_PullRate, "lb_PullRate"); this.lb_PullRate.Name = "lb_PullRate"; - this.toolTip1.SetToolTip(this.lb_PullRate, resources.GetString("lb_PullRate.ToolTip")); // // lb_HidMode // resources.ApplyResources(this.lb_HidMode, "lb_HidMode"); this.lb_HidMode.Name = "lb_HidMode"; - this.toolTip1.SetToolTip(this.lb_HidMode, resources.GetString("lb_HidMode.ToolTip")); // // cB_HidMode // - resources.ApplyResources(this.cB_HidMode, "cB_HidMode"); this.cB_HidMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.cB_HidMode, "cB_HidMode"); this.cB_HidMode.FormattingEnabled = true; this.cB_HidMode.Name = "cB_HidMode"; - this.toolTip1.SetToolTip(this.cB_HidMode, resources.GetString("cB_HidMode.ToolTip")); // // gB_XinputDetails // - resources.ApplyResources(this.gB_XinputDetails, "gB_XinputDetails"); this.gB_XinputDetails.Controls.Add(this.cB_HIDcloak); this.gB_XinputDetails.Controls.Add(this.tB_ProductID); this.gB_XinputDetails.Controls.Add(this.lb_ProductID); @@ -316,15 +299,14 @@ private void InitializeComponent() this.gB_XinputDetails.Controls.Add(this.lb_HidCloak); this.gB_XinputDetails.Controls.Add(this.tB_InstanceID); this.gB_XinputDetails.Controls.Add(this.lb_InstanceID); + resources.ApplyResources(this.gB_XinputDetails, "gB_XinputDetails"); this.gB_XinputDetails.Name = "gB_XinputDetails"; this.gB_XinputDetails.TabStop = false; - this.toolTip1.SetToolTip(this.gB_XinputDetails, resources.GetString("gB_XinputDetails.ToolTip")); // // cB_HIDcloak // resources.ApplyResources(this.cB_HIDcloak, "cB_HIDcloak"); this.cB_HIDcloak.Name = "cB_HIDcloak"; - this.toolTip1.SetToolTip(this.cB_HIDcloak, resources.GetString("cB_HIDcloak.ToolTip")); this.cB_HIDcloak.UseVisualStyleBackColor = true; this.cB_HIDcloak.CheckedChanged += new System.EventHandler(this.cB_HIDcloak_CheckedChanged); // @@ -333,19 +315,16 @@ private void InitializeComponent() resources.ApplyResources(this.tB_ProductID, "tB_ProductID"); this.tB_ProductID.Name = "tB_ProductID"; this.tB_ProductID.ReadOnly = true; - this.toolTip1.SetToolTip(this.tB_ProductID, resources.GetString("tB_ProductID.ToolTip")); // // lb_ProductID // resources.ApplyResources(this.lb_ProductID, "lb_ProductID"); this.lb_ProductID.Name = "lb_ProductID"; - this.toolTip1.SetToolTip(this.lb_ProductID, resources.GetString("lb_ProductID.ToolTip")); // // cB_uncloak // resources.ApplyResources(this.cB_uncloak, "cB_uncloak"); this.cB_uncloak.Name = "cB_uncloak"; - this.toolTip1.SetToolTip(this.cB_uncloak, resources.GetString("cB_uncloak.ToolTip")); this.cB_uncloak.UseVisualStyleBackColor = true; this.cB_uncloak.CheckedChanged += new System.EventHandler(this.cB_uncloak_CheckedChanged); // @@ -353,67 +332,59 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_HidCloak, "lb_HidCloak"); this.lb_HidCloak.Name = "lb_HidCloak"; - this.toolTip1.SetToolTip(this.lb_HidCloak, resources.GetString("lb_HidCloak.ToolTip")); // // tB_InstanceID // resources.ApplyResources(this.tB_InstanceID, "tB_InstanceID"); this.tB_InstanceID.Name = "tB_InstanceID"; this.tB_InstanceID.ReadOnly = true; - this.toolTip1.SetToolTip(this.tB_InstanceID, resources.GetString("tB_InstanceID.ToolTip")); // // lb_InstanceID // resources.ApplyResources(this.lb_InstanceID, "lb_InstanceID"); this.lb_InstanceID.Name = "lb_InstanceID"; - this.toolTip1.SetToolTip(this.lb_InstanceID, resources.GetString("lb_InstanceID.ToolTip")); // // gB_XinputDevices // - resources.ApplyResources(this.gB_XinputDevices, "gB_XinputDevices"); this.gB_XinputDevices.Controls.Add(this.lB_Devices); + resources.ApplyResources(this.gB_XinputDevices, "gB_XinputDevices"); this.gB_XinputDevices.Name = "gB_XinputDevices"; this.gB_XinputDevices.TabStop = false; - this.toolTip1.SetToolTip(this.gB_XinputDevices, resources.GetString("gB_XinputDevices.ToolTip")); // // lB_Devices // resources.ApplyResources(this.lB_Devices, "lB_Devices"); this.lB_Devices.FormattingEnabled = true; this.lB_Devices.Name = "lB_Devices"; - this.toolTip1.SetToolTip(this.lB_Devices, resources.GetString("lB_Devices.ToolTip")); this.lB_Devices.SelectedIndexChanged += new System.EventHandler(this.lB_Devices_SelectedIndexChanged); // // tabProfiles // - resources.ApplyResources(this.tabProfiles, "tabProfiles"); this.tabProfiles.Controls.Add(this.gB_ProfileOptions); this.tabProfiles.Controls.Add(this.gB_6axis); this.tabProfiles.Controls.Add(this.gB_ProfileDetails); this.tabProfiles.Controls.Add(this.gB_Profiles); this.tabProfiles.Controls.Add(this.gB_ProfileGyro); + resources.ApplyResources(this.tabProfiles, "tabProfiles"); this.tabProfiles.Name = "tabProfiles"; - this.toolTip1.SetToolTip(this.tabProfiles, resources.GetString("tabProfiles.ToolTip")); this.tabProfiles.UseVisualStyleBackColor = true; // // gB_ProfileOptions // - resources.ApplyResources(this.gB_ProfileOptions, "gB_ProfileOptions"); this.gB_ProfileOptions.Controls.Add(this.cB_UniversalMC); this.gB_ProfileOptions.Controls.Add(this.lb_Wrapper); this.gB_ProfileOptions.Controls.Add(this.lb_UniversalMC); this.gB_ProfileOptions.Controls.Add(this.lb_Whitelist); this.gB_ProfileOptions.Controls.Add(this.cB_Wrapper); this.gB_ProfileOptions.Controls.Add(this.cB_Whitelist); + resources.ApplyResources(this.gB_ProfileOptions, "gB_ProfileOptions"); this.gB_ProfileOptions.Name = "gB_ProfileOptions"; this.gB_ProfileOptions.TabStop = false; - this.toolTip1.SetToolTip(this.gB_ProfileOptions, resources.GetString("gB_ProfileOptions.ToolTip")); // // cB_UniversalMC // resources.ApplyResources(this.cB_UniversalMC, "cB_UniversalMC"); this.cB_UniversalMC.Name = "cB_UniversalMC"; - this.toolTip1.SetToolTip(this.cB_UniversalMC, resources.GetString("cB_UniversalMC.ToolTip")); this.cB_UniversalMC.UseVisualStyleBackColor = true; this.cB_UniversalMC.CheckedChanged += new System.EventHandler(this.cB_UniversalMC_CheckedChanged); // @@ -421,38 +392,32 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_Wrapper, "lb_Wrapper"); this.lb_Wrapper.Name = "lb_Wrapper"; - this.toolTip1.SetToolTip(this.lb_Wrapper, resources.GetString("lb_Wrapper.ToolTip")); // // lb_UniversalMC // resources.ApplyResources(this.lb_UniversalMC, "lb_UniversalMC"); this.lb_UniversalMC.Name = "lb_UniversalMC"; - this.toolTip1.SetToolTip(this.lb_UniversalMC, resources.GetString("lb_UniversalMC.ToolTip")); // // lb_Whitelist // resources.ApplyResources(this.lb_Whitelist, "lb_Whitelist"); this.lb_Whitelist.Name = "lb_Whitelist"; - this.toolTip1.SetToolTip(this.lb_Whitelist, resources.GetString("lb_Whitelist.ToolTip")); // // cB_Wrapper // resources.ApplyResources(this.cB_Wrapper, "cB_Wrapper"); this.cB_Wrapper.Name = "cB_Wrapper"; - this.toolTip1.SetToolTip(this.cB_Wrapper, resources.GetString("cB_Wrapper.ToolTip")); this.cB_Wrapper.UseVisualStyleBackColor = true; // // cB_Whitelist // resources.ApplyResources(this.cB_Whitelist, "cB_Whitelist"); this.cB_Whitelist.Name = "cB_Whitelist"; - this.toolTip1.SetToolTip(this.cB_Whitelist, resources.GetString("cB_Whitelist.ToolTip")); this.cB_Whitelist.UseVisualStyleBackColor = true; this.cB_Whitelist.CheckedChanged += new System.EventHandler(this.cB_Whitelist_CheckedChanged); // // gB_6axis // - resources.ApplyResources(this.gB_6axis, "gB_6axis"); this.gB_6axis.Controls.Add(this.cB_InvertVAxis); this.gB_6axis.Controls.Add(this.cB_InvertHAxis); this.gB_6axis.Controls.Add(this.lB_InvertVAxis); @@ -463,9 +428,9 @@ private void InitializeComponent() this.gB_6axis.Controls.Add(this.lb_ProfileGyro); this.gB_6axis.Controls.Add(this.lb_ProfileAccelero); this.gB_6axis.Controls.Add(this.tb_ProfileGyroValue); + resources.ApplyResources(this.gB_6axis, "gB_6axis"); this.gB_6axis.Name = "gB_6axis"; this.gB_6axis.TabStop = false; - this.toolTip1.SetToolTip(this.gB_6axis, resources.GetString("gB_6axis.ToolTip")); // // cB_InvertVAxis // @@ -485,30 +450,26 @@ private void InitializeComponent() // resources.ApplyResources(this.lB_InvertVAxis, "lB_InvertVAxis"); this.lB_InvertVAxis.Name = "lB_InvertVAxis"; - this.toolTip1.SetToolTip(this.lB_InvertVAxis, resources.GetString("lB_InvertVAxis.ToolTip")); // // lB_InvertHAxis // resources.ApplyResources(this.lB_InvertHAxis, "lB_InvertHAxis"); this.lB_InvertHAxis.Name = "lB_InvertHAxis"; - this.toolTip1.SetToolTip(this.lB_InvertHAxis, resources.GetString("lB_InvertHAxis.ToolTip")); // // lB_GyroSteering // resources.ApplyResources(this.lB_GyroSteering, "lB_GyroSteering"); this.lB_GyroSteering.Name = "lB_GyroSteering"; - this.toolTip1.SetToolTip(this.lB_GyroSteering, resources.GetString("lB_GyroSteering.ToolTip")); // // cB_GyroSteering // - resources.ApplyResources(this.cB_GyroSteering, "cB_GyroSteering"); this.cB_GyroSteering.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.cB_GyroSteering, "cB_GyroSteering"); this.cB_GyroSteering.FormattingEnabled = true; this.cB_GyroSteering.Items.AddRange(new object[] { resources.GetString("cB_GyroSteering.Items"), resources.GetString("cB_GyroSteering.Items1")}); this.cB_GyroSteering.Name = "cB_GyroSteering"; - this.toolTip1.SetToolTip(this.cB_GyroSteering, resources.GetString("cB_GyroSteering.ToolTip")); // // tb_ProfileAcceleroValue // @@ -519,7 +480,6 @@ private void InitializeComponent() this.tb_ProfileAcceleroValue.Minimum = 1; this.tb_ProfileAcceleroValue.Name = "tb_ProfileAcceleroValue"; this.tb_ProfileAcceleroValue.TickFrequency = 2; - this.toolTip1.SetToolTip(this.tb_ProfileAcceleroValue, resources.GetString("tb_ProfileAcceleroValue.ToolTip")); this.tb_ProfileAcceleroValue.Value = 10; this.tb_ProfileAcceleroValue.ValueChanged += new System.EventHandler(this.tb_ProfileAcceleroValue_Scroll); // @@ -527,13 +487,11 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_ProfileGyro, "lb_ProfileGyro"); this.lb_ProfileGyro.Name = "lb_ProfileGyro"; - this.toolTip1.SetToolTip(this.lb_ProfileGyro, resources.GetString("lb_ProfileGyro.ToolTip")); // // lb_ProfileAccelero // resources.ApplyResources(this.lb_ProfileAccelero, "lb_ProfileAccelero"); this.lb_ProfileAccelero.Name = "lb_ProfileAccelero"; - this.toolTip1.SetToolTip(this.lb_ProfileAccelero, resources.GetString("lb_ProfileAccelero.ToolTip")); // // tb_ProfileGyroValue // @@ -544,28 +502,25 @@ private void InitializeComponent() this.tb_ProfileGyroValue.Minimum = 1; this.tb_ProfileGyroValue.Name = "tb_ProfileGyroValue"; this.tb_ProfileGyroValue.TickFrequency = 2; - this.toolTip1.SetToolTip(this.tb_ProfileGyroValue, resources.GetString("tb_ProfileGyroValue.ToolTip")); this.tb_ProfileGyroValue.Value = 10; this.tb_ProfileGyroValue.ValueChanged += new System.EventHandler(this.tb_ProfileGyroValue_Scroll); // // gB_ProfileDetails // - resources.ApplyResources(this.gB_ProfileDetails, "gB_ProfileDetails"); this.gB_ProfileDetails.Controls.Add(this.b_ApplyProfile); this.gB_ProfileDetails.Controls.Add(this.b_DeleteProfile); this.gB_ProfileDetails.Controls.Add(this.tB_ProfilePath); this.gB_ProfileDetails.Controls.Add(this.lb_ProfilePath); this.gB_ProfileDetails.Controls.Add(this.tB_ProfileName); this.gB_ProfileDetails.Controls.Add(this.lb_ProfileName); + resources.ApplyResources(this.gB_ProfileDetails, "gB_ProfileDetails"); this.gB_ProfileDetails.Name = "gB_ProfileDetails"; this.gB_ProfileDetails.TabStop = false; - this.toolTip1.SetToolTip(this.gB_ProfileDetails, resources.GetString("gB_ProfileDetails.ToolTip")); // // b_ApplyProfile // resources.ApplyResources(this.b_ApplyProfile, "b_ApplyProfile"); this.b_ApplyProfile.Name = "b_ApplyProfile"; - this.toolTip1.SetToolTip(this.b_ApplyProfile, resources.GetString("b_ApplyProfile.ToolTip")); this.b_ApplyProfile.UseVisualStyleBackColor = true; this.b_ApplyProfile.Click += new System.EventHandler(this.b_ApplyProfile_Click); // @@ -573,7 +528,6 @@ private void InitializeComponent() // resources.ApplyResources(this.b_DeleteProfile, "b_DeleteProfile"); this.b_DeleteProfile.Name = "b_DeleteProfile"; - this.toolTip1.SetToolTip(this.b_DeleteProfile, resources.GetString("b_DeleteProfile.ToolTip")); this.b_DeleteProfile.UseVisualStyleBackColor = true; this.b_DeleteProfile.Click += new System.EventHandler(this.b_DeleteProfile_Click); // @@ -582,41 +536,35 @@ private void InitializeComponent() resources.ApplyResources(this.tB_ProfilePath, "tB_ProfilePath"); this.tB_ProfilePath.Name = "tB_ProfilePath"; this.tB_ProfilePath.ReadOnly = true; - this.toolTip1.SetToolTip(this.tB_ProfilePath, resources.GetString("tB_ProfilePath.ToolTip")); // // lb_ProfilePath // resources.ApplyResources(this.lb_ProfilePath, "lb_ProfilePath"); this.lb_ProfilePath.Name = "lb_ProfilePath"; - this.toolTip1.SetToolTip(this.lb_ProfilePath, resources.GetString("lb_ProfilePath.ToolTip")); // // tB_ProfileName // resources.ApplyResources(this.tB_ProfileName, "tB_ProfileName"); this.tB_ProfileName.Name = "tB_ProfileName"; this.tB_ProfileName.ReadOnly = true; - this.toolTip1.SetToolTip(this.tB_ProfileName, resources.GetString("tB_ProfileName.ToolTip")); // // lb_ProfileName // resources.ApplyResources(this.lb_ProfileName, "lb_ProfileName"); this.lb_ProfileName.Name = "lb_ProfileName"; - this.toolTip1.SetToolTip(this.lb_ProfileName, resources.GetString("lb_ProfileName.ToolTip")); // // gB_Profiles // - resources.ApplyResources(this.gB_Profiles, "gB_Profiles"); this.gB_Profiles.Controls.Add(this.b_CreateProfile); this.gB_Profiles.Controls.Add(this.lB_Profiles); + resources.ApplyResources(this.gB_Profiles, "gB_Profiles"); this.gB_Profiles.Name = "gB_Profiles"; this.gB_Profiles.TabStop = false; - this.toolTip1.SetToolTip(this.gB_Profiles, resources.GetString("gB_Profiles.ToolTip")); // // b_CreateProfile // resources.ApplyResources(this.b_CreateProfile, "b_CreateProfile"); this.b_CreateProfile.Name = "b_CreateProfile"; - this.toolTip1.SetToolTip(this.b_CreateProfile, resources.GetString("b_CreateProfile.ToolTip")); this.b_CreateProfile.UseVisualStyleBackColor = true; this.b_CreateProfile.Click += new System.EventHandler(this.b_CreateProfile_Click); // @@ -625,87 +573,73 @@ private void InitializeComponent() resources.ApplyResources(this.lB_Profiles, "lB_Profiles"); this.lB_Profiles.FormattingEnabled = true; this.lB_Profiles.Name = "lB_Profiles"; - this.toolTip1.SetToolTip(this.lB_Profiles, resources.GetString("lB_Profiles.ToolTip")); this.lB_Profiles.SelectedIndexChanged += new System.EventHandler(this.lB_Profiles_SelectedIndexChanged); // // gB_ProfileGyro // - resources.ApplyResources(this.gB_ProfileGyro, "gB_ProfileGyro"); + this.gB_ProfileGyro.Controls.Add(this.tB_UMCIntensity); this.gB_ProfileGyro.Controls.Add(this.cB_UMCInputButton); this.gB_ProfileGyro.Controls.Add(this.lb_UMCInputButton); - this.gB_ProfileGyro.Controls.Add(this.cB_UMCIntensity); this.gB_ProfileGyro.Controls.Add(this.lb_UMCIntensity); this.gB_ProfileGyro.Controls.Add(this.tB_UMCSensivity); this.gB_ProfileGyro.Controls.Add(this.lb_UMCSensivity); this.gB_ProfileGyro.Controls.Add(this.lb_UMCInputStyle); this.gB_ProfileGyro.Controls.Add(this.cB_UMCInputStyle); + resources.ApplyResources(this.gB_ProfileGyro, "gB_ProfileGyro"); this.gB_ProfileGyro.Name = "gB_ProfileGyro"; this.gB_ProfileGyro.TabStop = false; - this.toolTip1.SetToolTip(this.gB_ProfileGyro, resources.GetString("gB_ProfileGyro.ToolTip")); + // + // tB_UMCIntensity + // + this.tB_UMCIntensity.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.tB_UMCIntensity.LargeChange = 2; + resources.ApplyResources(this.tB_UMCIntensity, "tB_UMCIntensity"); + this.tB_UMCIntensity.Maximum = 20; + this.tB_UMCIntensity.Minimum = 1; + this.tB_UMCIntensity.Name = "tB_UMCIntensity"; + this.tB_UMCIntensity.Value = 1; + this.tB_UMCIntensity.Scroll += new System.EventHandler(this.tB_UMCIntensity_Scroll); // // cB_UMCInputButton // - resources.ApplyResources(this.cB_UMCInputButton, "cB_UMCInputButton"); this.cB_UMCInputButton.FormattingEnabled = true; + resources.ApplyResources(this.cB_UMCInputButton, "cB_UMCInputButton"); this.cB_UMCInputButton.Name = "cB_UMCInputButton"; this.cB_UMCInputButton.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.toolTip1.SetToolTip(this.cB_UMCInputButton, resources.GetString("cB_UMCInputButton.ToolTip")); // // lb_UMCInputButton // resources.ApplyResources(this.lb_UMCInputButton, "lb_UMCInputButton"); this.lb_UMCInputButton.Name = "lb_UMCInputButton"; - this.toolTip1.SetToolTip(this.lb_UMCInputButton, resources.GetString("lb_UMCInputButton.ToolTip")); - // - // cB_UMCIntensity - // - resources.ApplyResources(this.cB_UMCIntensity, "cB_UMCIntensity"); - this.cB_UMCIntensity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cB_UMCIntensity.FormattingEnabled = true; - this.cB_UMCIntensity.Items.AddRange(new object[] { - resources.GetString("cB_UMCIntensity.Items"), - resources.GetString("cB_UMCIntensity.Items1"), - resources.GetString("cB_UMCIntensity.Items2"), - resources.GetString("cB_UMCIntensity.Items3"), - resources.GetString("cB_UMCIntensity.Items4")}); - this.cB_UMCIntensity.Name = "cB_UMCIntensity"; - this.toolTip1.SetToolTip(this.cB_UMCIntensity, resources.GetString("cB_UMCIntensity.ToolTip")); // // lb_UMCIntensity // resources.ApplyResources(this.lb_UMCIntensity, "lb_UMCIntensity"); this.lb_UMCIntensity.Name = "lb_UMCIntensity"; - this.toolTip1.SetToolTip(this.lb_UMCIntensity, resources.GetString("lb_UMCIntensity.ToolTip")); // // tB_UMCSensivity // resources.ApplyResources(this.tB_UMCSensivity, "tB_UMCSensivity"); this.tB_UMCSensivity.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.tB_UMCSensivity.LargeChange = 500; - this.tB_UMCSensivity.Maximum = 8000; + this.tB_UMCSensivity.LargeChange = 2; + this.tB_UMCSensivity.Maximum = 20; this.tB_UMCSensivity.Minimum = 1; this.tB_UMCSensivity.Name = "tB_UMCSensivity"; - this.tB_UMCSensivity.SmallChange = 100; - this.tB_UMCSensivity.TickFrequency = 500; - this.toolTip1.SetToolTip(this.tB_UMCSensivity, resources.GetString("tB_UMCSensivity.ToolTip")); - this.tB_UMCSensivity.Value = 1000; + this.tB_UMCSensivity.Value = 1; this.tB_UMCSensivity.Scroll += new System.EventHandler(this.tB_UMCSensivity_Scroll); // // lb_UMCSensivity // resources.ApplyResources(this.lb_UMCSensivity, "lb_UMCSensivity"); this.lb_UMCSensivity.Name = "lb_UMCSensivity"; - this.toolTip1.SetToolTip(this.lb_UMCSensivity, resources.GetString("lb_UMCSensivity.ToolTip")); // // lb_UMCInputStyle // resources.ApplyResources(this.lb_UMCInputStyle, "lb_UMCInputStyle"); this.lb_UMCInputStyle.Name = "lb_UMCInputStyle"; - this.toolTip1.SetToolTip(this.lb_UMCInputStyle, resources.GetString("lb_UMCInputStyle.ToolTip")); // // cB_UMCInputStyle // - resources.ApplyResources(this.cB_UMCInputStyle, "cB_UMCInputStyle"); this.cB_UMCInputStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cB_UMCInputStyle.FormattingEnabled = true; this.cB_UMCInputStyle.Items.AddRange(new object[] { @@ -713,37 +647,34 @@ private void InitializeComponent() resources.GetString("cB_UMCInputStyle.Items1"), resources.GetString("cB_UMCInputStyle.Items2"), resources.GetString("cB_UMCInputStyle.Items3")}); + resources.ApplyResources(this.cB_UMCInputStyle, "cB_UMCInputStyle"); this.cB_UMCInputStyle.Name = "cB_UMCInputStyle"; - this.toolTip1.SetToolTip(this.cB_UMCInputStyle, resources.GetString("cB_UMCInputStyle.ToolTip")); this.cB_UMCInputStyle.SelectedIndexChanged += new System.EventHandler(this.cB_UMCInputStyle_SelectedIndexChanged); // // tabSettings // - resources.ApplyResources(this.tabSettings, "tabSettings"); this.tabSettings.Controls.Add(this.gb_SettingsUDP); this.tabSettings.Controls.Add(this.gb_SettingsService); this.tabSettings.Controls.Add(this.gb_SettingsInterface); + resources.ApplyResources(this.tabSettings, "tabSettings"); this.tabSettings.Name = "tabSettings"; - this.toolTip1.SetToolTip(this.tabSettings, resources.GetString("tabSettings.ToolTip")); this.tabSettings.UseVisualStyleBackColor = true; // // gb_SettingsUDP // - resources.ApplyResources(this.gb_SettingsUDP, "gb_SettingsUDP"); this.gb_SettingsUDP.Controls.Add(this.b_UDPApply); this.gb_SettingsUDP.Controls.Add(this.tB_UDPPort); this.gb_SettingsUDP.Controls.Add(this.lb_UDPport); this.gb_SettingsUDP.Controls.Add(this.tB_UDPIP); this.gb_SettingsUDP.Controls.Add(this.cB_UDPEnable); + resources.ApplyResources(this.gb_SettingsUDP, "gb_SettingsUDP"); this.gb_SettingsUDP.Name = "gb_SettingsUDP"; this.gb_SettingsUDP.TabStop = false; - this.toolTip1.SetToolTip(this.gb_SettingsUDP, resources.GetString("gb_SettingsUDP.ToolTip")); // // b_UDPApply // resources.ApplyResources(this.b_UDPApply, "b_UDPApply"); this.b_UDPApply.Name = "b_UDPApply"; - this.toolTip1.SetToolTip(this.b_UDPApply, resources.GetString("b_UDPApply.ToolTip")); this.b_UDPApply.UseVisualStyleBackColor = true; this.b_UDPApply.Click += new System.EventHandler(this.b_UDPApply_Click); // @@ -756,7 +687,6 @@ private void InitializeComponent() 0, 0}); this.tB_UDPPort.Name = "tB_UDPPort"; - this.toolTip1.SetToolTip(this.tB_UDPPort, resources.GetString("tB_UDPPort.ToolTip")); this.tB_UDPPort.Value = new decimal(new int[] { 26760, 0, @@ -767,24 +697,20 @@ private void InitializeComponent() // resources.ApplyResources(this.lb_UDPport, "lb_UDPport"); this.lb_UDPport.Name = "lb_UDPport"; - this.toolTip1.SetToolTip(this.lb_UDPport, resources.GetString("lb_UDPport.ToolTip")); // // tB_UDPIP // resources.ApplyResources(this.tB_UDPIP, "tB_UDPIP"); this.tB_UDPIP.Name = "tB_UDPIP"; - this.toolTip1.SetToolTip(this.tB_UDPIP, resources.GetString("tB_UDPIP.ToolTip")); // // cB_UDPEnable // resources.ApplyResources(this.cB_UDPEnable, "cB_UDPEnable"); this.cB_UDPEnable.Name = "cB_UDPEnable"; - this.toolTip1.SetToolTip(this.cB_UDPEnable, resources.GetString("cB_UDPEnable.ToolTip")); this.cB_UDPEnable.UseVisualStyleBackColor = true; // // gb_SettingsService // - resources.ApplyResources(this.gb_SettingsService, "gb_SettingsService"); this.gb_SettingsService.Controls.Add(this.lB_ServiceStartup); this.gb_SettingsService.Controls.Add(this.lB_ServiceStatus); this.gb_SettingsService.Controls.Add(this.cB_ServiceStartup); @@ -792,40 +718,36 @@ private void InitializeComponent() this.gb_SettingsService.Controls.Add(this.b_ServiceStart); this.gb_SettingsService.Controls.Add(this.b_ServiceDelete); this.gb_SettingsService.Controls.Add(this.b_ServiceInstall); + resources.ApplyResources(this.gb_SettingsService, "gb_SettingsService"); this.gb_SettingsService.Name = "gb_SettingsService"; this.gb_SettingsService.TabStop = false; - this.toolTip1.SetToolTip(this.gb_SettingsService, resources.GetString("gb_SettingsService.ToolTip")); // // lB_ServiceStartup // resources.ApplyResources(this.lB_ServiceStartup, "lB_ServiceStartup"); this.lB_ServiceStartup.Name = "lB_ServiceStartup"; - this.toolTip1.SetToolTip(this.lB_ServiceStartup, resources.GetString("lB_ServiceStartup.ToolTip")); // // lB_ServiceStatus // resources.ApplyResources(this.lB_ServiceStatus, "lB_ServiceStatus"); this.lB_ServiceStatus.Name = "lB_ServiceStatus"; - this.toolTip1.SetToolTip(this.lB_ServiceStatus, resources.GetString("lB_ServiceStatus.ToolTip")); // // cB_ServiceStartup // - resources.ApplyResources(this.cB_ServiceStartup, "cB_ServiceStartup"); this.cB_ServiceStartup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.cB_ServiceStartup, "cB_ServiceStartup"); this.cB_ServiceStartup.FormattingEnabled = true; this.cB_ServiceStartup.Items.AddRange(new object[] { resources.GetString("cB_ServiceStartup.Items"), resources.GetString("cB_ServiceStartup.Items1"), resources.GetString("cB_ServiceStartup.Items2")}); this.cB_ServiceStartup.Name = "cB_ServiceStartup"; - this.toolTip1.SetToolTip(this.cB_ServiceStartup, resources.GetString("cB_ServiceStartup.ToolTip")); this.cB_ServiceStartup.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // // b_ServiceStop // resources.ApplyResources(this.b_ServiceStop, "b_ServiceStop"); this.b_ServiceStop.Name = "b_ServiceStop"; - this.toolTip1.SetToolTip(this.b_ServiceStop, resources.GetString("b_ServiceStop.ToolTip")); this.b_ServiceStop.UseVisualStyleBackColor = true; this.b_ServiceStop.Click += new System.EventHandler(this.b_ServiceStop_Click); // @@ -833,7 +755,6 @@ private void InitializeComponent() // resources.ApplyResources(this.b_ServiceStart, "b_ServiceStart"); this.b_ServiceStart.Name = "b_ServiceStart"; - this.toolTip1.SetToolTip(this.b_ServiceStart, resources.GetString("b_ServiceStart.ToolTip")); this.b_ServiceStart.UseVisualStyleBackColor = true; this.b_ServiceStart.Click += new System.EventHandler(this.b_ServiceStart_Click); // @@ -841,7 +762,6 @@ private void InitializeComponent() // resources.ApplyResources(this.b_ServiceDelete, "b_ServiceDelete"); this.b_ServiceDelete.Name = "b_ServiceDelete"; - this.toolTip1.SetToolTip(this.b_ServiceDelete, resources.GetString("b_ServiceDelete.ToolTip")); this.b_ServiceDelete.UseVisualStyleBackColor = true; this.b_ServiceDelete.Click += new System.EventHandler(this.b_ServiceDelete_Click); // @@ -849,25 +769,22 @@ private void InitializeComponent() // resources.ApplyResources(this.b_ServiceInstall, "b_ServiceInstall"); this.b_ServiceInstall.Name = "b_ServiceInstall"; - this.toolTip1.SetToolTip(this.b_ServiceInstall, resources.GetString("b_ServiceInstall.ToolTip")); this.b_ServiceInstall.UseVisualStyleBackColor = true; this.b_ServiceInstall.Click += new System.EventHandler(this.b_ServiceInstall_Click); // // gb_SettingsInterface // - resources.ApplyResources(this.gb_SettingsInterface, "gb_SettingsInterface"); this.gb_SettingsInterface.Controls.Add(this.cB_RunAtStartup); this.gb_SettingsInterface.Controls.Add(this.cB_CloseMinimizes); this.gb_SettingsInterface.Controls.Add(this.cB_StartMinimized); + resources.ApplyResources(this.gb_SettingsInterface, "gb_SettingsInterface"); this.gb_SettingsInterface.Name = "gb_SettingsInterface"; this.gb_SettingsInterface.TabStop = false; - this.toolTip1.SetToolTip(this.gb_SettingsInterface, resources.GetString("gb_SettingsInterface.ToolTip")); // // cB_RunAtStartup // resources.ApplyResources(this.cB_RunAtStartup, "cB_RunAtStartup"); this.cB_RunAtStartup.Name = "cB_RunAtStartup"; - this.toolTip1.SetToolTip(this.cB_RunAtStartup, resources.GetString("cB_RunAtStartup.ToolTip")); this.cB_RunAtStartup.UseVisualStyleBackColor = true; this.cB_RunAtStartup.CheckedChanged += new System.EventHandler(this.cB_RunAtStartup_CheckedChanged); // @@ -875,7 +792,6 @@ private void InitializeComponent() // resources.ApplyResources(this.cB_CloseMinimizes, "cB_CloseMinimizes"); this.cB_CloseMinimizes.Name = "cB_CloseMinimizes"; - this.toolTip1.SetToolTip(this.cB_CloseMinimizes, resources.GetString("cB_CloseMinimizes.ToolTip")); this.cB_CloseMinimizes.UseVisualStyleBackColor = true; this.cB_CloseMinimizes.CheckedChanged += new System.EventHandler(this.cB_CloseMinimizes_CheckedChanged); // @@ -883,7 +799,6 @@ private void InitializeComponent() // resources.ApplyResources(this.cB_StartMinimized, "cB_StartMinimized"); this.cB_StartMinimized.Name = "cB_StartMinimized"; - this.toolTip1.SetToolTip(this.cB_StartMinimized, resources.GetString("cB_StartMinimized.ToolTip")); this.cB_StartMinimized.UseVisualStyleBackColor = true; this.cB_StartMinimized.CheckedChanged += new System.EventHandler(this.cB_StartMinimized_CheckedChanged); // @@ -906,7 +821,6 @@ private void InitializeComponent() this.DoubleBuffered = true; this.Name = "ControllerHelper"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; - this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip")); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ControllerHelper_Close); this.Load += new System.EventHandler(this.ControllerHelper_Load); this.Resize += new System.EventHandler(this.ControllerHelper_Resize); @@ -934,6 +848,7 @@ private void InitializeComponent() this.gB_Profiles.ResumeLayout(false); this.gB_ProfileGyro.ResumeLayout(false); this.gB_ProfileGyro.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tB_UMCIntensity)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tB_UMCSensivity)).EndInit(); this.tabSettings.ResumeLayout(false); this.gb_SettingsUDP.ResumeLayout(false); @@ -1033,10 +948,10 @@ private void InitializeComponent() private System.Windows.Forms.Label lb_UMCInputStyle; private System.Windows.Forms.TrackBar tB_UMCSensivity; private System.Windows.Forms.Label lb_UMCSensivity; - private System.Windows.Forms.ComboBox cB_UMCIntensity; private System.Windows.Forms.Label lb_UMCIntensity; private System.Windows.Forms.Label lb_UMCInputButton; private System.Windows.Forms.ListBox cB_UMCInputButton; + private System.Windows.Forms.TrackBar tB_UMCIntensity; } } diff --git a/ControllerHelper/ControllerHelper.cs b/ControllerHelper/ControllerHelper.cs index 01431b4f6..fd50f43f7 100644 --- a/ControllerHelper/ControllerHelper.cs +++ b/ControllerHelper/ControllerHelper.cs @@ -288,7 +288,7 @@ public void UpdateProcess(int ProcessId, string ProcessPath) logger.LogInformation("Profile {0} applied", profile.name); } else - PipeClient.SendMessage(new PipeClientProfile() { profile = new Profile("default", "") }); + PipeClient.SendMessage(new PipeClientProfile() { profile = ProfileManager.GetDefault() }); } catch (Exception) { } } @@ -679,6 +679,9 @@ private void lB_Profiles_SelectedIndexChanged(object sender, EventArgs e) } else { + // disable button if is default profile + b_DeleteProfile.Enabled = !profile.IsDefault; + gB_ProfileDetails.Enabled = true; gB_ProfileOptions.Enabled = true; gB_6axis.Enabled = true; @@ -699,7 +702,7 @@ private void lB_Profiles_SelectedIndexChanged(object sender, EventArgs e) cB_UniversalMC.Checked = profile.umc_enabled; cB_UMCInputStyle.SelectedIndex = (int)profile.umc_input; tB_UMCSensivity.Value = (int)profile.umc_sensivity; - cB_UMCIntensity.SelectedIndex = (int)profile.umc_intensity; + tB_UMCIntensity.Value = (int)profile.umc_intensity; for (int idx = 0; idx < cB_UMCInputButton.Items.Count; idx++) { @@ -764,7 +767,7 @@ private void b_ApplyProfile_Click(object sender, EventArgs e) profile.umc_enabled = cB_UniversalMC.Checked && cB_UniversalMC.Enabled; profile.umc_input = (InputStyle)cB_UMCInputStyle.SelectedIndex; profile.umc_sensivity = tB_UMCSensivity.Value; - profile.umc_intensity = (HapticIntensity)cB_UMCIntensity.SelectedIndex; + profile.umc_intensity = tB_UMCIntensity.Value; profile.umc_trigger = 0; foreach (DualShock4Button button in cB_UMCInputButton.SelectedItems) @@ -819,6 +822,14 @@ private void cB_UMCInputStyle_SelectedIndexChanged(object sender, EventArgs e) cB_UMCInputButton.Enabled = cB_UMCInputStyle.SelectedIndex != 0; } + private void tB_UMCIntensity_Scroll(object sender, EventArgs e) + { + BeginInvoke((MethodInvoker)delegate () + { + toolTip1.SetToolTip(tB_UMCIntensity, $"value: {tB_UMCIntensity.Value}"); + }); + } + private void cB_HIDcloak_CheckedChanged(object sender, EventArgs e) { PipeClient.SendMessage(new PipeClientSettings diff --git a/ControllerHelper/ControllerHelper.csproj b/ControllerHelper/ControllerHelper.csproj index 1b0a39bf0..e693f1bef 100644 --- a/ControllerHelper/ControllerHelper.csproj +++ b/ControllerHelper/ControllerHelper.csproj @@ -85,6 +85,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/ControllerHelper/ControllerHelper.fr.resx b/ControllerHelper/ControllerHelper.fr.resx index 3c8f1f030..e6a951303 100644 --- a/ControllerHelper/ControllerHelper.fr.resx +++ b/ControllerHelper/ControllerHelper.fr.resx @@ -57,9 +57,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - @@ -3453,290 +3450,104 @@ Périphériques - - - - - Options du profil - - - - - - Options de contrôle du mouvement - - - - - - Détails du profil - - - - - - - - - - - - 117, 15 - - - Bouton d'activation : - - - - - - Faible - - - Moyenne - - - Élevé - - - Extrême - - - Insensé - - - - - - 58, 15 - - - Intensité : - - - - - - - - - 66, 15 - - - Sensibilité : - - - - - - 83, 15 - - - Type d'entrée : - - - - - - Aucun - - - Stick droit - - - Stick gauche - - - Souris - - - - - - Options du gyroscope vers manette - - - - - - - - - Paramètres - - - - - - - Détails du Périphérique - - - 206, 19 Envoyer les entrées du pavé tactile - - - 73, 15 Pavé tactile : - - - 69, 15 Gyroscope : - - - 145, 19 Accéléromètre détecté - - - 124, 19 Gyroscope détecté - - - 90, 15 Accéléromètre : - - - Détails du dispositif d'interface humaine - - - - - - 134, 15 Intensité des vibrations : - - - - - - 148, 15 Fréquence d'actualisation : - - - 137, 15 Mode périphérique HID : - - - - - - Détails du périphérique d'entrée Xinput - - - 164, 19 Camoufler le périphérique - - - - - - 83, 15 ID du produit : - - - 307, 19 Dévoiler le périphérique quand le programme s'arrête - - - 78, 15 Camouflage : - - - - - - 93, 15 ID de l'instance : - - - Périphériques d'entrée Xinput - - - - - + + Options du profil 237, 19 @@ -3744,53 +3555,38 @@ Transposer le gyroscope en commandes - - - 107, 15 Utilisez le masque : - - - 140, 15 Gyroscope vers manette : - - - 91, 15 Lecture directe : - - - 269, 19 Traduit les appels XInput en appels DirectInput - - - 219, 19 Peut accéder au contrôleur physique - - + + Options de contrôle du mouvement 94, 19 @@ -3816,30 +3612,18 @@ Axe vertical : - - - 89, 15 Axe horizontal : - - - 127, 15 Axe de direction Gyro : - - - - - - NoControl @@ -3847,35 +3631,26 @@ 291, 45 - - - 115, 15 Multiplicateur Gyro : - - - 136, 15 Multiplicateur Accelero : - - - NoControl 291, 45 - - + + Détails du profil 284, 87 @@ -3886,102 +3661,102 @@ Appliquer le profil - - - 122, 40 Supprimer le profil - - - - - - 97, 15 Chemin d'accès : - - - - - - 40, 15 Nom : - - - Créer un nouveau profil - - + + Options du gyroscope vers manette + + + Top, Left, Right + + + NoControl + + + 161, 45 + + + 117, 15 + + + Bouton d'activation : + + + 58, 15 + + + Intensité : + + + 66, 15 + + + Sensibilité : + + + 83, 15 + + + Type d'entrée : + + + Aucun + + + Stick droit + + + Stick gauche + + + Souris - - + + Paramètres Serveur UDP - - - 890, 20 Appliquer - - - - - - - - - - - - 63, 19 Activer - - - - - - 113, 15 Type de démarrage : - - - État du service : - - - Automatique @@ -3991,63 +3766,36 @@ Désactivé - - - Arrêter le service - - - Démarrer le service - - - Supprimer le service - - - Installer le service - - - - - - 210, 19 Exécuter au démarrage du système - - - 202, 19 Minimiser dans la barre de tâches - - - 155, 19 Démarrer en arrière-plan - - - AAABAAoAEBAAAAEAIABoBAAApgAAABgYAAABACAAiAkAAA4FAAAgIAAAAQAgAKgQAACWDgAAMDAAAAEA @@ -7440,7 +7188,4 @@ 998, 594 - - - \ No newline at end of file diff --git a/ControllerHelper/ControllerHelper.resx b/ControllerHelper/ControllerHelper.resx index 8dd281633..601e45ce6 100644 --- a/ControllerHelper/ControllerHelper.resx +++ b/ControllerHelper/ControllerHelper.resx @@ -57,430 +57,29 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 130, 17 + - - 194, 505 - - - 470, 110 - - - 5 - - - 76, 15 - - - - True - - - - - - - - - 0 - - - 2 - - - 308, 45 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gB_ProfileOptions - - - Passthrough: - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - cB_UniversalMC - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - UDP Server - - - Send touchpad inputs - - - True - - - 1 - - - 10 - - - - - - - - - 323, 68 - - - tabProfiles - - - lb_ProfileAccelero - - - - - - Path: - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 143, 15 - - - notifyIcon1 - - - 3 - - - gb_SettingsService - - - 249, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Top, Left, Right - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - Apply - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 2 - - - - - - 8 - - - False - - - Device cloak: - - - 156, 81 - - - 18 - - - Top, Left, Right - - - - - - Vibration strength: - - - 0 - - - 200, 527 - - - True - - - 6, 82 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 194, 505 - - - True - - - Startup type: - - - Controller Service - - - 3 - - - Service status: - - - 1 - - - gB_DeviceDetails - - - 6, 32 - - - 4 - - - True - - - 6 - - - 608, 45 - - - 203, 3 - - - 190, 40 - - - cB_GyroSteering - - - 156, 29 - - - gB_6axis - - - - - - 0 - - - Gyrometer detected - - - gb_SettingsService - - - 4 - - - 6 - - - 6, 32 - - - 2 - - - lB_InvertVAxis - - - 976, 533 - - - - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 984, 561 - - - 3 - - - cB_InvertVAxis - - - Roll - - - 5 - - - Settings - - - cB_UMCIntensity - - - 1 - - - 12 - - - - - - lb_UMCInputStyle - - - System.Windows.Forms.ListBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 23 - - - tB_ProfilePath - - - Invert Axis - - - Stop Service - - - Gyrometer Multiplier: - - - 203, 143 - - - 6, 73 - - - - - - 0 - - - 0 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 22 - - - 120, 15 - - - - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tB_UDPIP - - - False - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - 3 - - - lb_ProfilePath - - - 2 - - - 0 - - - 984, 561 - - - 608, 45 - - - gB_6axis - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - cB_StartMinimized - - - True - - - - - - 1 - - - 5 - - - 1 - - - 4, 24 + + 97, 22 - - gB_DeviceDetails + + Quit - - 127, 22 + + 98, 26 - - True + + contextMenuStrip1 - - tabDevices + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAAoAEBAAAAEAIABoBAAApgAAABgYAAABACAAiAkAAA4FAAAgIAAAAQAgAKgQAACWDgAAMDAAAAEA IACoJQAAPh8AAEBAAAABACAAKEIAAOZEAABISAAAAQAgAIhUAAAOhwAAUFAAAAEAIADoZwAAltsAAGBg @@ -3869,2069 +3468,2284 @@ HA6Hw+FwOBwOh8PhcDgcY/P/A4HHvlHK3JOvAAAAAElFTkSuQmCC - - Top + + Controller Helper + + + + True + + + 156, 81 + + + 142, 19 + + + 11 + + + Send touchpad inputs + + + cB_touchpad + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gB_DeviceDetails + + + 0 + + + True + + + 6, 82 + + + 62, 15 + + + 10 + + + Touchpad: + + + lb_touchpad + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_DeviceDetails - - gb_SettingsUDP + + 1 - + + True + + 6, 32 - - cB_Whitelist + + 66, 15 - - 4 + + 6 - + + Gyrometer: + + + lb_gyro + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_DeviceDetails - + 2 - - 13 + + True - - 81, 19 + + False - - 608, 23 + + 156, 56 - - + + 152, 19 - - Xinput Details + + 9 - - Fill + + Accelerometer detected - - 2 + + cB_accelero - - gB_ProfileDetails + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - b_DeleteProfile + + gB_DeviceDetails - - lb_ProfileGyro + + 3 - - 84, 15 + + True - - 3, 104 + + False - - 9 + + 156, 31 - - 13 + + 131, 19 - - Left Stick + + 7 + + + Gyrometer detected + + + cB_gyro + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gB_DeviceDetails + + + 4 + + + True + + + 6, 57 + + + 87, 15 8 - - tabControl1 + + Accelerometer: - - + + lb_accelero - - 2 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 97, 22 + + gB_DeviceDetails - - True + + 5 - + + + Fill + + + 203, 153 + + + 770, 110 + + 3 - - tabProfiles + + Device Details - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_DeviceDetails + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabDevices - + 0 - + + Top, Left, Right + + + 156, 115 + + + 608, 45 + + + 7 + + + tB_VibrationStr + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gB_HIDDetails + + + 0 + + + True + + + 6, 115 + + + 105, 15 + + + 6 + + + Vibration strength: + + + lb_VibrationStr + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gB_HIDDetails + + + 1 + + + Top, Left, Right + + + 156, 64 + + + 608, 45 + + + 5 + + + tB_PullRate + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gB_HIDDetails + + + 2 + + True - + + 6, 64 + + + 112, 15 + + + 4 + + + Output rate control: + + + lb_PullRate + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + gB_HIDDetails - - lb_HidMode + + 3 - - High + + True - - cB_UMCInputStyle + + 6, 32 - - tabDevices + + 101, 15 - - tB_PullRate + + 2 - - lb_VibrationStr + + HID device mode: - - True + + lb_HidMode - + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 190, 40 - - - 21 + + gB_HIDDetails - - 120, 23 + + 4 - - lb_UDPport + + False - - + + 156, 29 - - True + + 190, 23 - - False + + 3 - - 243, 19 + + cB_HidMode - - + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + gB_HIDDetails - - 161, 23 + + 5 - - gB_ProfileOptions + + Bottom 203, 263 + + 770, 267 + + + 2 + + + HID Details + gB_HIDDetails - - 112, 15 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - lb_UMCIntensity + + tabDevices - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - 156, 184 + + 156, 90 - - gB_XinputDetails + + 93, 19 - - gB_ProfileDetails + + 13 - - 4 + + Cloak device - - True + + cB_HIDcloak - - 6, 80 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 10 + + gB_XinputDetails - - 98, 26 + + 0 - - + + Top, Left, Right - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 156, 58 - - lb_HidCloak + + 608, 23 - - True + + 12 - - 1 + + tB_ProductID - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 156, 155 + + gB_XinputDetails + + + 1 - - + + True - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 61 - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 66, 15 - - gB_HIDDetails + + 11 - - 6, 72 + + Product ID: - - 6, 47 + + lb_ProductID - - gB_XinputDetails + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 75, 40 + + gB_XinputDetails - + 2 - - + + True - - System.Windows.Forms.ToolTip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 156, 115 - - 0 + + 116, 19 - - 7 + + 10 - - gB_6axis + + Uncloak on close - - 156, 115 + + cB_uncloak - - 156, 22 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_XinputDetails - - cB_UMCInputButton + + 3 - - Touchpad: + + True - - 1 + + 6, 90 - - NoControl + + 76, 15 4 - - 7 + + Device cloak: - - 4 + + lb_HidCloak - + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_XinputDetails - - + + 4 + + + Top, Left, Right - - + + 156, 29 - - Profile Details + + 608, 23 - - gB_HIDDetails + + 1 - - 73, 15 + + tB_InstanceID - - True + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_XinputDetails - - 22 + + 5 - - + + True - - lB_Devices + + 6, 32 - - 131, 19 + + 68, 15 - - True + + 0 - - 8 + + Instance ID: - - gB_ProfileDetails + + lb_InstanceID - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + gB_XinputDetails - - Install Service + + 6 - - True + + Top - - + + 203, 3 - - cB_accelero + + 770, 150 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - lB_Profiles + + Xinput Details - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gB_XinputDetails - - True + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabDevices - - 42, 15 + + 2 - - 6, 185 + + Fill - - 4 + + 15 - - + + 3, 19 - - ControllerHelper + + 194, 505 - + 0 - - 190, 23 + + lB_Devices - - 101, 15 + + System.Windows.Forms.ListBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 19 + + gB_XinputDevices - - True + + 0 - - 161, 79 + + Left - - + + 3, 3 - - 100, 23 + + 200, 527 - - lb_accelero + + 0 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Xinput Devices - - 4 + + gB_XinputDevices - - + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabDevices - - HID device mode: + + 3 - - tabProfiles + + 4, 24 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 3, 3, 3 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 976, 533 - - False + + 0 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Devices - - b_CreateProfile + + tabDevices - - gb_SettingsInterface + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabControl1 - - Devices + + 0 - - gB_ProfileGyro + + True - - gb_SettingsService + + NoControl - - 3 + + 156, 79 - - gb_SettingsInterface + + 191, 19 - - 6, 61 + + 13 - - 976, 533 + + Translate Gyroscope to controls - - 3, 177 + + cB_UniversalMC - + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Right + + gB_ProfileOptions - - NoControl + + 0 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - Bottom + + 6, 55 - - Profiles + + 55, 15 - - 103, 19 + + 10 - - cB_UDPEnable + + Wrapper: - - Cloak device + + lb_Wrapper + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 24 + + gB_ProfileOptions - - Low + + 1 - - + + True - - False + + NoControl - - - 3, 3, 3, 3 + + 6, 80 - - Bottom + + 143, 15 - - 190, 23 + + 12 - - 1 + + Universal Motion Control: - - gB_ProfileGyro + + lb_UniversalMC - - False + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 673, 3 + + gB_ProfileOptions - - Start Minimized + + 2 - - b_ServiceDelete + + True - - 6 + + 6, 30 - - + + 76, 15 - - 2 + + 8 - - + + Passthrough: - - Intensity: + + lb_Whitelist - - tabDevices + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gB_ProfileOptions - - + + 3 - - Translates XInput calls to DirectInput calls + + True - - Insane + + 156, 54 - - gB_ProfileGyro + + 243, 19 - - 156, 29 + + 11 - - 0 + + Translates XInput calls to DirectInput calls - - Horizontal Axis: + + cB_Wrapper - - tB_InstanceID + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False + + gB_ProfileOptions - - 6, 22 + + 4 - - 3, 3 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 156, 29 - - + + 184, 19 - - + + 9 - - Top, Left, Right + + Can access physical controller - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cB_Whitelist - - 7 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 770, 267 + + gB_ProfileOptions - - 3, 3 + + 5 - - + + Fill - - cB_Wrapper + + 203, 143 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 470, 110 - - 1 + + 2 - - 4 + + Profile Options - - gb_SettingsService + + gB_ProfileOptions - + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - b_ServiceStart - - - 96, 19 + + tabProfiles - - + + 0 - - 6, 22 + + True - - Motion Control Options + + 156, 184 - - + + 81, 19 - - 203, 3 + + 23 - - tB_UMCSensivity + + Invert Axis - - Output rate control: + + 580, 17 + + + This feature is only partially implemented. - - 3 + + cB_InvertVAxis - - 127.0.0.1 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + gB_6axis - - 203, 253 + + 0 - - NoControl + + True - - 6, 57 + + 156, 155 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 81, 19 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 22 - - 0 + + Invert Axis - - Port + + This feature is only partially implemented. - - Exe Files (.exe)|*.exe|Microsoft Store Manifest (appxmanifest.xml)|appxmanifest.xml + + cB_InvertHAxis - - System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - HID Details + + gB_6axis - - 5 + + 1 - - 11 + + True - - + + 6, 185 - - 15 + + 73, 15 - - 190, 23 + + 21 - - NoControl + + Vertical Axis: - - Enable Server + + MiddleLeft - - 4 + + lB_InvertVAxis - - 4, 24 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + gB_6axis - - Fill - - - 6, 117 - - - Instance ID: + + 2 - - 200, 527 + + True - - lb_gyro + + 6, 156 - - 970, 73 + + 90, 15 - - 1 + + 19 - - 1 + + Horizontal Axis: - - Fill + + MiddleLeft - - gB_ProfileGyro + + lB_InvertHAxis - - True + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Wrapper: + + gB_6axis - + 3 - - b_ApplyProfile + + True - - b_ServiceInstall + + 6, 127 - - tB_UDPPort + + 106, 15 - - cB_CloseMinimizes + + 17 - - 2 + + Gyro Steering Axis: - - + + MiddleLeft - - 156, 90 + + lB_GyroSteering - - 470, 277 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gB_6axis - - gB_ProfileDetails + + 4 - - gb_SettingsUDP + + False - - cB_InvertHAxis + + Yaw - - Top, Left, Right + + Roll - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 156, 124 - - True + + 190, 23 - - gB_6axis + + 16 - - 3 + + cB_GyroSteering - - True + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gB_6axis - - 14 + + 5 - - gb_SettingsUDP + + Top, Left, Right - - gB_HIDDetails + + 156, 73 - - System.Windows.Forms.ListBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 308, 45 - - Right + + 15 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tb_ProfileAcceleroValue - - 5 + + System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gb_SettingsInterface + + gB_6axis - - gB_ProfileGyro + + 6 - - gB_XinputDetails + + True - - + + 6, 22 - - lb_PullRate + + 120, 15 - - + + 12 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Gyrometer Multiplier: - - 55, 15 + + lb_ProfileGyro - - Universal Motion Control: + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tB_VibrationStr + + gB_6axis - - 1 + + 7 - - Run At Startup + + True - - 17 + + 6, 73 - - 22 + + 141, 15 - - Accelerometer: + + 14 - - Accelerometer detected + + Accelerometer Multiplier: - - 6, 61 + + lb_ProfileAccelero - - 76, 15 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gB_6axis - - 4 + + 8 - - 976, 533 + + Top, Left, Right - - 156, 124 + + 156, 22 - - 4 + + 308, 45 - - 133, 61 + + 13 - - gB_XinputDetails + + tb_ProfileGyroValue - - gB_6axis + + System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gB_6axis - - tabSettings + + 9 - - 66, 15 + + Bottom - - gB_DeviceDetails + + 203, 253 - - 10 + + 470, 277 - - System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - 156, 31 + + Motion Control Options - - tabSettings + + gB_6axis - - System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - lb_ProductID + + tabProfiles - - + + 1 - - 2 + + 266, 87 - - Fill + + 75, 40 - - 74, 15 + + 7 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Apply - - gB_HIDDetails + + b_ApplyProfile - - + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + gB_ProfileDetails - - gB_Profiles + + 0 - - 5 + + 156, 87 - - Create new profile + + 104, 40 - - lB_ServiceStatus + + 6 - - 2 + + Delete profile - - 3 + + b_DeleteProfile - - + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Apply + + gB_ProfileDetails - - 308, 45 + + 1 - - False + + Top, Left, Right - - tabProfiles + + 156, 58 - - lb_InstanceID + + 308, 23 - + 5 - - 7, 149 + + tB_ProfilePath - - 0 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 156, 56 + + gB_ProfileDetails - - gB_ProfileOptions + + 2 - - gb_SettingsService + + True - - 11 + + 6, 61 - - + + 34, 15 - - 156, 29 + + 4 - - gB_ProfileDetails + + Path: - - lB_InvertHAxis + + lb_ProfilePath - - 2 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Delete profile + + gB_ProfileDetails - - System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - 2 + + Top, Left, Right - - gb_SettingsService + + 156, 29 - - 7 + + 308, 23 - - tabControl1 + + 3 - - 0 + + tB_ProfileName - - lb_UniversalMC + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gB_ProfileDetails + + + 4 + + True - - 2 + + 6, 32 - - 105, 15 + + 42, 15 - - lB_ServiceStartup + + 2 - - tabSettings + + Name: - - Close Minimizes + + lb_ProfileName - - Device Details + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabProfiles + + gB_ProfileDetails - - tabSettings + + 5 - - 266, 87 + + Top - - True + + 203, 3 - - 7 + + 470, 140 - - tabControl1 + + 1 - - 12 + + Profile Details - - lb_Whitelist + + gB_ProfileDetails - - 2 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Gyrometer: + + tabProfiles - - cB_HidMode + + 2 - - 133, 29 + + Bottom - - None + + 3, 501 - - 190, 40 + + 194, 23 - - This feature is only partially implemented. + + 1 - - NoControl + + Create new profile - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + b_CreateProfile - - 1 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + gB_Profiles - - 3, 3, 3, 3 + + 0 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - 56, 15 + + 15 - - 2 + + 3, 19 - - 3 + + 194, 505 - + 0 - - MiddleLeft + + lB_Profiles - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ListBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 156, 73 + + gB_Profiles - - 0 + + 1 - - 87, 15 + + Left - - 1 + + 3, 3 - - True + + 200, 527 - - b_UDPApply + + 0 - - 152, 19 + + Profiles - - 5 + + gB_Profiles - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + tabProfiles - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - gB_XinputDevices + + 133, 190 - - 20 + + 161, 45 - - lB_GyroSteering + + 25 - - 3 + + tB_UMCIntensity - - gb_SettingsUDP + + System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Name: + + gB_ProfileGyro - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - 3 + + 15 - - openFileDialog1 + + 133, 61 - + True - - 161, 23 + + 161, 79 - - 4 + + 24 - - gB_ProfileOptions + + cB_UMCInputButton - - System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ListBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gB_ProfileDetails + + gB_ProfileGyro - - 9 + + 1 - - 156, 58 + + True - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - + + 6, 61 - - Invert Axis + + 84, 15 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 23 - - gB_XinputDetails + + Enable Button: - - Sensivity: + + lb_UMCInputButton - - + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + gB_ProfileGyro - - + + 2 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - Start Service + + NoControl - - 23 + + 7, 195 - - 0 + + 55, 15 - - 29, 15 + + 21 - - Quit + + Intensity: - - gB_XinputDetails + + lb_UMCIntensity - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 156, 64 + + gB_ProfileGyro - - 184, 19 + + 3 - - 6, 127 + + Top, Left, Right - - 13 + + NoControl - - Uncloak on close + + 133, 146 - - 323, 22 + + 161, 45 - - 3 + + 20 - - gB_DeviceDetails + + tB_UMCSensivity - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Enable Button: + + gB_ProfileGyro - - cB_HIDcloak + + 4 - - 156, 58 + + True - - Bottom + + NoControl - - gB_DeviceDetails + + 7, 149 - - Vertical Axis: + + 56, 15 - - tB_ProfileName + + 19 - - 81, 19 + + Sensivity: - - 66, 15 + + lb_UMCSensivity - - 112, 19 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gB_ProfileGyro - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - gB_6axis + + True - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - Profile Options + + 6, 32 - - 115, 92 + + 80, 15 - - 134, 146 + + 18 - - 970, 101 + + Style of Input: - - + + lb_UMCInputStyle - + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - 2 + + gB_ProfileGyro - - 3, 19 + + 6 - - Automatic + + None - - + + Right Stick - - 109, 19 + + Left Stick - - cB_gyro + + Mouse - - System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 133, 29 - - + + 161, 23 17 - - 1 - - - 55, 15 + + cB_UMCInputStyle - - 770, 150 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 116, 19 + + gB_ProfileGyro - - System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Right - - Yaw + + False - - 93, 19 + + 673, 3 - - + + 300, 527 - - gB_HIDDetails + + 4 - - True + + Universal Motion Control Options - - Top, Left, Right + + gB_ProfileGyro - - + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + tabProfiles - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - 19 + + 4, 24 - - 0 + + 3, 3, 3, 3 - - 127, 68 + + 976, 533 - - Left + + 2 - - 156, 29 + + Profiles - - gb_SettingsUDP + + tabProfiles - - 6 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabControl1 - - tB_ProductID + + 1 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Right - - + + 889, 20 - - cB_ServiceStartup + + 75, 40 - - 608, 23 + + 4 - - tb_ProfileGyroValue + + Apply - - 300, 527 + + b_UDPApply - - + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 191, 19 + + gb_SettingsUDP - - gB_6axis + + 0 - - 15 + + 249, 20 - - $this + + 120, 23 - - Product ID: + + 3 - - True + + tB_UDPPort - - 0 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + gb_SettingsUDP - - Manual + + 1 - - 770, 110 + + True - - Extreme + + 214, 23 - - Right Stick + + 29, 15 - - 1 + + 2 - - 3, 501 + + Port - - 5 + + lb_UDPport - - Mouse + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + gb_SettingsUDP 2 - - gB_ProfileGyro + + 108, 20 - - MiddleLeft + + 100, 23 - - Manual + + 1 - - gB_6axis + + 127.0.0.1 - - Profiles + + tB_UDPIP - - 6, 32 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gB_DeviceDetails + + gb_SettingsUDP - - quitToolStripMenuItem + + 3 - - Xinput Devices + + True - - gB_6axis + + 6, 23 - - 1 + + 96, 19 - - Interface + + 0 - - System.Windows.Forms.TrackBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Enable Server - - + + cB_UDPEnable - - 470, 140 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gB_6axis + + gb_SettingsUDP - - 2 + + 4 - + Fill - - MiddleLeft + + 3, 104 + + + 970, 73 4 - - Gyro Steering Axis: - - - gB_XinputDevices - - - 23 + + UDP Server - - Controller Helper + + gb_SettingsUDP - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ControllerHelper + + tabSettings - - toolTip1 + + 0 - + True - - Top, Left, Right - - - 6 + + 6, 117 - - 308, 23 + + 74, 15 - - Bottom + + 8 - - 3 + + Startup type: - + MiddleLeft - - True + + lB_ServiceStartup - - 16 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 214, 23 + + gb_SettingsService - - 6, 61 + + 0 - - 4, 24 + + 6, 22 - - 156, 115 + + 115, 92 - - 1 + + 6 - - 156, 54 + + Service status: - - gB_XinputDetails + + MiddleLeft - - 190, 40 + + lB_ServiceStatus - - Delete Service + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gB_Profiles + + gb_SettingsService - - True + + 1 - - True + + False - - 6, 64 + + Automatic - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Manual - - cB_uncloak + + Disabled - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 127, 114 - - 1 + + 190, 23 + + + 7 - - + + cB_ServiceStartup - - 127, 114 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gB_Profiles + + gb_SettingsService - - 6 + + 2 - - Top, Left, Right + + False - - 0 + + 323, 68 - - Top, Left, Right + + 190, 40 - + 4 - - - - - + + Stop Service - - 6, 32 + + b_ServiceStop - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 203, 153 + + gb_SettingsService - - 194, 23 + + 3 - - Can access physical controller + + False - - 106, 15 + + 323, 22 - - 9 + + 190, 40 - - 0 + + 3 - - Top + + Start Service - - True + + b_ServiceStart - - 6, 115 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + gb_SettingsService - - 6, 90 + + 4 - - 12 + + False - - This feature is only partially implemented. + + 127, 68 - - 1000, 600 + + 190, 40 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - 308, 23 + + Delete Service - - 104, 40 + + b_ServiceDelete - - + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + gb_SettingsService - - Style of Input: + + 5 False - - Disabled + + 127, 22 - - 1 + + 190, 40 - + 1 - - tabDevices + + Install Service - - NoControl + + b_ServiceInstall - - lb_touchpad + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gb_SettingsService 6 - - - - - gb_SettingsService + + Bottom - - gb_SettingsInterface + + 3, 177 - - False + + 970, 353 - - lb_UMCSensivity + + 5 - - gB_ProfileOptions + + Controller Service - - Accelerometer Multiplier: + + gb_SettingsService - - 6, 156 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 19 + + tabSettings - - 141, 15 + + 1 - - 68, 15 + + True - - + + 6, 22 - - b_ServiceStop + + 103, 19 - - 970, 353 + + 0 - - 75, 40 + + Run At Startup - - MiddleLeft + + cB_RunAtStartup - - gB_ProfileOptions + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + gb_SettingsInterface - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - Top, Left, Right + + True - - tabControl1 + + 6, 72 - - + + 112, 19 - - 34, 15 + + 2 - - + + Close Minimizes - - System.Windows.Forms.NotifyIcon, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cB_CloseMinimizes - - + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 108, 20 + + gb_SettingsInterface - - gB_ProfileGyro + + 1 - - 134, 192 + + True - - Translate Gyroscope to controls + + 6, 47 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 109, 19 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - 161, 45 + + Start Minimized - - lb_Wrapper + + cB_StartMinimized - + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - cB_RunAtStartup + + gb_SettingsInterface - - gB_ProfileDetails + + 2 - - 21 + + Top - - tb_ProfileAcceleroValue + + 3, 3 - - contextMenuStrip1 + + 970, 101 - - lb_UMCInputButton + + 3 - - Universal Motion Control Options + + Interface - - cB_touchpad + + gb_SettingsInterface - - Medium + + System.Windows.Forms.GroupBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + tabSettings - - 8 + + 2 - - + + 4, 24 - - 90, 15 + + 3, 3, 3, 3 - - tabProfiles + + 976, 533 - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - 3 + + Settings - - + + tabSettings - - 156, 87 + + System.Windows.Forms.TabPage, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - lb_ProfileName + + tabControl1 - - 11 + + 2 - - 0 + + Fill - - 2 + + 0, 0 - - gB_ProfileGyro + + 984, 561 - - 0 + + 1 - - 5 + + tabControl1 - + + System.Windows.Forms.TabControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 1 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 440, 17 + + + Exe Files (.exe)|*.exe|Microsoft Store Manifest (appxmanifest.xml)|appxmanifest.xml - + + True + + + 96, 96 + + + True + + + 984, 561 + + AAABAAoAEBAAAAEAIABoBAAApgAAABgYAAABACAAiAkAAA4FAAAgIAAAAQAgAKgQAACWDgAAMDAAAAEA IACoJQAAPh8AAEBAAAABACAAKEIAAOZEAABISAAAAQAgAIhUAAAOhwAAUFAAAAEAIADoZwAAltsAAGBg @@ -9320,127 +9134,46 @@ HA6Hw+FwOBwOh8PhcDgcY/P/A4HHvlHK3JOvAAAAAElFTkSuQmCC - - 62, 15 - - - 889, 20 - - - gb_SettingsUDP - - - 0 - - - 96, 96 - - - - - - 0 - 4, 4, 4, 4 - - - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15 - - - True - - - 3, 3 - - - 3, 3, 3, 3 - - - 7 - - - 80, 15 - - - 142, 19 - - - 6, 55 - - - Top - - - 7, 195 - - - NoControl - - - 1 - - - 6, 30 + + 1000, 600 - - 4 + + Manual - - True + + ControllerHelper - - Left + + notifyIcon1 - - 156, 79 + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15 + + quitToolStripMenuItem - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + openFileDialog1 - - gB_ProfileOptions + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gB_ProfileGyro + + toolTip1 - - 1 + + System.Windows.Forms.ToolTip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + ControllerHelper - - tabDevices + + System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 580, 17 - - - 440, 17 - - - 17, 17 - - - 130, 17 - - - fr - - - True - \ No newline at end of file diff --git a/ControllerHelper/ProfileManager.cs b/ControllerHelper/ProfileManager.cs index cdf4951ee..663c868e6 100644 --- a/ControllerHelper/ProfileManager.cs +++ b/ControllerHelper/ProfileManager.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Text.Json; using static ControllerCommon.Utils; @@ -14,9 +15,6 @@ public class ProfileManager public Dictionary profiles = new Dictionary(); public FileSystemWatcher profileWatcher { get; set; } - private const uint CRC32_X64 = 0x906f6806; - private const uint CRC32_X86 = 0x456b57cc; - private Dictionary dateTimeDictionary = new Dictionary(); private readonly ControllerHelper helper; @@ -32,7 +30,7 @@ public ProfileManager(string path, ControllerHelper helper, ILogger logger) if (!Directory.Exists(path)) Directory.CreateDirectory(path); - /* monitor changes, deletions and creations of profiles + // monitor changes, deletions and creations of profiles profileWatcher = new FileSystemWatcher() { Path = path, @@ -42,14 +40,52 @@ public ProfileManager(string path, ControllerHelper helper, ILogger logger) NotifyFilter = NotifyFilters.FileName | NotifyFilters.Size }; - profileWatcher.Created += ProfileCreated; + // profileWatcher.Created += ProfileCreated; profileWatcher.Deleted += ProfileDeleted; - profileWatcher.Changed += ProfileChanged; */ + // profileWatcher.Changed += ProfileChanged; // process existing profiles string[] fileEntries = Directory.GetFiles(path, "*.json", SearchOption.AllDirectories); foreach (string fileName in fileEntries) ProcessProfile(fileName); + + // create default profile if missing + SetDefault(); + } + + private void ProfileChanged(object sender, FileSystemEventArgs e) + { + throw new NotImplementedException(); + } + + private void ProfileDeleted(object sender, FileSystemEventArgs e) + { + string ProfileName = e.Name.Replace(".json", ""); + + if (profiles.ContainsKey(ProfileName)) + { + // you should not delete default profile, you fool ! + Profile profile = profiles[ProfileName]; + if (profile.IsDefault) + SerializeProfile(profile); + } + } + + private void ProfileCreated(object sender, FileSystemEventArgs e) + { + throw new NotImplementedException(); + } + + public void SetDefault() + { + SerializeProfile(new Profile("Default", "")); + } + + public Profile GetDefault() + { + if (profiles.ContainsKey("Default")) + return profiles["Default"]; + return null; } private void ProcessProfile(string fileName) @@ -73,6 +109,9 @@ private void ProcessProfile(string fileName) return; } + if (profile.name == "Default") + profile.IsDefault = true; + UpdateProfile(profile); } diff --git a/ControllerHelper/profiles/Default.json b/ControllerHelper/profiles/Default.json new file mode 100644 index 000000000..3920f8a21 --- /dev/null +++ b/ControllerHelper/profiles/Default.json @@ -0,0 +1,12 @@ +{ + "name": "Default", + "path": "", + "whitelisted": false, + "legacy": false, + "use_wrapper": false, + "gyrometer": 1, + "accelerometer": 1, + "steering": 0, + "inverthorizontal": false, + "invertvertical": false +} \ No newline at end of file diff --git a/ControllerService/XInputController.cs b/ControllerService/XInputController.cs index 0ae61636b..b47e699a1 100644 --- a/ControllerService/XInputController.cs +++ b/ControllerService/XInputController.cs @@ -283,20 +283,20 @@ private unsafe void DS4_UpdateReport(object sender, ElapsedEventArgs e) outDS4Report.bSpecial = (byte)(tempSpecial | (0 << 2)); } - if (profile.umc_enabled && (tempButtons & profile.umc_trigger) != 0) + if (profile.umc_enabled && ((tempButtons + ProfileButton.AlwaysOn.Value) & profile.umc_trigger) != 0) { float intensity = profile.GetIntensity(); - float sensivity = profile.umc_sensivity; + float sensivity = profile.GetSensiviy(); switch (profile.umc_input) { default: case InputStyle.RightStick: - RightThumbX = ComputeInput(RightThumbX, -AngularVelocity.Z, sensivity, intensity); + RightThumbX = ComputeInput(RightThumbX, -AngularVelocity.Z * 1.5f, sensivity, intensity); RightThumbY = ComputeInput(RightThumbY, AngularVelocity.X, sensivity, intensity); break; case InputStyle.LeftStick: - LeftThumbX = ComputeInput(LeftThumbX, -AngularVelocity.Z, sensivity, intensity); + LeftThumbX = ComputeInput(LeftThumbX, -AngularVelocity.Z * 1.5f, sensivity, intensity); LeftThumbY = ComputeInput(LeftThumbY, AngularVelocity.X, sensivity, intensity); break; }