grr

Author: patrick-dmxc

ArtNetSharp.sln

@@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlerRDMExample", "Exam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigExample", "Examples\ConfigExample\ConfigExample.csproj", "{DF3AFD9A-0629-43C9-AAC6-5EF22728C5E8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RDMSharp", "..\RDMSharp\RDMSharp\RDMSharp.csproj", "{B8B6AF43-84E1-B0C5-61AF-870EA9D6C85A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
 		{DF3AFD9A-0629-43C9-AAC6-5EF22728C5E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF3AFD9A-0629-43C9-AAC6-5EF22728C5E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF3AFD9A-0629-43C9-AAC6-5EF22728C5E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8B6AF43-84E1-B0C5-61AF-870EA9D6C85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8B6AF43-84E1-B0C5-61AF-870EA9D6C85A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8B6AF43-84E1-B0C5-61AF-870EA9D6C85A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8B6AF43-84E1-B0C5-61AF-870EA9D6C85A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ArtNetSharp/ArtNetSharp.csproj

@@ -33,7 +33,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="DMXControlProjects.WellKnownDataTypes" Version="0.0.4" />
-		<PackageReference Include="RDMSharp" Version="0.0.14" />
+		<ProjectReference Include="..\..\RDMSharp\RDMSharp\RDMSharp.csproj" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />

ArtNetTests/Mocks/ControllerInstanceMock.cs

@@ -1,7 +1,6 @@
 using ArtNetSharp;
 using ArtNetSharp.Communication;
 using org.dmxc.wkdt.Light.RDM;
-using RDMSharp.ParameterWrapper;
 
 namespace ArtNetTests.Mocks
 {
@@ -13,7 +12,7 @@ public override ushort OEMProductCode
             get { return this._oemProductCode; }
         }
         public override ushort ESTAManufacturerCode => (ushort)Tools.ParseDotNetMajorVersion();
-        public override UID UID => new UID((ushort)EManufacturer.DMXControlProjects_eV, 12314);
+        public override UID UID => new UID(0x02b0, 12314);
 
         public ControllerInstanceMock(ArtNet artnet, ushort oemProductCode = Constants.DEFAULT_OEM_CODE) : base(artnet)
         {

ArtNetTests/Mocks/RDMDeviceMock.cs

@@ -250,8 +250,8 @@ public void ArtNzs()
         {
             PackagesSerializeDeserialize.doTests(new ArtNzs(53, 0xED, 2, new Address(3, 4), new byte[] { 1, 2, 3, 44, 55, 66, 88, 222, 111, 0x33 }));
 
-            Assert.Throws(typeof(ArgumentException), () => new ArtNzs(53, Constants.DMX_STARTCODE, 2, new Address(3, 4), new byte[] { 1, 2, 3, 44, 55, 66, 88, 222, 111, 0x33 }));
-            Assert.Throws(typeof(ArgumentException), () => new ArtNzs(53, Constants.RDM_STARTCODE, 2, new Address(3, 4), new byte[] { 1, 2, 3, 44, 55, 66, 88, 222, 111, 0x33 }));
+            Assert.Throws(typeof(ArgumentException), () => new ArtNzs(53, ArtNetSharp.Constants.DMX_STARTCODE, 2, new Address(3, 4), new byte[] { 1, 2, 3, 44, 55, 66, 88, 222, 111, 0x33 }));
+            Assert.Throws(typeof(ArgumentException), () => new ArtNzs(53, ArtNetSharp.Constants.RDM_STARTCODE, 2, new Address(3, 4), new byte[] { 1, 2, 3, 44, 55, 66, 88, 222, 111, 0x33 }));
         }
         [Test]
         public void ArtVlc()

ArtNetTests/PackagesSerializeDeserialize.cs

@@ -23,12 +23,12 @@
 ArtNet.Instance.AddInstance(controllerInstance);
 
 // Configure Ports
-for (ushort i = 1; i <= 4; i++)
+for (ushort i = 1; i <= 1; i++)
 {
     try
     {
         var outputConfig = new PortConfig((byte)i, new PortAddress((ushort)(i - 1)), true, false) { PortNumber = (byte)i, Type = EPortType.OutputFromArtNet, GoodOutput = new GoodOutput(outputStyle: GoodOutput.EOutputStyle.Continuous, isBeingOutputAsDMX: true), };
-        outputConfig.AddAdditionalRdmUIDs(generateUIDs());
+        outputConfig.AddAdditionalRdmUIDs(generateUIDs(i));
         controllerInstance.AddPortConfig(outputConfig);
         controllerInstance.AddPortConfig(new PortConfig((byte)(i + 4), new PortAddress((ushort)(i - 1)), false, true) { PortNumber = (byte)i, Type = EPortType.InputToArtNet | EPortType.ArtNet });
     }
@@ -38,12 +38,12 @@
     }
 }
 
-UID[] generateUIDs()
+UID[] generateUIDs(ushort port)
 {
-    UID[] uids = new UID[30];
+    UID[] uids = new UID[5];
     for (int i = 0; i < uids.Length; i++)
     {
-        var uid = new UID(0x9fff, (uint)devices.Count + 1);
+        var uid = new UID(0x9fff, (uint)(devices.Count + 1 + (1000 * port)));
         devices.TryAdd(uid, new TestRDMDevice(uid));
         uids[i] = uid;
     }