This is an automated email from the ASF dual-hosted git repository. cgarcia pushed a commit to branch feat/s7ha in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f933757f4857b4e30eb37674bafff756342014b9 Author: César García <[email protected]> AuthorDate: Sat Mar 11 14:11:34 2023 -0400 Update repo. --- .../java/bacnetip/readwrite/BACnetVendorId.java | 3 ++ .../java/s7/readwrite/S7VarPayloadDataItem.java | 36 +++++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index d8b8f333f9..4434c97ca0 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1609,16 +1609,19 @@ public enum BACnetVendorId { KOMFORTIQ_INC((int) 1397, (int) 1397, (String) "Komfort IQ, Inc."), COOL_TERA_LIMITED((int) 1398, (int) 1398, (String) "CoolTera Limited"), HADRON_SOLUTIONS_SRLS((int) 1399, (int) 1399, (String) "Hadron Solutions S.r.l.s"), + BITPOOL((int) 1401, (int) 1401, (String) "Bitpool"), SONICULLC((int) 1402, (int) 1402, (String) "Sonicu, LLC"), RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"), THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"), INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"), METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."), + TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD( (int) 1409, (int) 1409, (String) "LEFOO Industrial (Hangzhou) Co., Ltd."), + UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown"); private static final Map<Integer, BACnetVendorId> map; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 4483814eac..05ed37389e 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -41,13 +41,18 @@ public class S7VarPayloadDataItem implements Message { protected final DataTransportErrorCode returnCode; protected final DataTransportSize transportSize; protected final byte[] data; + protected final Boolean hasNext; public S7VarPayloadDataItem( - DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) { + DataTransportErrorCode returnCode, + DataTransportSize transportSize, + byte[] data, + Boolean hasNext) { super(); this.returnCode = returnCode; this.transportSize = transportSize; this.data = data; + this.hasNext = hasNext; } public DataTransportErrorCode getReturnCode() { @@ -62,6 +67,10 @@ public class S7VarPayloadDataItem implements Message { return data; } + public Boolean getHasNext() { + return hasNext; + } + public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,10 +110,13 @@ public class S7VarPayloadDataItem implements Message { // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); + // Optional Field (hasNext) (Can be skipped, if the value is null) + writeOptionalField("hasNext", hasNext, writeBoolean(writeBuffer)); + // Padding Field (padding) writePaddingField( "padding", - (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), + (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); @@ -136,8 +148,17 @@ public class S7VarPayloadDataItem implements Message { lengthInBits += 8 * data.length; } + // Optional Field (hasNext) + if (hasNext != null) { + lengthInBits += 1; + } + // Padding Field (padding) +<<<<<<< HEAD int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)); +======= + int _timesPadding = (int) (((PADCOUNT(data, hasNext)) % (2))); +>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) while (_timesPadding-- > 0) { lengthInBits += 8; } @@ -180,13 +201,19 @@ public class S7VarPayloadDataItem implements Message { Math.toIntExact( ((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength))); +<<<<<<< HEAD readPaddingField( readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0))); +======= + Boolean hasNext = readOptionalField("hasNext", readBoolean(readBuffer), (dataLength) < (-(1))); + + readPaddingField(readUnsignedShort(readBuffer, 8), (int) (((PADCOUNT(data, hasNext)) % (2)))); +>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) readBuffer.closeContext("S7VarPayloadDataItem"); // Create the instance S7VarPayloadDataItem _s7VarPayloadDataItem; - _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data); + _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data, hasNext); return _s7VarPayloadDataItem; } @@ -202,12 +229,13 @@ public class S7VarPayloadDataItem implements Message { return (getReturnCode() == that.getReturnCode()) && (getTransportSize() == that.getTransportSize()) && (getData() == that.getData()) + && (getHasNext() == that.getHasNext()) && true; } @Override public int hashCode() { - return Objects.hash(getReturnCode(), getTransportSize(), getData()); + return Objects.hash(getReturnCode(), getTransportSize(), getData(), getHasNext()); } @Override
