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 84db5e8162c1875361579e03c1226a15a8b7fe4f Author: Ben Hutcheson <[email protected]> AuthorDate: Wed Apr 12 05:52:39 2023 +0200 fix(plc4j/profinet): Update the Measured Delay struct to include the portCableDelay --- .../readwrite/TlvProfibusSubTypeMeasuredDelay.java | 34 ++++++++++++++++++---- .../main/resources/protocols/profinet/lldp.mspec | 1 + 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypeMeasuredDelay.java b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypeMeasuredDelay.java index 6472465023..80a7b693af 100644 --- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypeMeasuredDelay.java +++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/TlvProfibusSubTypeMeasuredDelay.java @@ -47,17 +47,20 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit protected final long remotePortRxDelay; protected final long localPortTxDelay; protected final long remotePortTxDelay; + protected final long portCableDelay; public TlvProfibusSubTypeMeasuredDelay( long localPortRxDelay, long remotePortRxDelay, long localPortTxDelay, - long remotePortTxDelay) { + long remotePortTxDelay, + long portCableDelay) { super(); this.localPortRxDelay = localPortRxDelay; this.remotePortRxDelay = remotePortRxDelay; this.localPortTxDelay = localPortTxDelay; this.remotePortTxDelay = remotePortTxDelay; + this.portCableDelay = portCableDelay; } public long getLocalPortRxDelay() { @@ -76,6 +79,10 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit return remotePortTxDelay; } + public long getPortCableDelay() { + return portCableDelay; + } + @Override protected void serializeTlvOrgSpecificProfibusUnitChild(WriteBuffer writeBuffer) throws SerializationException { @@ -96,6 +103,9 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit // Simple Field (remotePortTxDelay) writeSimpleField("remotePortTxDelay", remotePortTxDelay, writeUnsignedLong(writeBuffer, 32)); + // Simple Field (portCableDelay) + writeSimpleField("portCableDelay", portCableDelay, writeUnsignedLong(writeBuffer, 32)); + writeBuffer.popContext("TlvProfibusSubTypeMeasuredDelay"); } @@ -122,6 +132,9 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit // Simple field (remotePortTxDelay) lengthInBits += 32; + // Simple field (portCableDelay) + lengthInBits += 32; + return lengthInBits; } @@ -141,10 +154,12 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit long remotePortTxDelay = readSimpleField("remotePortTxDelay", readUnsignedLong(readBuffer, 32)); + long portCableDelay = readSimpleField("portCableDelay", readUnsignedLong(readBuffer, 32)); + readBuffer.closeContext("TlvProfibusSubTypeMeasuredDelay"); // Create the instance return new TlvProfibusSubTypeMeasuredDelayBuilderImpl( - localPortRxDelay, remotePortRxDelay, localPortTxDelay, remotePortTxDelay); + localPortRxDelay, remotePortRxDelay, localPortTxDelay, remotePortTxDelay, portCableDelay); } public static class TlvProfibusSubTypeMeasuredDelayBuilderImpl @@ -153,22 +168,29 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit private final long remotePortRxDelay; private final long localPortTxDelay; private final long remotePortTxDelay; + private final long portCableDelay; public TlvProfibusSubTypeMeasuredDelayBuilderImpl( long localPortRxDelay, long remotePortRxDelay, long localPortTxDelay, - long remotePortTxDelay) { + long remotePortTxDelay, + long portCableDelay) { this.localPortRxDelay = localPortRxDelay; this.remotePortRxDelay = remotePortRxDelay; this.localPortTxDelay = localPortTxDelay; this.remotePortTxDelay = remotePortTxDelay; + this.portCableDelay = portCableDelay; } public TlvProfibusSubTypeMeasuredDelay build() { TlvProfibusSubTypeMeasuredDelay tlvProfibusSubTypeMeasuredDelay = new TlvProfibusSubTypeMeasuredDelay( - localPortRxDelay, remotePortRxDelay, localPortTxDelay, remotePortTxDelay); + localPortRxDelay, + remotePortRxDelay, + localPortTxDelay, + remotePortTxDelay, + portCableDelay); return tlvProfibusSubTypeMeasuredDelay; } } @@ -186,6 +208,7 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit && (getRemotePortRxDelay() == that.getRemotePortRxDelay()) && (getLocalPortTxDelay() == that.getLocalPortTxDelay()) && (getRemotePortTxDelay() == that.getRemotePortTxDelay()) + && (getPortCableDelay() == that.getPortCableDelay()) && super.equals(that) && true; } @@ -197,7 +220,8 @@ public class TlvProfibusSubTypeMeasuredDelay extends TlvOrgSpecificProfibusUnit getLocalPortRxDelay(), getRemotePortRxDelay(), getLocalPortTxDelay(), - getRemotePortTxDelay()); + getRemotePortTxDelay(), + getPortCableDelay()); } @Override diff --git a/protocols/profinet/src/main/resources/protocols/profinet/lldp.mspec b/protocols/profinet/src/main/resources/protocols/profinet/lldp.mspec index f0bf82087d..1b4d0a6e6b 100644 --- a/protocols/profinet/src/main/resources/protocols/profinet/lldp.mspec +++ b/protocols/profinet/src/main/resources/protocols/profinet/lldp.mspec @@ -115,6 +115,7 @@ [simple uint 32 remotePortRxDelay] [simple uint 32 localPortTxDelay] [simple uint 32 remotePortTxDelay] + [simple uint 32 portCableDelay] ] ['PORT_STATUS' TlvProfibusSubTypePortStatus [simple uint 16 rtClass2PortStatus]
