Skip to content

Commit

Permalink
Use shared HighPerfComm
Browse files Browse the repository at this point in the history
  • Loading branch information
HakanL committed Dec 2, 2024
1 parent 4ef9807 commit ac5598e
Show file tree
Hide file tree
Showing 9 changed files with 120 additions and 378 deletions.
8 changes: 8 additions & 0 deletions src/Haukcode.sACN/Haukcode.sACN.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,20 @@
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Haukcode.Network" Version="1.0.10" />
<PackageReference Include="HdrHistogram" Version="2.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Haukcode.HighPerfComm\src\Haukcode.HighPerfComm.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/Haukcode.sACN/Internal/ReceiveDataBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ public abstract class ReceiveDataBase
{
public double TimestampMS { get; set; }

public IPEndPoint Source { get; set; }
public IPEndPoint Source { get; set; } = null!;

public IPEndPoint Destination { get; set; }
public IPEndPoint Destination { get; set; } = null!;
}
}
2 changes: 1 addition & 1 deletion src/Haukcode.sACN/Internal/ReceiveDataPacket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ namespace Haukcode.sACN
{
public class ReceiveDataPacket : ReceiveDataBase
{
public SACNPacket Packet { get; set; }
public SACNPacket Packet { get; set; } = null!;
}
}
12 changes: 0 additions & 12 deletions src/Haukcode.sACN/Internal/ReceiveDataRaw.cs

This file was deleted.

14 changes: 0 additions & 14 deletions src/Haukcode.sACN/Internal/SendData.cs

This file was deleted.

19 changes: 0 additions & 19 deletions src/Haukcode.sACN/Internal/SendStatistics.cs

This file was deleted.

6 changes: 3 additions & 3 deletions src/Haukcode.sACN/Model/DataFramingLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ public class DataFramingLayer : FramingLayer
{
public const int SourceNameLength = 64;

public DMPLayer DMPLayer { get; set; }
public DMPLayer DMPLayer { get; set; } = null!;

public override ushort Length { get { return (ushort)(13 + SourceNameLength + DMPLayer.Length); } }

public string SourceName { get; set; }
public string SourceName { get; set; } = null!;

public ushort UniverseId { get; set; }

public byte Priority { get; set; }

public ushort SyncAddress { get; set; }

public FramingOptions Options { get; set; }
public FramingOptions Options { get; set; } = null!;

public override int RootVector => RootLayer.VECTOR_ROOT_E131_DATA;

Expand Down
2 changes: 1 addition & 1 deletion src/Haukcode.sACN/Model/RootLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class RootLayer
public const int VECTOR_ROOT_E131_DATA = 0x00000004;
public const int VECTOR_ROOT_E131_EXTENDED = 0x00000008;

public FramingLayer FramingLayer { get; set; }
public FramingLayer FramingLayer { get; set; } = null!;

public short Length { get { return (short)(38 + FramingLayer.Length); } }

Expand Down
Loading

0 comments on commit ac5598e

Please sign in to comment.