diff --git a/Installer/ScpToolkit Setup.aip b/Installer/ScpToolkit Setup.aip
index d2445cba..5c21b00b 100644
--- a/Installer/ScpToolkit Setup.aip
+++ b/Installer/ScpToolkit Setup.aip
@@ -14,10 +14,10 @@
|
|
|
- |
+ |
|
|
- |
+ |
|
|
|
@@ -613,8 +613,8 @@
|
- |
- |
+ |
+ |
|
|
|
diff --git a/ScpCleanWipe/Properties/CommonInfo.cs b/ScpCleanWipe/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpCleanWipe/Properties/CommonInfo.cs
+++ b/ScpCleanWipe/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpControl/Plugins/Mapper/RetroArchProfile.script.cs b/ScpControl/Plugins/Mapper/RetroArchProfile.script.cs
index 1d65e255..c9cebb08 100644
--- a/ScpControl/Plugins/Mapper/RetroArchProfile.script.cs
+++ b/ScpControl/Plugins/Mapper/RetroArchProfile.script.cs
@@ -39,7 +39,7 @@ public string Author
public bool IsActive
{
- get { return true; }
+ get { return false; }
}
}
}
\ No newline at end of file
diff --git a/ScpControl/Profiler/ScpHidReport.cs b/ScpControl/Profiler/ScpHidReport.cs
index b9c4cde8..0e5806a0 100644
--- a/ScpControl/Profiler/ScpHidReport.cs
+++ b/ScpControl/Profiler/ScpHidReport.cs
@@ -123,6 +123,11 @@ public PhysicalAddress PadMacAddress
// last 6 bytes contain the PADs MAC address
return new PhysicalAddress(RawBytes.Skip(Math.Max(0, RawBytes.Length - 6)).ToArray());
}
+ set
+ {
+ if (value != null)
+ Buffer.BlockCopy(value.GetAddressBytes(), 0, RawBytes, 90, 6);
+ }
}
public uint PacketCounter
diff --git a/ScpControl/Properties/CommonInfo.cs b/ScpControl/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpControl/Properties/CommonInfo.cs
+++ b/ScpControl/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpControl/ScpControl.csproj b/ScpControl/ScpControl.csproj
index 33ebeaf3..06101170 100644
--- a/ScpControl/ScpControl.csproj
+++ b/ScpControl/ScpControl.csproj
@@ -23,7 +23,7 @@
AssemblyVersionAttribute
- 1.6.124.15318
+ 1.6.126.15319
true
diff --git a/ScpControl/ScpProxy.cs b/ScpControl/ScpProxy.cs
index afcb24b9..d777deb6 100644
--- a/ScpControl/ScpProxy.cs
+++ b/ScpControl/ScpProxy.cs
@@ -92,10 +92,12 @@ public SCP_EXTN GetExtended(uint dwUserIndex)
private readonly IDictionary _packetCache = new Dictionary();
+ [Obsolete]
private XmlDocument _xmlMap = new XmlDocument();
private IScpCommandService _rootHub;
+ [Obsolete]
private readonly XmlMapper _xmlMapper = new XmlMapper();
#endregion
@@ -104,6 +106,7 @@ public SCP_EXTN GetExtended(uint dwUserIndex)
public bool IsActive { get; private set; }
+ [Obsolete]
public XmlMapper Mapper
{
get { return _xmlMapper; }
@@ -149,6 +152,7 @@ public void WriteConfig(GlobalConfiguration config)
_rootHub.SubmitConfiguration(config);
}
+ [Obsolete]
public bool Save()
{
var saved = false;
@@ -173,6 +177,7 @@ public bool Save()
return saved;
}
+ [Obsolete]
public bool Select(Profile target)
{
var selected = false;
@@ -217,6 +222,7 @@ public bool Rumble(DsPadId pad, byte large, byte small)
return _rootHub.Rumble(pad, large, small);
}
+ [Obsolete]
public bool Remap(string target, DsPacket packet)
{
var remapped = false;
@@ -259,6 +265,7 @@ public bool Remap(string target, DsPacket packet)
return remapped;
}
+ [Obsolete]
public bool SetDefault(Profile profile)
{
var set = true;
diff --git a/ScpControl/Usb/Gamepads/UsbGameStopPcAdvanced.cs b/ScpControl/Usb/Gamepads/UsbGameStopPcAdvanced.cs
index b4409436..55e772ea 100644
--- a/ScpControl/Usb/Gamepads/UsbGameStopPcAdvanced.cs
+++ b/ScpControl/Usb/Gamepads/UsbGameStopPcAdvanced.cs
@@ -1,4 +1,5 @@
-using ScpControl.ScpCore;
+using System.Net.NetworkInformation;
+using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;
@@ -29,6 +30,9 @@ protected override void ParseHidReport(byte[] report)
// packet counter
InputReport.PacketCounter = PacketCounter;
+ // set fake MAC address
+ InputReport.PadMacAddress = PhysicalAddress.Parse(m_Mac.Replace(":", string.Empty));
+
// reset buttons
InputReport.ZeroSelectStartButtonsState();
InputReport.ZeroShoulderButtonsState();
diff --git a/ScpControl/Usb/Gamepads/UsbLsiLogicGamepad.cs b/ScpControl/Usb/Gamepads/UsbLsiLogicGamepad.cs
index 590326f8..a8500912 100644
--- a/ScpControl/Usb/Gamepads/UsbLsiLogicGamepad.cs
+++ b/ScpControl/Usb/Gamepads/UsbLsiLogicGamepad.cs
@@ -1,4 +1,5 @@
-using ScpControl.ScpCore;
+using System.Net.NetworkInformation;
+using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;
@@ -27,6 +28,9 @@ protected override void ParseHidReport(byte[] report)
// packet counter
InputReport.PacketCounter = PacketCounter;
+ // set fake MAC address
+ InputReport.PadMacAddress = PhysicalAddress.Parse(m_Mac.Replace(":", string.Empty));
+
// null button states
InputReport.ZeroPsButtonState();
InputReport.ZeroSelectStartButtonsState();
diff --git a/ScpControl/Usb/Gamepads/UsbShanWanWirelessGamepad.cs b/ScpControl/Usb/Gamepads/UsbShanWanWirelessGamepad.cs
index 1abf231a..300f28a8 100644
--- a/ScpControl/Usb/Gamepads/UsbShanWanWirelessGamepad.cs
+++ b/ScpControl/Usb/Gamepads/UsbShanWanWirelessGamepad.cs
@@ -1,4 +1,5 @@
-using ScpControl.ScpCore;
+using System.Net.NetworkInformation;
+using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;
@@ -26,6 +27,9 @@ protected override void ParseHidReport(byte[] report)
// packet counter
InputReport.PacketCounter = PacketCounter;
+
+ // set fake MAC address
+ InputReport.PadMacAddress = PhysicalAddress.Parse(m_Mac.Replace(":", string.Empty));
// reset buttons
InputReport.ZeroSelectStartButtonsState();
diff --git a/ScpControl/Usb/Gamepads/UsbSnesGamepad.cs b/ScpControl/Usb/Gamepads/UsbSnesGamepad.cs
index b7074a81..a1e1b119 100644
--- a/ScpControl/Usb/Gamepads/UsbSnesGamepad.cs
+++ b/ScpControl/Usb/Gamepads/UsbSnesGamepad.cs
@@ -1,4 +1,5 @@
-using ScpControl.ScpCore;
+using System.Net.NetworkInformation;
+using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;
@@ -29,6 +30,9 @@ protected override void ParseHidReport(byte[] report)
// packet counter
InputReport.PacketCounter = PacketCounter;
+ // set fake MAC address
+ InputReport.PadMacAddress = PhysicalAddress.Parse(m_Mac.Replace(":", string.Empty));
+
// reset buttons
InputReport.ZeroSelectStartButtonsState();
InputReport.ZeroShoulderButtonsState();
diff --git a/ScpDebugInfoCollector/Properties/CommonInfo.cs b/ScpDebugInfoCollector/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpDebugInfoCollector/Properties/CommonInfo.cs
+++ b/ScpDebugInfoCollector/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpDriverInstaller/Properties/CommonInfo.cs b/ScpDriverInstaller/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpDriverInstaller/Properties/CommonInfo.cs
+++ b/ScpDriverInstaller/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpGamepadAnalyzer/Properties/CommonInfo.cs b/ScpGamepadAnalyzer/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpGamepadAnalyzer/Properties/CommonInfo.cs
+++ b/ScpGamepadAnalyzer/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpMonitor/Properties/CommonInfo.cs b/ScpMonitor/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpMonitor/Properties/CommonInfo.cs
+++ b/ScpMonitor/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpPair/Properties/CommonInfo.cs b/ScpPair/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpPair/Properties/CommonInfo.cs
+++ b/ScpPair/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpServer/Properties/CommonInfo.cs b/ScpServer/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpServer/Properties/CommonInfo.cs
+++ b/ScpServer/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpService/Properties/CommonInfo.cs b/ScpService/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpService/Properties/CommonInfo.cs
+++ b/ScpService/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpSettings/Properties/CommonInfo.cs b/ScpSettings/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpSettings/Properties/CommonInfo.cs
+++ b/ScpSettings/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file
diff --git a/ScpXInputBridge/Properties/CommonInfo.cs b/ScpXInputBridge/Properties/CommonInfo.cs
index 123a58b2..b7186945 100644
--- a/ScpXInputBridge/Properties/CommonInfo.cs
+++ b/ScpXInputBridge/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.6.124.15318")]
-[assembly: AssemblyFileVersion("1.6.124.15318")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.6.126.15319")]
+[assembly: AssemblyFileVersion("1.6.126.15319")]
\ No newline at end of file