Some rework

Author: patrick-dmxc

ArtNetSharp.sln

@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeOutputExample", "Exampl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeInputExample", "Examples\NodeInputExample\NodeInputExample.csproj", "{9CCE08DE-6ED6-4A19-AB0D-C01413A2E5D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlerRDMExample", "Examples\ControlerRDMExample\ControlerRDMExample.csproj", "{90BF6833-7425-4D6B-A8F9-8487A60F1B78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeOutputRDMExample", "Examples\NodeOutputRDMExample\NodeOutputRDMExample.csproj", "{90BF6833-7425-4D6B-A8F9-8487A60F1B78}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigExample", "Examples\ConfigExample\ConfigExample.csproj", "{DF3AFD9A-0629-43C9-AAC6-5EF22728C5E8}"
 EndProject

ArtNetSharp/Communication/AbstractInstance.cs

@@ -250,8 +250,8 @@ public void Dispose()
         private readonly ConcurrentDictionary<UID, RDMUID_ReceivedBag> knownRDMUIDs = new ConcurrentDictionary<UID, RDMUID_ReceivedBag>();
         public IReadOnlyCollection<RDMUID_ReceivedBag> KnownRDMUIDs;
         public event EventHandler<RDMUID_ReceivedBag> RDMUIDReceived;
-        public event EventHandler<ResponderRDMMessageReceivedEventArgs> ResponderRDMMessageReceived;
-        public event EventHandler<ControllerRDMMessageReceivedEventArgs> ControllerRDMMessageReceived;
+        public event EventHandler<ResponseRDMMessageReceivedEventArgs> ResponseRDMMessageReceived;
+        public event EventHandler<RequestRDMMessageReceivedEventArgs> RequestRDMMessageReceived;
 
         internal static readonly SendPollThreadBag sendPollThreadBag = new SendPollThreadBag();
 
@@ -1027,16 +1027,16 @@ private async void processArtRDM(ArtRDM artRDM, IPv4Address source)
             {
                 if (!artRDM.RDMMessage.Command.HasFlag(ERDM_Command.RESPONSE))
                 {
-                    var eventArgs = new ControllerRDMMessageReceivedEventArgs(artRDM.RDMMessage, artRDM.PortAddress);
-                    ControllerRDMMessageReceived?.InvokeFailSafe(this, eventArgs);
+                    var eventArgs = new RequestRDMMessageReceivedEventArgs(artRDM.RDMMessage, artRDM.PortAddress);
+                    RequestRDMMessageReceived?.InvokeFailSafe(this, eventArgs);
                     if (eventArgs.Handled)
                         await sendArtRDM(eventArgs.Response, artRDM.PortAddress, source);
                 }
                 else
                 {
-                    var eventArgs = new ResponderRDMMessageReceivedEventArgs(artRDM.RDMMessage, artRDM.PortAddress);
+                    var eventArgs = new ResponseRDMMessageReceivedEventArgs(artRDM.RDMMessage, artRDM.PortAddress);
 
-                    ResponderRDMMessageReceived?.InvokeFailSafe(this, eventArgs);
+                    ResponseRDMMessageReceived?.InvokeFailSafe(this, eventArgs);
                 }
             }
             catch (Exception ex) { Logger.LogError(ex); }

ArtNetSharp/Communication/NodeInstance.cs

@@ -4,13 +4,16 @@ namespace ArtNetSharp.Communication
 {
     public class NodeInstance : AbstractInstance
     {
-        public NodeInstance(ArtNet _artnet) : base(_artnet)
+        public NodeInstance(ArtNet _artnet, bool supportRDM = false) : base(_artnet)
         {
+            this.supportRDM = supportRDM;
         }
 
         public sealed override EStCodes EstCodes => EStCodes.StNode;
         protected sealed override bool SendArtPollBroadcast => false;
         protected sealed override bool SendArtPollTargeted => true;
+        private bool supportRDM = false;
+        protected override bool SupportRDM => supportRDM;
 
         protected override void OnPacketReceived(AbstractArtPacketCore packet, IPv4Address localIp, IPv4Address sourceIp)
         {

ArtNetSharp/Misc/RDMMessageReceivedEventArgs.cs

@@ -3,13 +3,13 @@
 
 namespace ArtNetSharp.Misc
 {
-    public class ControllerRDMMessageReceivedEventArgs : EventArgs
+    public class RequestRDMMessageReceivedEventArgs : EventArgs
     {
         public readonly RDMMessage Request;
         public bool Handled { get => Response != null; }
         public RDMMessage Response;
         public readonly PortAddress PortAddress;
-        public ControllerRDMMessageReceivedEventArgs(in RDMMessage request, in PortAddress portAddress)
+        public RequestRDMMessageReceivedEventArgs(in RDMMessage request, in PortAddress portAddress)
         {
             this.Request = request;
             this.PortAddress = portAddress;
@@ -25,11 +25,11 @@ public void SetResponse(RDMMessage response)
             }
         }
     }
-    public class ResponderRDMMessageReceivedEventArgs : EventArgs
+    public class ResponseRDMMessageReceivedEventArgs : EventArgs
     {
         public readonly RDMMessage Response;
         public readonly PortAddress PortAddress;
-        public ResponderRDMMessageReceivedEventArgs(RDMMessage response, in PortAddress portAddress)
+        public ResponseRDMMessageReceivedEventArgs(RDMMessage response, in PortAddress portAddress)
         {
             this.Response = response;
             this.PortAddress = portAddress;

ArtNetTests/ObjectTypesTests.cs

@@ -480,9 +480,9 @@ public void TestGoodInput()
             Assert.That(c, Is.EqualTo(b));
         }
         [Test]
-        public void TestControllerRDMMessageReceivedEventArgs()
+        public void TestRequestRDMMessageReceivedEventArgs()
         {
-            var e = new ControllerRDMMessageReceivedEventArgs(new RDMMessage() { Command = ERDM_Command.SET_COMMAND, Parameter = ERDM_Parameter.CURVE }, new PortAddress(123));
+            var e = new RequestRDMMessageReceivedEventArgs(new RDMMessage() { Command = ERDM_Command.SET_COMMAND, Parameter = ERDM_Parameter.CURVE }, new PortAddress(123));
 
             Assert.That(e.Handled, Is.False);
             e.SetResponse(new RDMMessage() { Command = ERDM_Command.SET_COMMAND_RESPONSE, Parameter = ERDM_Parameter.CURVE });

…lerRDMExample/ControlerRDMExample.csproj …utRDMExample/NodeOutputRDMExample.csprojExamples/ControlerRDMExample/ControlerRDMExample.csproj renamed to Examples/NodeOutputRDMExample/NodeOutputRDMExample.csproj Examples/ControlerRDMExample/ControlerRDMExample.csproj renamed to Examples/NodeOutputRDMExample/NodeOutputRDMExample.csproj

@@ -4,7 +4,7 @@
 using org.dmxc.wkdt.Light.RDM;
 using System.Collections.Concurrent;
 
-Console.WriteLine("Controller RDM Example!");
+Console.WriteLine("Node RDM Example!");
 
 //Add Logging
 //ArtNet.SetLoggerFectory(YOUR_LOGGER_FACTORY);
@@ -14,13 +14,13 @@
 //ArtNet.Instance.NetworkClients.ToList().ForEach(ncb => ncb.Enabled = IPAddress.Equals(broadcastIp, ncb.BroadcastIpAddress));
 
 // Create Instance
-ControllerInstance controllerInstance = new ControllerInstance(ArtNet.Instance);
-controllerInstance.Name = controllerInstance.ShortName = "Controller RDM Example";
+NodeInstance nodeInstance = new NodeInstance(ArtNet.Instance, true);
+nodeInstance.Name = nodeInstance.ShortName = "Node RDM Example";
 ConcurrentDictionary<UID, TestRDMDevice> devices = new();
 
 
 // Add Instance
-ArtNet.Instance.AddInstance(controllerInstance);
+ArtNet.Instance.AddInstance(nodeInstance);
 
 // Configure Ports
 for (ushort i = 1; i <= 1; i++)
@@ -29,8 +29,8 @@
     {
         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(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 });
+        nodeInstance.AddPortConfig(outputConfig);
+        nodeInstance.AddPortConfig(new PortConfig((byte)(i + 4), new PortAddress((ushort)(i - 1)), false, true) { PortNumber = (byte)i, Type = EPortType.InputToArtNet | EPortType.ArtNet });
     }
     catch (Exception ex)
     {