Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

Commit

Permalink
Some refactoring and clean-up for new release
Browse files Browse the repository at this point in the history
  • Loading branch information
@nefarius
nefarius committed Nov 15, 2015
1 parent 0d902e1 commit 0270b1e
Show file tree
Hide file tree
Showing 20 changed files with 60 additions and 32 deletions.
8 changes: 4 additions & 4 deletions Installer/ScpToolkit Setup.aip
View file
Expand Up @@ -14,10 +14,10 @@
<ROW Property="ARPURLUPDATEINFO" Value="https://github.com/nefarius/ScpServer/releases"/>
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="Nefarius Software Solutions"/>
<ROW Property="ProductCode" Value="1033:{EF07F893-60A8-42A2-80C9-1AAED84FCA6B} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{6BB03E02-6814-43EF-BCDF-A2D7216F4CDD} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="ScpToolkit"/>
<ROW Property="ProductVersion" Value="1.6.124.15318" Type="32"/>
<ROW Property="ProductVersion" Value="1.6.126.15319" Type="32"/>
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
<ROW Property="UpgradeCode" Value="{541750FB-F05E-4F6A-AB9A-69A633D3D681}"/>
Expand Down Expand Up @@ -613,8 +613,8 @@
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
<ROW SearchKey="B63_41B8_9CB7_8C5E07C0FC18_Version" Prereq="B63_41B8_9CB7_8C5E07C0FC18_" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\10.0\red\amd64\1033\Version" VerMin="40219.325" Order="1" Property="PreReqSearch_B63_41B8_9CB7_8C5E07C0FC18_"/>
<ROW SearchKey="BAEAC99E_37AC_4DB1_8AA2_D0B4B5C09ED4Version" Prereq="BAEAC99E_37AC_4DB1_8AA2_D0B4B5C09ED4" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DirectX\Version" VerMin="4.09.00.0904" Order="1" Property="PreReqSearch_BAEAC99E_37AC_4DB1_8AA2_D0B4B5C09ED4"/>
<ROW SearchKey="CA62D813A4E74FA2AAE86A7D7B7B1493Version" Prereq="CA62D813A4E74FA2AAE86A7D7B7B1493" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum\Version" VerMin="12.0.21005" Order="1" Property="PreReqSearch_CA62D813A4E74FA2AAE86A7D7B7B1493"/>
<ROW SearchKey="BAEAC99E_37AC_4DB1_8AA2_D0B4B5C09ED4Version" Prereq="BAEAC99E_37AC_4DB1_8AA2_D0B4B5C09ED4" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DirectX\Version" VerMin="4.09.00.0904" Order="1" Property="PreReqSearch_BAEAC99E_37AC_4DB1_8AA2_D0B4B5C09ED4" Platform="1"/>
<ROW SearchKey="CA62D813A4E74FA2AAE86A7D7B7B1493Version" Prereq="CA62D813A4E74FA2AAE86A7D7B7B1493" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum\Version" VerMin="12.0.21005" Order="1" Property="PreReqSearch_CA62D813A4E74FA2AAE86A7D7B7B1493" Platform="1"/>
<ROW SearchKey="CB585686_DAA3_4384_BDDF_08ABA631E9F3_Version" Prereq="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\10.0\red\x86\1033\Version" VerMin="40219.325" Order="1" Property="PreReqSearch_CB585686_DAA3_4384_BDDF_08ABA631E9F3_"/>
<ROW SearchKey="D564007E3BBE4F85950A09B470A7CA65Version" Prereq="D564007E3BBE4F85950A09B470A7CA65" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum\Version" VerMin="12.0.21005" Order="1" Property="PreReqSearch_D564007E3BBE4F85950A09B470A7CA65"/>
<ROW SearchKey="F7FB4AD7F09F46EF88CE1FACFB376EB1Release" Prereq="F7FB4AD7F09F46EF88CE1FACFB376EB1" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G378757" Order="1" Property="PreReqSearch_F7FB4AD7F09F46EF88CE1FACFB376EB1"/>
Expand Down
4 changes: 2 additions & 2 deletions ScpCleanWipe/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
2 changes: 1 addition & 1 deletion ScpControl/Plugins/Mapper/RetroArchProfile.script.cs
View file
Expand Up @@ -39,7 +39,7 @@ public string Author

