diff options
| author | a1xd <[email protected]> | 2021-01-12 17:01:18 -0500 |
|---|---|---|
| committer | a1xd <[email protected]> | 2021-01-12 17:01:18 -0500 |
| commit | 0e60e22b73dd0693b349cbb63cf9a390c01fd5dd (patch) | |
| tree | 493bfaeb2b59b7db452c52e9ec9713e8b8296510 /grapher/Models/Serialized | |
| parent | Small behavior improvements (diff) | |
| download | rawaccel-0e60e22b73dd0693b349cbb63cf9a390c01fd5dd.tar.xz rawaccel-0e60e22b73dd0693b349cbb63cf9a390c01fd5dd.zip | |
filter raw input based on id
use device id (from device instance) over first hardware id
use buffered method for all ioctls
update gui/DeviceIDManager to match driver behavior
respond to device change events
desync MouseData and PointData accessors
Diffstat (limited to 'grapher/Models/Serialized')
| -rw-r--r-- | grapher/Models/Serialized/RawAccelSettings.cs | 3 | ||||
| -rw-r--r-- | grapher/Models/Serialized/SettingsManager.cs | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs index dcaf864..f4fb1e2 100644 --- a/grapher/Models/Serialized/RawAccelSettings.cs +++ b/grapher/Models/Serialized/RawAccelSettings.cs @@ -125,7 +125,8 @@ namespace grapher.Models.Serialized bool wholeOrNoY = accelSettings.combineMagnitudes || accelSettings.modes.y == AccelMode.noaccel; - return accelSettings.sensitivity.x == 1 && + return string.IsNullOrEmpty(accelSettings.deviceID) && + accelSettings.sensitivity.x == 1 && accelSettings.sensitivity.y == 1 && accelSettings.directionalMultipliers.x <= 0 && accelSettings.directionalMultipliers.y <= 0 && diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs index 4dbf7bf..40652dd 100644 --- a/grapher/Models/Serialized/SettingsManager.cs +++ b/grapher/Models/Serialized/SettingsManager.cs @@ -42,14 +42,14 @@ namespace grapher.Models.Serialized public Field PollRateField { get; private set; } + public DeviceIDManager DeviceIDManager { get; } + private ToolStripMenuItem AutoWriteMenuItem { get; set; } private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; } private ToolStripMenuItem ShowVelocityAndGainMoveMenuItem { get; set; } - private DeviceIDManager DeviceIDManager { get; } - #endregion Properties #region Methods @@ -74,7 +74,6 @@ namespace grapher.Models.Serialized ShowLastMouseMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowLastMouseMove; ShowVelocityAndGainMoveMenuItem.Checked = RawAccelSettings.GUISettings.ShowVelocityAndGain; AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup; - DeviceIDManager.OnStartup(RawAccelSettings.AccelerationSettings.deviceHardwareID); } public SettingsErrors TryUpdateAccel(DriverSettings settings) |