Skip to content

Proof-Of-Concept: Added static Identification. #290

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Proof-Of-Concept: Added static Identification. #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 26 additions & 27 deletions umatiGateway/Core/Mqtt/MqttProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,35 +1079,34 @@ public void publishIdentificationMachineNodes()
if (machineNode != null && machineNode.ResolvedNodeId != null)
{
{
List<NodeId> identificationNodes = client.BrowseNodeIds(new BrowseDescriptionCollection { BrowseUtils.GetHierarchicalChildren(machineNode.ResolvedNodeId, (int)NodeClass.Object) });
//List<NodeId> identificationNodes = client.BrowseLocalNodeIds(machineNode.ResolvedNodeId, BrowseDirection.Forward, (int)NodeClass.Object, ReferenceTypeIds.HierarchicalReferences, true);
foreach (NodeId child in identificationNodes)
JObject data = new JObject();
JObject ident = new JObject();
ident = JObject.Parse(@"{
""<GroupIdentifier>"": {},
""SerialNumber"": ""37731"",
""ProductInstanceUri"": ""http://herding.de"",
""Model"" : ""Herding FLEXPRO 1500-24-2-3_SB"",
""Manufacturer"": {
""locale"": """",
""text"": ""Herding GmbH Filtertechnik""
}
}");
data.Add("Data", ident);
data.Add("MachineId", machineNode.InstanceNamespace);
data.Add("ParentId", "nsu=http:_2F_2Fopcfoundation.org_2FUA_2FMachinery_2F;i=1001");
if (string.IsNullOrEmpty(machineNode.BaseType))
{
Node? childNode = client.ReadNode(child);
if (childNode != null)
{
if (childNode.BrowseName.Name == "Identification")
{
JObject data = new JObject();
JObject ident = new JObject();
createJSON(ident, child, machineNode, null, false);
data.Add("Data", ident);
data.Add("MachineId", machineNode.InstanceNamespace);
data.Add("ParentId", "nsu=http:_2F_2Fopcfoundation.org_2FUA_2FMachinery_2F;i=1001");
if (string.IsNullOrEmpty(machineNode.BaseType))
{
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.TypeBrowseName + "/" + machineNode.InstanceNamespace);
data.Add("TypeDefinition", machineNode.TypeBrowseName);
}
else
{
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.BaseType + "/" + machineNode.InstanceNamespace);
data.Add("TypeDefinition", machineNode.BaseType);
}
identificationArray.Add(data);
}
}
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.TypeBrowseName + "/" + machineNode.InstanceNamespace);
data.Add("TypeDefinition", machineNode.TypeBrowseName);
}
else
{
data.Add("Topic", config.Prefix + "/" + config.ClientId + "/" + machineNode.BaseType + "/" + machineNode.InstanceNamespace);
data.Add("TypeDefinition", machineNode.BaseType);
}
identificationArray.Add(data);


if (string.IsNullOrEmpty(machineNode.BaseType))
{
WriteIdentification(identificationArray, machineNode.InstanceNamespace, machineNode.TypeBrowseName);
Expand Down
Loading