Skip to content

Commit 07ddcc7

Browse files
chrizonixchrizonix
committed
Merge branch 'master' of https://github.com/nefarius/ScpToolkit 
2 parents d4859a0 + 3d1e926 commit 07ddcc7

File tree

10 files changed

+54
-33
lines changed

10 files changed

+54
-33
lines changed

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Windows Driver and XInput Wrapper for Sony DualShock 3/4 Controllers
33

44
Follow development progress on [Twitter](https://twitter.com/CNefarius) and [YouTube](https://www.youtube.com/user/nefarius2k8)! Like my stuff? [Support me on Patreon](https://www.patreon.com/nefarius)!
55

6+
[<img src="https://img.shields.io/badge/rating-4%2B%20stars-brightgreen.svg">](https://recordnotfound.com/ScpServer-nefarius-597)
7+
68
## Credits
79
### Community
810
* Major props to [original author Scarlet.Crush](http://forums.pcsx2.net/User-Scarlet-Crush) for developing this awesome toolkit!

‎ScpControl/Properties/Settings.Designer.cs

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScpControl/Properties/Settings.settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Setting Name="DisableSecureSimplePairing" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Boolean" Scope="User">
3030
<Value Profile="(Default)">False</Value>
3131
</Setting>
32-
<Setting Name="IdleTimout" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Int32" Scope="User">
32+
<Setting Name="IdleTimeout" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Int32" Scope="User">
3333
<Value Profile="(Default)">600000</Value>
3434
</Setting>
3535
<Setting Name="Ds3RumbleLatency" Provider="ScpControl.Utilities.PortableSettingsProvider" Type="System.Int32" Scope="User">

‎ScpControl/ScpCore/GlobalConfiguration.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ public bool IsLightBarDisabled
136136

137137
public bool IdleDisconnect
138138
{
139-
get { return Settings.Default.IdleTimout != 0; }
139+
get { return Settings.Default.IdleTimeout != 0; }
140140
}
141141

142142
public int IdleTimeout
143143
{
144-
get { return Settings.Default.IdleTimout; }
145-
set { Settings.Default.IdleTimout = value; }
144+
get { return Settings.Default.IdleTimeout; }
145+
set { Settings.Default.IdleTimeout = value; }
146146
}
147147

148148
public int Latency

‎ScpControl/Usb/Gamepads/UsbGenericGamepad.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,19 @@ public static UsbDevice DeviceFactory(string devicePath)
120120

121121
public override bool Open(string devicePath)
122122
{
123+
short vid, pid;
124+
125+
GetHardwareId(devicePath, out vid, out pid);
126+
123127
var loader = new HidDeviceLoader();
124128

125129
// search for HID
126-
_currentHidDevice = loader.GetDevices(VendorId, ProductId).FirstOrDefault();
130+
_currentHidDevice = loader.GetDevices(vid, pid).FirstOrDefault();
127131

128132
if (_currentHidDevice == null)
129133
{
130134
Log.ErrorFormat("Couldn't find device with VID: {0}, PID: {1}",
131-
VendorId, ProductId);
135+
vid, pid);
132136
return false;
133137
}
134138

‎ScpControl/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<setting name="DisableSecureSimplePairing" serializeAs="String">
4646
<value>False</value>
4747
</setting>
48-
<setting name="IdleTimout" serializeAs="String">
48+
<setting name="IdleTimeout" serializeAs="String">
4949
<value>600000</value>
5050
</setting>
5151
<setting name="Ds3RumbleLatency" serializeAs="String">

‎ScpProfiler/MainWindow.xaml.cs

+9-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@ private void Window_Initialized(object sender, EventArgs e)
3333

3434
MainGrid.DataContext = _vm;
3535

36-
_vm.Profiles = _proxy.GetProfiles().ToList();
36+
var list = _proxy.GetProfiles();
37+
if (list == null)
38+
{
39+
list = new List<DualShockProfile>();
40+
}
41+
else
42+
{
43+
_vm.Profiles = list.ToList();
44+
}
3745
}
3846

3947
private void ProxyOnNativeFeedReceived(object sender, ScpHidReport report)

‎ScpServer/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<setting name="DisableSecureSimplePairing" serializeAs="String">
9494
<value>False</value>
9595
</setting>
96-
<setting name="IdleTimout" serializeAs="String">
96+
<setting name="IdleTimeout" serializeAs="String">
9797
<value>600000</value>
9898
</setting>
9999
<setting name="Ds3RumbleLatency" serializeAs="String">

‎ScpSettings/MainWindow.xaml

+10-9
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,16 @@
120120

121121
<!-- Idle Timeout -->
122122
<GroupBox Header="Idle Timeout: 10 minutes"
123-
x:Name="IdleTimoutGroupBox"
123+
x:Name="IdleTimeoutGroupBox"
124124
Grid.Row="2">
125125
<StackPanel>
126126
<TextBlock>
127127
Defines the timespan after the controller gets shut off automatically if no input changes are received.
128128
</TextBlock>
129129
<Slider Maximum="30"
130-
x:Name="IdleTimoutSlider"
131130
Value="{Binding Path=IdleTimeout}"
132-
ValueChanged="IdleTimoutSlider_ValueChanged"
131+
ValueChanged="IdleTimeoutSlider_ValueChanged"
132+
Name= "IdleTimeoutSlider"
133133
LargeChange="5" SmallChange="1" />
134134
</StackPanel>
135135
</GroupBox>
@@ -185,8 +185,9 @@
185185
Defines the minimal duration the rumble request will be sent to the controller until it stops.
186186
</TextBlock>
187187
<Slider LargeChange="1" Maximum="16"
188-
x:Name="RumbleLatencySlider"
189-
Value="{Binding Path=Latency}" ValueChanged="Slider_ValueChanged" />
188+
Value="{Binding Path=Latency}"
189+
ValueChanged="RumbleLatencySlider_ValueChanged"
190+
Name= "RumbleLatencySlider" />
190191
</StackPanel>
191192
</GroupBox>
192193

@@ -213,12 +214,12 @@
213214

214215
<!-- Adjustment slider -->
215216
<Slider Grid.Column="1"
216-
x:Name="LEDsFlashingPeriodSlider"
217217
TickFrequency="100" Maximum="2000" Minimum="300"
218218
IsSnapToTickEnabled="True"
219219
VerticalAlignment="Center"
220220
Value="{Binding Path=Ds3LEDsPeriod}"
221-
ValueChanged="Slider_LEDsPeriodChanged" />
221+
ValueChanged="LEDsFlashingPeriodSlider_ValueChanged"
222+
Name= "LEDsFlashingPeriodSlider" />
222223

223224
<!-- Maximum value -->
224225
<Label Grid.Column="2">
@@ -339,9 +340,9 @@
339340
Grid.Row="1">
340341
<StackPanel>
341342
<Slider Maximum="255"
342-
x:Name="BrightnessSlider"
343343
Value="{Binding Path=Brightness}" LargeChange="16"
344-
ValueChanged="BrightnessSlider_ValueChanged" SmallChange="1" />
344+
ValueChanged="BrightnessSlider_ValueChanged" SmallChange="1"
345+
Name="BrightnessSlider" />
345346
<TextBlock>
346347
Hint: move the slider all the way to the left to disable the Light Bar entirely.
347348
</TextBlock>

‎ScpSettings/MainWindow.xaml.cs

+18-12
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,29 @@ private void LoadConfig()
8282

8383
DataContext = null;
8484
DataContext = _config;
85+
86+
// Invoke Slider EventHandlers To Correctly Display GroupBox Headers
87+
IdleTimeoutSlider_ValueChanged(null, new RoutedPropertyChangedEventArgs<double> (0, IdleTimeoutSlider.Value));
88+
RumbleLatencySlider_ValueChanged(null, new RoutedPropertyChangedEventArgs<double>(0, RumbleLatencySlider.Value));
89+
LEDsFlashingPeriodSlider_ValueChanged(null, new RoutedPropertyChangedEventArgs<double>(0, LEDsFlashingPeriodSlider.Value));
90+
BrightnessSlider_ValueChanged(null, new RoutedPropertyChangedEventArgs<double>(0, BrightnessSlider.Value));
8591
}
8692

87-
private void IdleTimoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
93+
private void IdleTimeoutSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
8894
{
8995
var value = e.NewValue;
9096

9197
if (value == 0)
9298
{
93-
IdleTimoutGroupBox.Header = "Idle Timeout: Disabled";
99+
IdleTimeoutGroupBox.Header = "Idle Timeout: Disabled";
94100
}
95101
else if (value == 1)
96102
{
97-
IdleTimoutGroupBox.Header = "Idle Timeout: 1 minute";
103+
IdleTimeoutGroupBox.Header = "Idle Timeout: 1 minute";
98104
}
99105
else
100106
{
101-
IdleTimoutGroupBox.Header = string.Format("Idle Timeout: {0} minutes", value);
107+
IdleTimeoutGroupBox.Header = string.Format("Idle Timeout: {0} minutes", value);
102108
}
103109
}
104110

@@ -111,14 +117,14 @@ private void BrightnessSlider_ValueChanged(object sender, RoutedPropertyChangedE
111117
: string.Format("Light Bar Brightness: {0}%", (int)((value * 100) / 255));
112118
}
113119

114-
private void Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
120+
private void RumbleLatencySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
115121
{
116122
var value = ((int)e.NewValue) << 4;
117123

118124
RumbleLatencyGroupBox.Header = string.Format("Rumble Latency: {0} ms", value);
119125
}
120126

121-
private void Slider_LEDsPeriodChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
127+
private void LEDsFlashingPeriodSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
122128
{
123129
var value = (int)e.NewValue;
124130

@@ -195,23 +201,23 @@ private void XInputModToggleButton_Unchecked(object sender, RoutedEventArgs e)
195201

196202
private void DisableEvents()
197203
{
198-
IdleTimoutSlider.ValueChanged -= IdleTimoutSlider_ValueChanged;
204+
IdleTimeoutSlider.ValueChanged -= IdleTimeoutSlider_ValueChanged;
199205
BrightnessSlider.ValueChanged -= BrightnessSlider_ValueChanged;
200206

201-
RumbleLatencySlider.ValueChanged -= Slider_ValueChanged;
202-
LEDsFlashingPeriodSlider.ValueChanged -= Slider_LEDsPeriodChanged;
207+
RumbleLatencySlider.ValueChanged -= RumbleLatencySlider_ValueChanged;
208+
LEDsFlashingPeriodSlider.ValueChanged -= LEDsFlashingPeriodSlider_ValueChanged;
203209

204210
XInputModToggleButton.Checked -= XInputModToggleButton_OnChecked;
205211
XInputModToggleButton.Unchecked -= XInputModToggleButton_Unchecked;
206212
}
207213

208214
private void EnableEvents()
209215
{
210-
IdleTimoutSlider.ValueChanged += IdleTimoutSlider_ValueChanged;
216+
IdleTimeoutSlider.ValueChanged += IdleTimeoutSlider_ValueChanged;
211217
BrightnessSlider.ValueChanged += BrightnessSlider_ValueChanged;
212218

213-
RumbleLatencySlider.ValueChanged += Slider_ValueChanged;
214-
LEDsFlashingPeriodSlider.ValueChanged += Slider_LEDsPeriodChanged;
219+
RumbleLatencySlider.ValueChanged += RumbleLatencySlider_ValueChanged;
220+
LEDsFlashingPeriodSlider.ValueChanged += LEDsFlashingPeriodSlider_ValueChanged;
215221

216222
XInputModToggleButton.Checked += XInputModToggleButton_OnChecked;
217223
XInputModToggleButton.Unchecked += XInputModToggleButton_Unchecked;

0 commit comments

Comments
 (0)