You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cg...@apache.org on 2023/03/19 06:19:11 UTC
[plc4x] 07/08: Update repo.
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 36946057cf0d56f8b5745167d29ca89340bc1e8a
Author: César García <ce...@ceos.com.ve>
AuthorDate: Wed Feb 22 20:02:32 2023 -0400
Update repo.
---
.../java/bacnetip/readwrite/BACnetVendorId.java | 1 -
.../java/s7/readwrite/S7VarPayloadDataItem.java | 34 ++--------------------
2 files changed, 3 insertions(+), 32 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 4434c97ca0..7fe13e260b 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,7 +1609,6 @@ 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"),
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 05ed37389e..0d6c861cb2 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,18 +41,13 @@ 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,
- Boolean hasNext) {
+ DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) {
super();
this.returnCode = returnCode;
this.transportSize = transportSize;
this.data = data;
- this.hasNext = hasNext;
}
public DataTransportErrorCode getReturnCode() {
@@ -67,10 +62,6 @@ 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();
@@ -110,9 +101,6 @@ 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",
@@ -148,17 +136,8 @@ 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;
}
@@ -201,19 +180,13 @@ 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, hasNext);
+ _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data);
return _s7VarPayloadDataItem;
}
@@ -229,13 +202,12 @@ 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(), getHasNext());
+ return Objects.hash(getReturnCode(), getTransportSize(), getData());
}
@Override