fix: parameter change assignment

eltra-ch · Feb 20, 2025 · c27b258 · c27b258
1 parent 7fb0f29
commit c27b258
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/connect/EltraConnector/Agent/AgentConnector.cs b/connect/EltraConnector/Agent/AgentConnector.cs
@@ -685,6 +685,7 @@ private DeviceVcs FindVcs(EltraDevice device)
                     var vcsDevice = vcs.Item2.Device;
 
                     if (vcsDevice != null &&
+                        vcsDevice.ChannelId == device.ChannelId &&
                         vcsDevice.NodeId == device.NodeId)
                     {
                         result = vcs.Item2;

diff --git a/connect/EltraConnector/Agent/Parameters/ParameterUpdateManager.cs b/connect/EltraConnector/Agent/Parameters/ParameterUpdateManager.cs
@@ -93,23 +93,25 @@ private void ProcessWsMessage(string json)
 
                     if (parameterSet != null && parameterSet.Count > 0)
                     {
-                        foreach (var parameterEntry in parameterSet.Items)
+                        foreach (var parameterUpdateValue in parameterSet.Items)
                         {
-                            OnParameterValueChanged(new ParameterValueChangedEventArgs(parameterEntry.NodeId,
-                                                                                       parameterEntry.Index,
-                                                                                       parameterEntry.SubIndex,
-                                                                                       parameterEntry.ParameterValue));
+                            OnParameterValueChanged(new ParameterValueChangedEventArgs(parameterUpdateValue.ChannelId,
+                                                                                       parameterUpdateValue.NodeId,
+                                                                                       parameterUpdateValue.Index,
+                                                                                       parameterUpdateValue.SubIndex,
+                                                                                       parameterUpdateValue.ParameterValue));
                         }
                     }
                     else
                     {
-                        var parameterEntry = json.TryDeserializeObject<ParameterValueUpdate>();
+                        var parameterValueUpdate = json.TryDeserializeObject<ParameterValueUpdate>();
 
-                        if (parameterEntry != null)
+                        if (parameterValueUpdate != null)
                         {
-                            OnParameterValueChanged(new ParameterValueChangedEventArgs(parameterEntry.NodeId,
-                                                                                       parameterEntry.Index,
-                                                                                       parameterEntry.SubIndex, parameterEntry.ParameterValue));
+                            OnParameterValueChanged(new ParameterValueChangedEventArgs(parameterValueUpdate.ChannelId,
+                                                                                       parameterValueUpdate.NodeId,
+                                                                                       parameterValueUpdate.Index,
+                                                                                       parameterValueUpdate.SubIndex, parameterValueUpdate.ParameterValue));
                         }
                     }
                 });

diff --git a/connect/EltraConnector/Agent/UserAgent/Vcs/DeviceVcs.cs b/connect/EltraConnector/Agent/UserAgent/Vcs/DeviceVcs.cs
@@ -155,8 +155,9 @@ public EltraDevice Device
         private void OnParameterValueChanged(object sender, ParameterValueChangedEventArgs e)
         {
             var objectDictionary = Device?.ObjectDictionary;
+            var channelId = Device?.ChannelId;
 
-            if(objectDictionary!=null)
+            if (objectDictionary != null && e.ChannelId == channelId)
             {
                 var parameterBase = objectDictionary.SearchParameter(e.Index, e.SubIndex);
 

diff --git a/connect/EltraConnector/EltraConnector.csproj b/connect/EltraConnector/EltraConnector.csproj
@@ -21,10 +21,10 @@
 		<Product>Eltra.Connector</Product>		
 		<Description>Eltra - CANOpen based IoT Framework - SDK</Description>
 		<PackageTags>CANOpen IoT Eltra OPCUA OPC</PackageTags>
-        <Version>3.2.3</Version>
-        <AssemblyVersion>3.2.3.0</AssemblyVersion>
+        <Version>3.2.4</Version>
+        <AssemblyVersion>3.2.4.0</AssemblyVersion>
         <PackageIcon>eltra_logo.png</PackageIcon>
-        <FileVersion>3.2.3.0</FileVersion>
+        <FileVersion>3.2.4.0</FileVersion>
         <Configurations>Debug;Release;</Configurations>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
     </PropertyGroup>