You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/02/04 09:53:36 UTC
[plc4x] branch featrue/cdutz/arrays-with-special-variables updated (812adb8b29 -> 258f420304)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch featrue/cdutz/arrays-with-special-variables
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 812adb8b29 fix(plc4j/examples/ads): Fixed some wrongly named constants
add 077219813d fix(plc4j/profinet): Fixed some issues around parsing gsd files and vendor id formats
new 258f420304 Merge remote-tracking branch 'origin/develop' into featrue/cdutz/arrays-with-special-variables
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../PnDcp_Block_DevicePropertiesNameOfStation.java | 22 ++++++++++++++++++++--
.../plc4x/java/profinet/device/ProfinetDevice.java | 10 +++++-----
.../java/profinet/gsdml/ProfinetDataItem.java | 7 +++++++
.../resources/protocols/profinet/profinet.mspec | 1 +
4 files changed, 33 insertions(+), 7 deletions(-)
[plc4x] 01/01: Merge remote-tracking branch 'origin/develop' into featrue/cdutz/arrays-with-special-variables
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch featrue/cdutz/arrays-with-special-variables
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 258f420304164992f4f5c26ea53d4c9b45451534
Merge: 812adb8b29 077219813d
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sat Feb 4 10:42:45 2023 +0100
Merge remote-tracking branch 'origin/develop' into featrue/cdutz/arrays-with-special-variables
.../PnDcp_Block_DevicePropertiesNameOfStation.java | 22 ++++++++++++++++++++--
.../plc4x/java/profinet/device/ProfinetDevice.java | 10 +++++-----
.../java/profinet/gsdml/ProfinetDataItem.java | 7 +++++++
.../resources/protocols/profinet/profinet.mspec | 1 +
4 files changed, 33 insertions(+), 7 deletions(-)
diff --cc plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
index 91f9c99e38,d2445e8867..cbd068d825
--- a/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
+++ b/plc4j/drivers/profinet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/PnDcp_Block_DevicePropertiesNameOfStation.java
@@@ -94,8 -101,10 +102,11 @@@ public class PnDcp_Block_DeviceProperti
public int getLengthInBits() {
int lengthInBits = super.getLengthInBits();
PnDcp_Block_DevicePropertiesNameOfStation _value = this;
+ boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+ // Reserved Field (reserved)
+ lengthInBits += 16;
+
// Array field
if (nameOfStation != null) {
lengthInBits += 8 * nameOfStation.length;
@@@ -120,8 -129,10 +131,11 @@@
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
+ boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+ Integer reservedField0 =
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x0000);
+
byte[] nameOfStation =
readBuffer.readByteArray("nameOfStation", Math.toIntExact((blockLength) - (2)));