Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
049e7c1
Merge branch 'marcschier/wot-02-sourcegen' into marcschier/wot-10-wot…
marcschier Jul 31, 2026
84a2831
Add the WoT Connectivity 1.1 information model
marcschier Jul 31, 2026
381c15e
Qualify the core identifier references shadowed by the combined model
marcschier Jul 31, 2026
a88b971
Partition WoT-Con predefined nodes for legacy manager
marcschier Jul 31, 2026
997d2b6
Add the fluent builder API the generated node managers require
marcschier Jul 31, 2026
13534d1
Wire the data-type lookup into the DI node manager builder
marcschier Jul 31, 2026
80cb76c
Trigger merge recomputation
marcschier Jul 31, 2026
b20b7b9
Merge branch 'marcschier/wot-04-generator-wot' into marcschier/wot-10…
marcschier Jul 31, 2026
572f905
Fix method argument name generation concurrency
marcschier Jul 31, 2026
06707cf
Merge branch 'marcschier/wot-04-generator-wot' into marcschier/wot-10…
marcschier Jul 31, 2026
66ccab9
Merge branch 'marcschier/wot-04-generator-wot' into marcschier/wot-10…
marcschier Jul 31, 2026
abc2009
Merge branch 'marcschier/wot-04-generator-wot' into marcschier/wot-10…
marcschier Aug 1, 2026
32401f4
Merge branch 'marcschier/wot-09-xregistry-client' into marcschier/wot…
marcschier Aug 1, 2026
059a4e1
Merge branch 'marcschier/wot-09-xregistry-client' into marcschier/wot…
marcschier Aug 1, 2026
1ae01a3
Use the path-qualified generated method types
marcschier Aug 1, 2026
432a545
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 2, 2026
ec16a9b
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 3, 2026
665eb63
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 3, 2026
b04d0fe
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 3, 2026
c6d5bbb
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 3, 2026
aaab77e
Treat the WoT management minimum security mode as a floor
marcschier Aug 3, 2026
917997a
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 3, 2026
772a61a
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 3, 2026
22c2c6e
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 4, 2026
c9f0f8b
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 4, 2026
8cbf4ca
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 4, 2026
1c6fc5b
Merge remote-tracking branch 'origin/marcschier/wot-09-xregistry-clie…
marcschier Aug 4, 2026
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
306 changes: 153 additions & 153 deletions src/Opc.Ua.ISA95/Design/Common/Opc.ISA95.NodeIds.csv

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/Opc.Ua.WotCon.Server/Assets/AssetRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ private void BuildPropertyNode(AssetEntry entry, string name, WotProperty proper
BrowseName = new QualifiedName(name, ns),
DisplayName = new LocalizedText(property.Title ?? name),
Description = property.Description != null ? new LocalizedText(property.Description) : LocalizedText.Null,
DataType = mapped ? dataType : DataTypeIds.BaseDataType,
DataType = mapped ? dataType : Ua.DataTypeIds.BaseDataType,
ValueRank = mapped ? valueRank : ValueRanks.Scalar,
AccessLevel = property.ReadOnly ? AccessLevels.CurrentRead : AccessLevels.CurrentReadOrWrite,
UserAccessLevel = property.ReadOnly ? AccessLevels.CurrentRead : AccessLevels.CurrentReadOrWrite,
Expand Down Expand Up @@ -721,7 +721,7 @@ private void BuildActionNode(AssetEntry entry, string name, WotAction action)
inputProperty.NodeId = m_manager.AllocateChildNodeId(entry.Name, "actions", name + "_in");
inputProperty.BrowseName = new QualifiedName(Ua.BrowseNames.InputArguments);
inputProperty.DisplayName = new LocalizedText(Ua.BrowseNames.InputArguments);
inputProperty.DataType = DataTypeIds.Argument;
inputProperty.DataType = Ua.DataTypeIds.Argument;
inputProperty.ValueRank = ValueRanks.OneDimension;
inputProperty.ReferenceTypeId = Ua.ReferenceTypeIds.HasProperty;
inputProperty.TypeDefinitionId = VariableTypeIds.PropertyType;
Expand All @@ -741,7 +741,7 @@ private void BuildActionNode(AssetEntry entry, string name, WotAction action)
outputProperty.NodeId = m_manager.AllocateChildNodeId(entry.Name, "actions", name + "_out");
outputProperty.BrowseName = new QualifiedName(Ua.BrowseNames.OutputArguments);
outputProperty.DisplayName = new LocalizedText(Ua.BrowseNames.OutputArguments);
outputProperty.DataType = DataTypeIds.Argument;
outputProperty.DataType = Ua.DataTypeIds.Argument;
outputProperty.ValueRank = ValueRanks.OneDimension;
outputProperty.ReferenceTypeId = Ua.ReferenceTypeIds.HasProperty;
outputProperty.TypeDefinitionId = VariableTypeIds.PropertyType;
Expand Down
4 changes: 2 additions & 2 deletions src/Opc.Ua.WotCon.Server/ThingDescriptions/WotActionMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static IReadOnlyList<Argument> BuildArguments(WotActionSchema? schema)
new Argument
{
Name = schema.Title ?? "value",
DataType = DataTypeIds.BaseDataType,
DataType = Ua.DataTypeIds.BaseDataType,
ValueRank = ValueRanks.Scalar,
Description = BuildSchemaDescription(schema)
}
Expand All @@ -90,7 +90,7 @@ private static Argument BuildMemberArgument(string name, WotActionMember member)

if (!WotPropertyMapper.TryMapPrimitive(jsonType, out NodeId dataType))
{
dataType = DataTypeIds.BaseDataType;
dataType = Ua.DataTypeIds.BaseDataType;
}

return new Argument
Expand Down
12 changes: 6 additions & 6 deletions src/Opc.Ua.WotCon.Server/ThingDescriptions/WotPropertyMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static bool TryMap(
valueRank = ValueRanks.OneDimension;
if (property.Items?.Type == null)
{
dataType = DataTypeIds.BaseDataType;
dataType = Ua.DataTypeIds.BaseDataType;
return true;
}
return TryMapPrimitive(property.Items.Type, out dataType);
Expand All @@ -90,16 +90,16 @@ public static bool TryMapPrimitive(string? jsonType, out NodeId dataType)
switch (jsonType?.ToLowerInvariant())
{
case "boolean":
dataType = DataTypeIds.Boolean;
dataType = Ua.DataTypeIds.Boolean;
return true;
case "number":
dataType = DataTypeIds.Double;
dataType = Ua.DataTypeIds.Double;
return true;
case "integer":
dataType = DataTypeIds.Int64;
dataType = Ua.DataTypeIds.Int64;
return true;
case "string":
dataType = DataTypeIds.String;
dataType = Ua.DataTypeIds.String;
return true;
case null:
case "":
Expand All @@ -108,7 +108,7 @@ public static bool TryMapPrimitive(string? jsonType, out NodeId dataType)
dataType = NodeId.Null;
return false;
default:
dataType = DataTypeIds.BaseDataType;
dataType = Ua.DataTypeIds.BaseDataType;
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Opc.Ua.WotCon.Server/WotConnectivityServerOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public sealed class WotConnectivityServerOptions
public sealed class WotConfigurationParameter
{
/// <summary>The OPC UA <c>DataType</c> for the parameter.</summary>
public NodeId DataType { get; init; } = DataTypeIds.String;
public NodeId DataType { get; init; } = Ua.DataTypeIds.String;

/// <summary>The initial value (must be assignable to a <c>Variant</c>).</summary>
public Variant? InitialValue { get; init; }
Expand Down
Loading
Loading