Skip to content

Add MinimimumSamplingInterval when applicable. #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Archie-Miller merged 3 commits into from
Jul 30, 2025
Merged

Add MinimimumSamplingInterval when applicable. #124

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8804211
Add MinimimumSamplingInterval when applicable.
Archie-Miller Jul 30, 2025
323dec7
Merge branch 'main' into 121_MinimumSamplingInterval
Archie-Miller Jul 30, 2025
e9c9cff
Merge branch 'main' into 121_MinimumSamplingInterval
Archie-Miller Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NodeSetToAML.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3380,6 +3380,11 @@ InternalElementType RecursiveAddModifyInstance<T>(ref T parent, UANode toAdd, bo

AddModifyAttribute( ie.Attribute, "ValueRank", "Int32", varnode.ValueRank );
SetArrayDimensions( ie, varnode.ArrayDimensions );

if (varnode.MinimumSamplingInterval > 0)
{
AddModifyAttribute(ie.Attribute, "MinimumSamplingInterval", "Double", varnode.MinimumSamplingInterval);
}
}

if( toAdd.DecodedNodeId.Equals( Opc.Ua.ObjectIds.Server_ServerDiagnostics ) )
Expand Down
35 changes: 34 additions & 1 deletion SystemTest/NodeSetFiles/TestAml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3250,11 +3250,44 @@
</Value>
</UAVariable>

<UAVariable DataType="Int32" NodeId="ns=1;i=6235" BrowseName="1:NegativeMinimumSamplingInterval" AccessLevel="3" MinimumSamplingInterval="-1">
<DisplayName>NegativeMinimumSamplingInterval</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=63</Reference>
<Reference ReferenceType="Organizes" IsForward="false">ns=1;i=5013</Reference>
</References>
<Value>
<uax:Int32>-1</uax:Int32>
</Value>
</UAVariable>

<UAVariable DataType="Int32" NodeId="ns=1;i=6236" BrowseName="1:ZeroMinimumSamplingInterval" AccessLevel="3" MinimumSamplingInterval="0">
<DisplayName>ZeroMinimumSamplingInterval</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=63</Reference>
<Reference ReferenceType="Organizes" IsForward="false">ns=1;i=5013</Reference>
</References>
<Value>
<uax:Int32>0</uax:Int32>
</Value>
</UAVariable>

<UAVariable DataType="Int32" NodeId="ns=1;i=6237" BrowseName="1:PositiveMinimumSamplingInterval" AccessLevel="3" MinimumSamplingInterval="1">
<DisplayName>PositiveMinimumSamplingInterval</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=63</Reference>
<Reference ReferenceType="Organizes" IsForward="false">ns=1;i=5013</Reference>
</References>
<Value>
<uax:Int32>1</uax:Int32>
</Value>
</UAVariable>

<!-- Next Numbers
ObjectType 1009
VariableType 2001
DataType 3004
Object 5025
Variable 6235
Variable 6238
-->
</UANodeSet>
7 changes: 6 additions & 1 deletion SystemTest/TestAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.IO;
using Aml.Engine.AmlObjects;
using Aml.Engine.CAEX;
Expand Down Expand Up @@ -43,6 +43,11 @@ public class TestAttributes
[DataRow("IsAbstract", "2881", "false",
true, true, DisplayName = "AcknowledgeableConditionType should not be Abstract")]

[DataRow("MinimumSamplingInterval", "2253", "",
false, true, DisplayName = "Server should not have MinimumSamplingInterval")]
[DataRow("MinimumSamplingInterval", "2994", "1000",
true, true, DisplayName = "Auditing should have MinimumSamplingInterval")]

[DataRow("ValueRank", "62", "-2",
true, true, DisplayName = "BaseVariableType ValueRank -2")]
[DataRow("ValueRank", "58", "",
Expand Down