diff --git a/Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs b/Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs index e75bfe7eb..9e74db958 100644 --- a/Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs +++ b/Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs @@ -1826,13 +1826,6 @@ public override void CreateAddressSpace( "Array"); const string daAnalogArray = "DataAccess_AnalogType_Array_"; - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "Boolean", - "Boolean", - BuiltInType.Boolean, - ValueRanks.OneDimension, - s_booleanArray); CreateAnalogItemVariable( analogArrayFolder, daAnalogArray + "Byte", @@ -1840,43 +1833,6 @@ public override void CreateAddressSpace( BuiltInType.Byte, ValueRanks.OneDimension, new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "ByteString", - "ByteString", - BuiltInType.ByteString, - ValueRanks.OneDimension, - new byte[][] - { - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "DateTime", - "DateTime", - BuiltInType.DateTime, - ValueRanks.OneDimension, - new DateTime[] - { - DateTime.MinValue, - DateTime.MaxValue, - DateTime.MinValue, - DateTime.MaxValue, - DateTime.MinValue, - DateTime.MaxValue, - DateTime.MinValue, - DateTime.MaxValue, - DateTime.MinValue - }); CreateAnalogItemVariable( analogArrayFolder, daAnalogArray + "Double", @@ -1899,24 +1855,6 @@ public override void CreateAddressSpace( BuiltInType.Float, ValueRanks.OneDimension, s_singleArray); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "Guid", - "Guid", - BuiltInType.Guid, - ValueRanks.OneDimension, - new Guid[] - { - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid(), - Guid.NewGuid() - }); CreateAnalogItemVariable( analogArrayFolder, daAnalogArray + "Int16", @@ -1945,52 +1883,6 @@ public override void CreateAddressSpace( BuiltInType.Integer, ValueRanks.OneDimension, new long[] { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "LocaleId", - "LocaleId", - DataTypeIds.LocaleId, - ValueRanks.OneDimension, - s_stringArray, - null); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "LocalizedText", - "LocalizedText", - BuiltInType.LocalizedText, - ValueRanks.OneDimension, - new LocalizedText[] - { - new("en", "Hello World1"), - new("en", "Hello World2"), - new("en", "Hello World3"), - new("en", "Hello World4"), - new("en", "Hello World5"), - new("en", "Hello World6"), - new("en", "Hello World7"), - new("en", "Hello World8"), - new("en", "Hello World9"), - new("en", "Hello World10") - }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "NodeId", - "NodeId", - BuiltInType.NodeId, - ValueRanks.OneDimension, - new NodeId[] - { - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()), - new(Guid.NewGuid()) - }); CreateAnalogItemVariable( analogArrayFolder, daAnalogArray + "Number", @@ -1998,23 +1890,6 @@ public override void CreateAddressSpace( BuiltInType.Number, ValueRanks.OneDimension, new short[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "QualifiedName", - "QualifiedName", - BuiltInType.QualifiedName, - ValueRanks.OneDimension, - new QualifiedName[] { - "q0", - "q1", - "q2", - "q3", - "q4", - "q5", - "q6", - "q7", - "q8", - "q9" }); CreateAnalogItemVariable( analogArrayFolder, daAnalogArray + "SByte", @@ -2022,13 +1897,6 @@ public override void CreateAddressSpace( BuiltInType.SByte, ValueRanks.OneDimension, new sbyte[] { 10, 20, 30, 40, 50, 60, 70, 80, 90 }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "String", - "String", - BuiltInType.String, - ValueRanks.OneDimension, - s_stringArray0); CreateAnalogItemVariable( analogArrayFolder, daAnalogArray + "UInt16", @@ -2057,52 +1925,7 @@ public override void CreateAddressSpace( BuiltInType.UInteger, ValueRanks.OneDimension, new ulong[] { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "UtcTime", - "UtcTime", - DataTypeIds.UtcTime, - ValueRanks.OneDimension, - new DateTime[] - { - DateTime.MinValue.ToUniversalTime(), - DateTime.MaxValue.ToUniversalTime(), - DateTime.MinValue.ToUniversalTime(), - DateTime.MaxValue.ToUniversalTime(), - DateTime.MinValue.ToUniversalTime(), - DateTime.MaxValue.ToUniversalTime(), - DateTime.MinValue.ToUniversalTime(), - DateTime.MaxValue.ToUniversalTime(), - DateTime.MinValue.ToUniversalTime() - }, - null); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "Variant", - "Variant", - BuiltInType.Variant, - ValueRanks.OneDimension, - new Variant[] { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }); var doc1 = new XmlDocument(); - CreateAnalogItemVariable( - analogArrayFolder, - daAnalogArray + "XmlElement", - "XmlElement", - BuiltInType.XmlElement, - ValueRanks.OneDimension, - new XmlElement[] - { - doc1.CreateElement("tag1"), - doc1.CreateElement("tag2"), - doc1.CreateElement("tag3"), - doc1.CreateElement("tag4"), - doc1.CreateElement("tag5"), - doc1.CreateElement("tag6"), - doc1.CreateElement("tag7"), - doc1.CreateElement("tag8"), - doc1.CreateElement("tag9"), - doc1.CreateElement("tag10") - }); ResetRandomGenerator(12); FolderState discreteTypeFolder = CreateFolder( @@ -4162,6 +3985,11 @@ private AnalogItemState CreateAnalogItemVariable( BuiltInType builtInType = TypeInfo.GetBuiltInType(dataType, Server.TypeTree); + if (!TypeInfo.IsNumericType(builtInType)) + { + throw new ArgumentException("AnalogItem must have a numeric DataType.", nameof(dataType)); + } + // Simulate a mV Voltmeter Range newRange = GetAnalogRange(builtInType); // Using anything but 120,-10 fails a few tests @@ -4595,6 +4423,7 @@ private BaseDataVariableState CreateVariable( }; variable.Value = GetNewValue(variable); variable.StatusCode = StatusCodes.Good; + variable.Description = "Default Description"; if (valueRank == ValueRanks.OneDimension) {