This is an automated email from the ASF dual-hosted git repository. hutcheb pushed a commit to branch feat/profinet_ip_set in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit e53c93d8d390da85989ff5d80b68b197420e10f3 Author: Ben Hutcheson <[email protected]> AuthorDate: Wed Apr 12 05:54:03 2023 +0200 fix(plc4j/profinet): Use the chassis id as the device name, instead of the portid --- .../plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java b/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java index 8416356345..4d23a39d87 100644 --- a/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java +++ b/plc4j/drivers/profinet/src/main/java/org/apache/plc4x/java/profinet/discovery/ProfinetPlcDiscoverer.java @@ -236,14 +236,11 @@ public class ProfinetPlcDiscoverer implements PlcDiscoverer { if (unit instanceof TlvPortId) { TlvPortId portIdPacket = (TlvPortId) unit; options.put("portId", portIdPacket.getPortId()); - if (portIdPacket.getPortId().contains(".")) { - options.put("deviceName", portIdPacket.getPortId().split("\\.")[1]); - } else { - options.put("deviceName", portIdPacket.getPortId()); - } + } else if (unit instanceof TlvChassisId) { TlvChassisId chassisIdPacket = (TlvChassisId) unit; options.put("chassisId", chassisIdPacket.getChassisId()); + options.put("deviceName", chassisIdPacket.getChassisId()); } else if (unit instanceof TlvManagementAddress) { TlvManagementAddress managementAddressPacket = (TlvManagementAddress) unit; try {