public bool IsActive
{
get { return true; }
get { return false; }
}
}
}
5 changes: 5 additions & 0 deletions ScpControl/Profiler/ScpHidReport.cs
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ScpControl/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
2 changes: 1 addition & 1 deletion ScpControl/ScpControl.csproj
View file
Expand Up @@ -23,7 +23,7 @@
<AssemblyInfoVersionSettings>
</AssemblyInfoVersionSettings>
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
<AssemblyVersion>1.6.124.15318</AssemblyVersion>
<AssemblyVersion>1.6.126.15319</AssemblyVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
7 changes: 7 additions & 0 deletions ScpControl/ScpProxy.cs
View file
Expand Up @@ -92,10 +92,12 @@ public SCP_EXTN GetExtended(uint dwUserIndex)

private readonly IDictionary<DsPadId, ScpHidReport> _packetCache = new Dictionary<DsPadId, ScpHidReport>();

[Obsolete]
private XmlDocument _xmlMap = new XmlDocument();

private IScpCommandService _rootHub;

[Obsolete]
private readonly XmlMapper _xmlMapper = new XmlMapper();

#endregion
Expand All @@ -104,6 +106,7 @@ public SCP_EXTN GetExtended(uint dwUserIndex)

public bool IsActive { get; private set; }

[Obsolete]
public XmlMapper Mapper
{
get { return _xmlMapper; }
Expand Down Expand Up @@ -149,6 +152,7 @@ public void WriteConfig(GlobalConfiguration config)
_rootHub.SubmitConfiguration(config);
}

[Obsolete]
public bool Save()
{
var saved = false;
Expand All @@ -173,6 +177,7 @@ public bool Save()
return saved;
}

[Obsolete]
public bool Select(Profile target)
{
var selected = false;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -259,6 +265,7 @@ public bool Remap(string target, DsPacket packet)
return remapped;
}

[Obsolete]
public bool SetDefault(Profile profile)
{
var set = true;
Expand Down
6 changes: 5 additions & 1 deletion ScpControl/Usb/Gamepads/UsbGameStopPcAdvanced.cs
View file
@@ -1,4 +1,5 @@
using ScpControl.ScpCore;
using System.Net.NetworkInformation;
using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 5 additions & 1 deletion ScpControl/Usb/Gamepads/UsbLsiLogicGamepad.cs
View file
@@ -1,4 +1,5 @@
using ScpControl.ScpCore;
using System.Net.NetworkInformation;
using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 5 additions & 1 deletion ScpControl/Usb/Gamepads/UsbShanWanWirelessGamepad.cs
View file
@@ -1,4 +1,5 @@
using ScpControl.ScpCore;
using System.Net.NetworkInformation;
using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 5 additions & 1 deletion ScpControl/Usb/Gamepads/UsbSnesGamepad.cs
View file
@@ -1,4 +1,5 @@
using ScpControl.ScpCore;
using System.Net.NetworkInformation;
using ScpControl.ScpCore;
using Ds3Axis = ScpControl.Profiler.Ds3Axis;
using Ds3Button = ScpControl.Profiler.Ds3Button;

Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ScpDebugInfoCollector/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpDriverInstaller/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpGamepadAnalyzer/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpMonitor/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpPair/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpServer/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpService/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpSettings/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]
4 changes: 2 additions & 2 deletions ScpXInputBridge/Properties/CommonInfo.cs
View file
Expand Up @@ -12,5 +12,5 @@

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("1.6.124.15318")]
[assembly: AssemblyFileVersion("1.6.124.15318")]
[assembly: AssemblyVersion("1.6.126.15319")]
[assembly: AssemblyFileVersion("1.6.126.15319")]

0 comments on commit 0270b1e

Please sign in to comment.