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 2024/01/27 18:25:24 UTC
(plc4x) branch develop updated (d54b88de97 -> 1f9a949a78)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from d54b88de97 fix: Gave the initial connection request a bit more time ... also tried to find the reason for the reconnects.
new b5396263db chore: Update vendor ids
new 0395846889 chore: Update vendor ids
new 1f9a949a78 fix: Reduced the version of the rat plugin till the version 0.16.1 is released, which will fix the problem causing the build to pause for several minutes.
The 3 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:
.../knxnetip/readwrite/model/KnxManufacturer.go | 42 +++++++++++++++--
.../java/knxnetip/readwrite/KnxManufacturer.java | 7 ++-
.../knxnetip/readwrite/model/KnxManufacturer.cs | 26 +++++++---
pom.xml | 2 +-
.../protocols/knxnetip/knx-master-data.mspec | 6 ++-
.../plc4py/protocols/modbus/readwrite/DataItem.py | 48 +++++++++++++++++++
.../protocols/modbus/readwrite/DriverType.py | 1 +
.../plc4py/protocols/modbus/readwrite/ModbusADU.py | 4 ++
.../ModbusDeviceInformationConformityLevel.py | 1 +
.../readwrite/ModbusDeviceInformationLevel.py | 1 +
.../ModbusDeviceInformationMoreFollows.py | 1 +
.../protocols/modbus/readwrite/ModbusErrorCode.py | 1 +
.../plc4py/protocols/modbus/readwrite/ModbusPDU.py | 41 ++++++++++++++++
.../ModbusPDUGetComEventCounterRequest.py | 1 +
.../ModbusPDUGetComEventCounterResponse.py | 6 +--
.../readwrite/ModbusPDUGetComEventLogRequest.py | 1 +
.../ModbusPDUMaskWriteHoldingRegisterRequest.py | 4 +-
.../ModbusPDUMaskWriteHoldingRegisterResponse.py | 4 +-
.../ModbusPDUReadDeviceIdentificationRequest.py | 6 +--
.../ModbusPDUReadDeviceIdentificationResponse.py | 4 +-
.../ModbusPDUReadDiscreteInputsResponse.py | 6 +--
.../ModbusPDUReadExceptionStatusRequest.py | 7 +--
.../ModbusPDUReadExceptionStatusResponse.py | 6 +--
.../ModbusPDUReadFileRecordRequestItem.py | 4 +-
.../ModbusPDUReadFileRecordResponseItem.py | 6 +--
.../ModbusPDUReadHoldingRegistersRequest.py | 6 +--
.../ModbusPDUReadHoldingRegistersResponse.py | 6 +--
.../ModbusPDUReadInputRegistersResponse.py | 6 +--
...sPDUReadWriteMultipleHoldingRegistersRequest.py | 4 +-
...PDUReadWriteMultipleHoldingRegistersResponse.py | 6 +--
.../readwrite/ModbusPDUReportServerIdRequest.py | 1 +
.../ModbusPDUWriteFileRecordRequestItem.py | 4 +-
.../ModbusPDUWriteFileRecordResponseItem.py | 4 +-
.../ModbusPDUWriteMultipleCoilsResponse.py | 6 +--
...odbusPDUWriteMultipleHoldingRegistersRequest.py | 4 +-
...dbusPDUWriteMultipleHoldingRegistersResponse.py | 4 +-
.../ModbusPDUWriteSingleRegisterRequest.py | 6 +--
.../ModbusPDUWriteSingleRegisterResponse.py | 6 +--
.../protocols/simulated/readwrite/DataItem.py | 55 ++++++++++++++++++++++
39 files changed, 290 insertions(+), 64 deletions(-)
(plc4x) 02/03: chore: Update vendor ids
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 039584688940dcae7d33c427e89d2bf6ad2e8583
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sat Jan 27 19:24:28 2024 +0100
chore: Update vendor ids
---
.../knxnetip/readwrite/model/KnxManufacturer.cs | 26 +++++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index b26c08f82a..3242fe308c 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -685,8 +685,10 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_CONSOLINNO_ENERGY_GMBH = 658,
M_SCHIDERON_ELECTRIC_ASIA_LIMITED = 659,
M_3R = 660,
- M_ABB___RESERVED = 661,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 662,
+ M_ARKLYFE = 661,
+ M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_ = 662,
+ M_ABB___RESERVED = 663,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 664,
}
public static class KnxManufacturerInfo
@@ -2571,10 +2573,16 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_3R: { /* '660' */
return 718;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '661' */
+ case KnxManufacturer.M_ARKLYFE: { /* '661' */
+ return 719;
+ }
+ case KnxManufacturer.M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_: { /* '662' */
+ return 720;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '663' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '662' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '664' */
return 43959;
}
case KnxManufacturer.M_EIBMARKT_GMBH: { /* '67' */
@@ -4570,10 +4578,16 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_3R: { /* '660' */
return "3R";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '661' */
+ case KnxManufacturer.M_ARKLYFE: { /* '661' */
+ return "Arklyfe";
+ }
+ case KnxManufacturer.M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_: { /* '662' */
+ return "Foshan Haydn Technology Lighting Co.,Ltd.";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '663' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '662' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '664' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_EIBMARKT_GMBH: { /* '67' */
(plc4x) 01/03: chore: Update vendor ids
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b5396263db32e5f247960c1ed9b00c90a697ea44
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sat Jan 27 19:24:24 2024 +0100
chore: Update vendor ids
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 42 +++++++++++++++--
.../java/knxnetip/readwrite/KnxManufacturer.java | 7 ++-
.../protocols/knxnetip/knx-master-data.mspec | 6 ++-
.../plc4py/protocols/modbus/readwrite/DataItem.py | 48 +++++++++++++++++++
.../protocols/modbus/readwrite/DriverType.py | 1 +
.../plc4py/protocols/modbus/readwrite/ModbusADU.py | 4 ++
.../ModbusDeviceInformationConformityLevel.py | 1 +
.../readwrite/ModbusDeviceInformationLevel.py | 1 +
.../ModbusDeviceInformationMoreFollows.py | 1 +
.../protocols/modbus/readwrite/ModbusErrorCode.py | 1 +
.../plc4py/protocols/modbus/readwrite/ModbusPDU.py | 41 ++++++++++++++++
.../ModbusPDUGetComEventCounterRequest.py | 1 +
.../ModbusPDUGetComEventCounterResponse.py | 6 +--
.../readwrite/ModbusPDUGetComEventLogRequest.py | 1 +
.../ModbusPDUMaskWriteHoldingRegisterRequest.py | 4 +-
.../ModbusPDUMaskWriteHoldingRegisterResponse.py | 4 +-
.../ModbusPDUReadDeviceIdentificationRequest.py | 6 +--
.../ModbusPDUReadDeviceIdentificationResponse.py | 4 +-
.../ModbusPDUReadDiscreteInputsResponse.py | 6 +--
.../ModbusPDUReadExceptionStatusRequest.py | 7 +--
.../ModbusPDUReadExceptionStatusResponse.py | 6 +--
.../ModbusPDUReadFileRecordRequestItem.py | 4 +-
.../ModbusPDUReadFileRecordResponseItem.py | 6 +--
.../ModbusPDUReadHoldingRegistersRequest.py | 6 +--
.../ModbusPDUReadHoldingRegistersResponse.py | 6 +--
.../ModbusPDUReadInputRegistersResponse.py | 6 +--
...sPDUReadWriteMultipleHoldingRegistersRequest.py | 4 +-
...PDUReadWriteMultipleHoldingRegistersResponse.py | 6 +--
.../readwrite/ModbusPDUReportServerIdRequest.py | 1 +
.../ModbusPDUWriteFileRecordRequestItem.py | 4 +-
.../ModbusPDUWriteFileRecordResponseItem.py | 4 +-
.../ModbusPDUWriteMultipleCoilsResponse.py | 6 +--
...odbusPDUWriteMultipleHoldingRegistersRequest.py | 4 +-
...dbusPDUWriteMultipleHoldingRegistersResponse.py | 4 +-
.../ModbusPDUWriteSingleRegisterRequest.py | 6 +--
.../ModbusPDUWriteSingleRegisterResponse.py | 6 +--
.../protocols/simulated/readwrite/DataItem.py | 55 ++++++++++++++++++++++
37 files changed, 269 insertions(+), 57 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 93c7253019..8c03265fe1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -704,8 +704,10 @@ const (
KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH KnxManufacturer = 658
KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED KnxManufacturer = 659
KnxManufacturer_M_3R KnxManufacturer = 660
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 661
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 662
+ KnxManufacturer_M_ARKLYFE KnxManufacturer = 661
+ KnxManufacturer_M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_ KnxManufacturer = 662
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 663
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 664
)
var KnxManufacturerValues []KnxManufacturer
@@ -1374,6 +1376,8 @@ func init() {
KnxManufacturer_M_CONSOLINNO_ENERGY_GMBH,
KnxManufacturer_M_SCHIDERON_ELECTRIC_ASIA_LIMITED,
KnxManufacturer_M_3R,
+ KnxManufacturer_M_ARKLYFE,
+ KnxManufacturer_M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3883,10 +3887,18 @@ func (e KnxManufacturer) Number() uint16 {
}
case 661:
{ /* '661' */
- return 43954
+ return 719
}
case 662:
{ /* '662' */
+ return 720
+ }
+ case 663:
+ { /* '663' */
+ return 43954
+ }
+ case 664:
+ { /* '664' */
return 43959
}
case 67:
@@ -6553,10 +6565,18 @@ func (e KnxManufacturer) Name() string {
}
case 661:
{ /* '661' */
- return "ABB - reserved"
+ return "Arklyfe"
}
case 662:
{ /* '662' */
+ return "Foshan Haydn Technology Lighting Co.,Ltd."
+ }
+ case 663:
+ { /* '663' */
+ return "ABB - reserved"
+ }
+ case 664:
+ { /* '664' */
return "Busch-Jaeger Elektro - reserved"
}
case 67:
@@ -7971,8 +7991,12 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 660:
return KnxManufacturer_M_3R, true
case 661:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_ARKLYFE, true
case 662:
+ return KnxManufacturer_M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_, true
+ case 663:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 664:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 67:
return KnxManufacturer_M_EIBMARKT_GMBH, true
@@ -9302,6 +9326,10 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_RTS_AUTOMATION, true
case "M_3R":
return KnxManufacturer_M_3R, true
+ case "M_ARKLYFE":
+ return KnxManufacturer_M_ARKLYFE, true
+ case "M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_":
+ return KnxManufacturer_M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -10695,6 +10723,10 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_RTS_AUTOMATION"
case KnxManufacturer_M_3R:
return "M_3R"
+ case KnxManufacturer_M_ARKLYFE:
+ return "M_ARKLYFE"
+ case KnxManufacturer_M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_:
+ return "M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
index d77e50518a..2322eeac93 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -759,9 +759,12 @@ public enum KnxManufacturer {
M_SCHIDERON_ELECTRIC_ASIA_LIMITED(
(int) 659, (int) 717, (String) "SCHIDERON ELECTRIC (ASIA) LIMITED"),
M_3R((int) 660, (int) 718, (String) "3R"),
- M_ABB___RESERVED((int) 661, (int) 43954, (String) "ABB - reserved"),
+ M_ARKLYFE((int) 661, (int) 719, (String) "Arklyfe"),
+ M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_(
+ (int) 662, (int) 720, (String) "Foshan Haydn Technology Lighting Co.,Ltd."),
+ M_ABB___RESERVED((int) 663, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 662, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 664, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
static {
diff --git a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
index e53ad10795..8bd892d188 100644
--- a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
+++ b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
@@ -1409,8 +1409,10 @@
['658' M_CONSOLINNO_ENERGY_GMBH ['716', '"Consolinno Energy GmbH"']]
['659' M_SCHIDERON_ELECTRIC_ASIA_LIMITED ['717', '"SCHIDERON ELECTRIC (ASIA) LIMITED"']]
['660' M_3R ['718', '"3R"']]
- ['661' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['662' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+ ['661' M_ARKLYFE ['719', '"Arklyfe"']]
+ ['662' M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_ ['720', '"Foshan Haydn Technology Lighting Co.,Ltd."']]
+ ['663' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['664' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
]
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DataItem.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DataItem.py
index 189fcd327d..ab4b18171a 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DataItem.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DataItem.py
@@ -52,6 +52,7 @@ class DataItem:
read_buffer: ReadBuffer, data_type: ModbusDataType, number_of_values: int
):
if data_type == ModbusDataType.BOOL and number_of_values == int(1): # BOOL
+
# Reserved Field (Compartmentalized so the "reserved" variable can't leak)
reserved: int = read_buffer.read_unsigned_int(15, logical_name="")
if reserved != int(0x0000):
@@ -77,6 +78,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.BYTE and number_of_values == int(1): # BYTE
+
# Reserved Field (Compartmentalized so the "reserved" variable can't leak)
reserved: int = read_buffer.read_unsigned_short(8, logical_name="")
if reserved != int(0x00):
@@ -102,21 +104,25 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.WORD: # WORD
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_int(16, logical_name="")
return PlcWORD(value)
if data_type == ModbusDataType.DWORD: # DWORD
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(32, logical_name="")
return PlcDWORD(value)
if data_type == ModbusDataType.LWORD: # LWORD
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(64, logical_name="")
return PlcLWORD(value)
if data_type == ModbusDataType.SINT and number_of_values == int(1): # SINT
+
# Reserved Field (Compartmentalized so the "reserved" variable can't leak)
reserved: int = read_buffer.read_unsigned_short(8, logical_name="")
if reserved != int(0x00):
@@ -144,6 +150,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.INT and number_of_values == int(1): # INT
+
# Simple Field (value)
value: int = read_buffer.read_short(16, logical_name="")
@@ -158,6 +165,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.DINT and number_of_values == int(1): # DINT
+
# Simple Field (value)
value: int = read_buffer.read_int(32, logical_name="")
@@ -172,6 +180,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.LINT and number_of_values == int(1): # LINT
+
# Simple Field (value)
value: int = read_buffer.read_long(64, logical_name="")
@@ -186,6 +195,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.USINT and number_of_values == int(1): # USINT
+
# Reserved Field (Compartmentalized so the "reserved" variable can't leak)
reserved: int = read_buffer.read_unsigned_short(8, logical_name="")
if reserved != int(0x00):
@@ -213,6 +223,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.UINT and number_of_values == int(1): # UINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_int(16, logical_name="")
@@ -229,6 +240,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.UDINT and number_of_values == int(1): # UDINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(32, logical_name="")
@@ -245,6 +257,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.ULINT and number_of_values == int(1): # ULINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(64, logical_name="")
@@ -261,6 +274,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.REAL and number_of_values == int(1): # REAL
+
# Simple Field (value)
value: float = read_buffer.read_float(32, logical_name="")
@@ -277,6 +291,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.LREAL and number_of_values == int(1): # LREAL
+
# Simple Field (value)
value: float = read_buffer.read_double(64, logical_name="")
@@ -293,6 +308,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.CHAR and number_of_values == int(1): # CHAR
+
# Simple Field (value)
value: str = read_buffer.read_str(8, logical_name="", encoding="")
@@ -311,6 +327,7 @@ class DataItem:
return PlcList(value)
if data_type == ModbusDataType.WCHAR and number_of_values == int(1): # WCHAR
+
# Simple Field (value)
value: str = read_buffer.read_str(16, logical_name="", encoding="")
@@ -339,12 +356,14 @@ class DataItem:
byte_order: ByteOrder,
) -> None:
if data_type == ModbusDataType.BOOL and number_of_values == int(1): # BOOL
+
# Reserved Field
write_buffer.write_unsigned_short(int(0x0000), 15, "int0x0000")
# Simple Field (value)
value: bool = _value.get_bool()
write_buffer.write_bit((value), "value")
if data_type == ModbusDataType.BOOL: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -352,12 +371,14 @@ class DataItem:
write_buffer.write_bit((value), "value")
if data_type == ModbusDataType.BYTE and number_of_values == int(1): # BYTE
+
# Reserved Field
write_buffer.write_byte(int(0x00), 8, "int0x00")
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_byte((value), 8, "value")
if data_type == ModbusDataType.BYTE: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -365,24 +386,29 @@ class DataItem:
write_buffer.write_bit((value), "value")
if data_type == ModbusDataType.WORD: # WORD
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == ModbusDataType.DWORD: # DWORD
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == ModbusDataType.LWORD: # LWORD
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == ModbusDataType.SINT and number_of_values == int(1): # SINT
+
# Reserved Field
write_buffer.write_byte(int(0x00), 8, "int0x00")
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_signed_byte((value), 8, "value")
if data_type == ModbusDataType.SINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -390,10 +416,12 @@ class DataItem:
write_buffer.write_signed_byte((value), 8, "value")
if data_type == ModbusDataType.INT and number_of_values == int(1): # INT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_short((value), 16, "value")
if data_type == ModbusDataType.INT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -401,10 +429,12 @@ class DataItem:
write_buffer.write_short((value), 16, "value")
if data_type == ModbusDataType.DINT and number_of_values == int(1): # DINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_int((value), 32, "value")
if data_type == ModbusDataType.DINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -412,10 +442,12 @@ class DataItem:
write_buffer.write_int((value), 32, "value")
if data_type == ModbusDataType.LINT and number_of_values == int(1): # LINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_long((value), 64, "value")
if data_type == ModbusDataType.LINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -423,12 +455,14 @@ class DataItem:
write_buffer.write_long((value), 64, "value")
if data_type == ModbusDataType.USINT and number_of_values == int(1): # USINT
+
# Reserved Field
write_buffer.write_byte(int(0x00), 8, "int0x00")
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_byte((value), 8, "value")
if data_type == ModbusDataType.USINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -436,10 +470,12 @@ class DataItem:
write_buffer.write_byte((value), 8, "value")
if data_type == ModbusDataType.UINT and number_of_values == int(1): # UINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == ModbusDataType.UINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -447,10 +483,12 @@ class DataItem:
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == ModbusDataType.UDINT and number_of_values == int(1): # UDINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == ModbusDataType.UDINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -458,10 +496,12 @@ class DataItem:
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == ModbusDataType.ULINT and number_of_values == int(1): # ULINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == ModbusDataType.ULINT: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -469,10 +509,12 @@ class DataItem:
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == ModbusDataType.REAL and number_of_values == int(1): # REAL
+
# Simple Field (value)
value: float = _value.get_float()
write_buffer.write_float((value), 32, "value")
if data_type == ModbusDataType.REAL: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -480,10 +522,12 @@ class DataItem:
write_buffer.write_float((value), 32, "value")
if data_type == ModbusDataType.LREAL and number_of_values == int(1): # LREAL
+
# Simple Field (value)
value: float = _value.get_float()
write_buffer.write_double((value), 64, "value")
if data_type == ModbusDataType.LREAL: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -491,10 +535,12 @@ class DataItem:
write_buffer.write_double((value), 64, "value")
if data_type == ModbusDataType.CHAR and number_of_values == int(1): # CHAR
+
# Simple Field (value)
value: str = _value.get_str()
write_buffer.write_str((value), 8, "UTF-8", "value")
if data_type == ModbusDataType.CHAR: # List
+
values: PlcList = _value
for val in values.get_list():
@@ -502,10 +548,12 @@ class DataItem:
write_buffer.write_str((value), 8, "UTF-8", "value")
if data_type == ModbusDataType.WCHAR and number_of_values == int(1): # WCHAR
+
# Simple Field (value)
value: str = _value.get_str()
write_buffer.write_str((value), 16, "UTF-16", "value")
if data_type == ModbusDataType.WCHAR: # List
+
values: PlcList = _value
for val in values.get_list():
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DriverType.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DriverType.py
index 461213ba2a..229dc8761e 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DriverType.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/DriverType.py
@@ -22,6 +22,7 @@ from aenum import AutoNumberEnum
class DriverType(AutoNumberEnum):
+
MODBUS_TCP: int = 0x01
MODBUS_RTU: int = 0x02
MODBUS_ASCII: int = 0x03
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusADU.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusADU.py
index e0a3c5f892..14300eaf4c 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusADU.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusADU.py
@@ -67,6 +67,7 @@ class ModbusADU(ABC, PlcMessage):
@staticmethod
def static_parse(read_buffer: ReadBuffer, **kwargs):
+
if kwargs is None:
raise PlcRuntimeException(
"Wrong number of arguments, expected 2, but got None"
@@ -107,18 +108,21 @@ class ModbusADU(ABC, PlcMessage):
from plc4py.protocols.modbus.readwrite.ModbusTcpADU import ModbusTcpADU
if driver_type == DriverType.MODBUS_TCP:
+
builder = ModbusTcpADU.static_parse_builder(
read_buffer, driver_type, response
)
from plc4py.protocols.modbus.readwrite.ModbusRtuADU import ModbusRtuADU
if driver_type == DriverType.MODBUS_RTU:
+
builder = ModbusRtuADU.static_parse_builder(
read_buffer, driver_type, response
)
from plc4py.protocols.modbus.readwrite.ModbusAsciiADU import ModbusAsciiADU
if driver_type == DriverType.MODBUS_ASCII:
+
builder = ModbusAsciiADU.static_parse_builder(
read_buffer, driver_type, response
)
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationConformityLevel.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationConformityLevel.py
index 5400f12144..1c6b6c2e15 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationConformityLevel.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationConformityLevel.py
@@ -22,6 +22,7 @@ from aenum import AutoNumberEnum
class ModbusDeviceInformationConformityLevel(AutoNumberEnum):
+
BASIC_STREAM_ONLY: int = 0x01
REGULAR_STREAM_ONLY: int = 0x02
EXTENDED_STREAM_ONLY: int = 0x03
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationLevel.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationLevel.py
index 7e05bccf30..34300606ba 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationLevel.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationLevel.py
@@ -22,6 +22,7 @@ from aenum import AutoNumberEnum
class ModbusDeviceInformationLevel(AutoNumberEnum):
+
BASIC: int = 0x01
REGULAR: int = 0x02
EXTENDED: int = 0x03
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationMoreFollows.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationMoreFollows.py
index 2c7fdd92b1..1c613af6ec 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationMoreFollows.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusDeviceInformationMoreFollows.py
@@ -22,5 +22,6 @@ from aenum import AutoNumberEnum
class ModbusDeviceInformationMoreFollows(AutoNumberEnum):
+
NO_MORE_OBJECTS_AVAILABLE: int = 0x00
MORE_OBJECTS_AVAILABLE: int = 0xFF
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusErrorCode.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusErrorCode.py
index d96d77e67b..bfbad8d872 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusErrorCode.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusErrorCode.py
@@ -22,6 +22,7 @@ from aenum import AutoNumberEnum
class ModbusErrorCode(AutoNumberEnum):
+
ILLEGAL_FUNCTION: int = 1
ILLEGAL_DATA_ADDRESS: int = 2
ILLEGAL_DATA_VALUE: int = 3
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDU.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDU.py
index d86e4600a6..fdd4ec14ee 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDU.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDU.py
@@ -32,6 +32,7 @@ import math
@dataclass
class ModbusPDU(ABC, PlcMessage):
+
# Abstract accessors for discriminator values.
@property
@abstractmethod
@@ -93,6 +94,7 @@ class ModbusPDU(ABC, PlcMessage):
@staticmethod
def static_parse(read_buffer: ReadBuffer, **kwargs):
+
if kwargs is None:
raise PlcRuntimeException(
"Wrong number of arguments, expected 1, but got None"
@@ -127,6 +129,7 @@ class ModbusPDU(ABC, PlcMessage):
from plc4py.protocols.modbus.readwrite.ModbusPDUError import ModbusPDUError
if error_flag == bool(True):
+
builder = ModbusPDUError.static_parse_builder(read_buffer, response)
from plc4py.protocols.modbus.readwrite.ModbusPDUReadDiscreteInputsRequest import (
ModbusPDUReadDiscreteInputsRequest,
@@ -137,6 +140,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x02)
and response == bool(False)
):
+
builder = ModbusPDUReadDiscreteInputsRequest.static_parse_builder(
read_buffer, response
)
@@ -149,6 +153,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x02)
and response == bool(True)
):
+
builder = ModbusPDUReadDiscreteInputsResponse.static_parse_builder(
read_buffer, response
)
@@ -161,6 +166,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x01)
and response == bool(False)
):
+
builder = ModbusPDUReadCoilsRequest.static_parse_builder(
read_buffer, response
)
@@ -173,6 +179,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x01)
and response == bool(True)
):
+
builder = ModbusPDUReadCoilsResponse.static_parse_builder(
read_buffer, response
)
@@ -185,6 +192,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x05)
and response == bool(False)
):
+
builder = ModbusPDUWriteSingleCoilRequest.static_parse_builder(
read_buffer, response
)
@@ -197,6 +205,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x05)
and response == bool(True)
):
+
builder = ModbusPDUWriteSingleCoilResponse.static_parse_builder(
read_buffer, response
)
@@ -209,6 +218,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x0F)
and response == bool(False)
):
+
builder = ModbusPDUWriteMultipleCoilsRequest.static_parse_builder(
read_buffer, response
)
@@ -221,6 +231,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x0F)
and response == bool(True)
):
+
builder = ModbusPDUWriteMultipleCoilsResponse.static_parse_builder(
read_buffer, response
)
@@ -233,6 +244,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x04)
and response == bool(False)
):
+
builder = ModbusPDUReadInputRegistersRequest.static_parse_builder(
read_buffer, response
)
@@ -245,6 +257,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x04)
and response == bool(True)
):
+
builder = ModbusPDUReadInputRegistersResponse.static_parse_builder(
read_buffer, response
)
@@ -257,6 +270,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x03)
and response == bool(False)
):
+
builder = ModbusPDUReadHoldingRegistersRequest.static_parse_builder(
read_buffer, response
)
@@ -269,6 +283,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x03)
and response == bool(True)
):
+
builder = ModbusPDUReadHoldingRegistersResponse.static_parse_builder(
read_buffer, response
)
@@ -281,6 +296,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x06)
and response == bool(False)
):
+
builder = ModbusPDUWriteSingleRegisterRequest.static_parse_builder(
read_buffer, response
)
@@ -293,6 +309,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x06)
and response == bool(True)
):
+
builder = ModbusPDUWriteSingleRegisterResponse.static_parse_builder(
read_buffer, response
)
@@ -305,6 +322,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x10)
and response == bool(False)
):
+
builder = (
ModbusPDUWriteMultipleHoldingRegistersRequest.static_parse_builder(
read_buffer, response
@@ -319,6 +337,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x10)
and response == bool(True)
):
+
builder = (
ModbusPDUWriteMultipleHoldingRegistersResponse.static_parse_builder(
read_buffer, response
@@ -333,6 +352,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x17)
and response == bool(False)
):
+
builder = (
ModbusPDUReadWriteMultipleHoldingRegistersRequest.static_parse_builder(
read_buffer, response
@@ -347,6 +367,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x17)
and response == bool(True)
):
+
builder = (
ModbusPDUReadWriteMultipleHoldingRegistersResponse.static_parse_builder(
read_buffer, response
@@ -361,6 +382,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x16)
and response == bool(False)
):
+
builder = ModbusPDUMaskWriteHoldingRegisterRequest.static_parse_builder(
read_buffer, response
)
@@ -373,6 +395,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x16)
and response == bool(True)
):
+
builder = ModbusPDUMaskWriteHoldingRegisterResponse.static_parse_builder(
read_buffer, response
)
@@ -385,6 +408,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x18)
and response == bool(False)
):
+
builder = ModbusPDUReadFifoQueueRequest.static_parse_builder(
read_buffer, response
)
@@ -397,6 +421,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x18)
and response == bool(True)
):
+
builder = ModbusPDUReadFifoQueueResponse.static_parse_builder(
read_buffer, response
)
@@ -409,6 +434,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x14)
and response == bool(False)
):
+
builder = ModbusPDUReadFileRecordRequest.static_parse_builder(
read_buffer, response
)
@@ -421,6 +447,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x14)
and response == bool(True)
):
+
builder = ModbusPDUReadFileRecordResponse.static_parse_builder(
read_buffer, response
)
@@ -433,6 +460,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x15)
and response == bool(False)
):
+
builder = ModbusPDUWriteFileRecordRequest.static_parse_builder(
read_buffer, response
)
@@ -445,6 +473,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x15)
and response == bool(True)
):
+
builder = ModbusPDUWriteFileRecordResponse.static_parse_builder(
read_buffer, response
)
@@ -457,6 +486,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x07)
and response == bool(False)
):
+
builder = ModbusPDUReadExceptionStatusRequest.static_parse_builder(
read_buffer, response
)
@@ -469,6 +499,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x07)
and response == bool(True)
):
+
builder = ModbusPDUReadExceptionStatusResponse.static_parse_builder(
read_buffer, response
)
@@ -481,6 +512,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x08)
and response == bool(False)
):
+
builder = ModbusPDUDiagnosticRequest.static_parse_builder(
read_buffer, response
)
@@ -493,6 +525,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x08)
and response == bool(True)
):
+
builder = ModbusPDUDiagnosticResponse.static_parse_builder(
read_buffer, response
)
@@ -505,6 +538,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x0B)
and response == bool(False)
):
+
builder = ModbusPDUGetComEventCounterRequest.static_parse_builder(
read_buffer, response
)
@@ -517,6 +551,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x0B)
and response == bool(True)
):
+
builder = ModbusPDUGetComEventCounterResponse.static_parse_builder(
read_buffer, response
)
@@ -529,6 +564,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x0C)
and response == bool(False)
):
+
builder = ModbusPDUGetComEventLogRequest.static_parse_builder(
read_buffer, response
)
@@ -541,6 +577,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x0C)
and response == bool(True)
):
+
builder = ModbusPDUGetComEventLogResponse.static_parse_builder(
read_buffer, response
)
@@ -553,6 +590,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x11)
and response == bool(False)
):
+
builder = ModbusPDUReportServerIdRequest.static_parse_builder(
read_buffer, response
)
@@ -565,6 +603,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x11)
and response == bool(True)
):
+
builder = ModbusPDUReportServerIdResponse.static_parse_builder(
read_buffer, response
)
@@ -577,6 +616,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x2B)
and response == bool(False)
):
+
builder = ModbusPDUReadDeviceIdentificationRequest.static_parse_builder(
read_buffer, response
)
@@ -589,6 +629,7 @@ class ModbusPDU(ABC, PlcMessage):
and function_flag == int(0x2B)
and response == bool(True)
):
+
builder = ModbusPDUReadDeviceIdentificationResponse.static_parse_builder(
read_buffer, response
)
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterRequest.py
index f479f66c4c..cc2a693e80 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterRequest.py
@@ -84,6 +84,7 @@ class ModbusPDUGetComEventCounterRequest(ModbusPDU):
@dataclass
class ModbusPDUGetComEventCounterRequestBuilder(ModbusPDUBuilder):
+
def build(
self,
) -> ModbusPDUGetComEventCounterRequest:
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterResponse.py
index 4a949a8df4..a9394a244f 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventCounterResponse.py
@@ -119,7 +119,7 @@ class ModbusPDUGetComEventCounterResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUGetComEventCounterResponse:
- modbus_pdu_get_com_event_counter_response: ModbusPDUGetComEventCounterResponse = ModbusPDUGetComEventCounterResponse(
- self.status, self.event_count
- )
+ modbus_pdu_get_com_event_counter_response: (
+ ModbusPDUGetComEventCounterResponse
+ ) = ModbusPDUGetComEventCounterResponse(self.status, self.event_count)
return modbus_pdu_get_com_event_counter_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventLogRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventLogRequest.py
index dd3ff4799c..afc0e27cea 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventLogRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUGetComEventLogRequest.py
@@ -84,6 +84,7 @@ class ModbusPDUGetComEventLogRequest(ModbusPDU):
@dataclass
class ModbusPDUGetComEventLogRequestBuilder(ModbusPDUBuilder):
+
def build(
self,
) -> ModbusPDUGetComEventLogRequest:
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.py
index 47f8810d84..fe133cae33 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.py
@@ -136,7 +136,9 @@ class ModbusPDUMaskWriteHoldingRegisterRequestBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUMaskWriteHoldingRegisterRequest:
- modbus_pdu_mask_write_holding_register_request: ModbusPDUMaskWriteHoldingRegisterRequest = ModbusPDUMaskWriteHoldingRegisterRequest(
+ modbus_pdu_mask_write_holding_register_request: (
+ ModbusPDUMaskWriteHoldingRegisterRequest
+ ) = ModbusPDUMaskWriteHoldingRegisterRequest(
self.reference_address, self.and_mask, self.or_mask
)
return modbus_pdu_mask_write_holding_register_request
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.py
index ad6c1de2d9..b66353324a 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.py
@@ -136,7 +136,9 @@ class ModbusPDUMaskWriteHoldingRegisterResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUMaskWriteHoldingRegisterResponse:
- modbus_pdu_mask_write_holding_register_response: ModbusPDUMaskWriteHoldingRegisterResponse = ModbusPDUMaskWriteHoldingRegisterResponse(
+ modbus_pdu_mask_write_holding_register_response: (
+ ModbusPDUMaskWriteHoldingRegisterResponse
+ ) = ModbusPDUMaskWriteHoldingRegisterResponse(
self.reference_address, self.and_mask, self.or_mask
)
return modbus_pdu_mask_write_holding_register_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.py
index 80410cc467..48e02c1b33 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.py
@@ -136,7 +136,7 @@ class ModbusPDUReadDeviceIdentificationRequestBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadDeviceIdentificationRequest:
- modbus_pdu_read_device_identification_request: ModbusPDUReadDeviceIdentificationRequest = ModbusPDUReadDeviceIdentificationRequest(
- self.level, self.object_id
- )
+ modbus_pdu_read_device_identification_request: (
+ ModbusPDUReadDeviceIdentificationRequest
+ ) = ModbusPDUReadDeviceIdentificationRequest(self.level, self.object_id)
return modbus_pdu_read_device_identification_request
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.py
index 042cb555fc..d08c8cb1a8 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.py
@@ -236,7 +236,9 @@ class ModbusPDUReadDeviceIdentificationResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadDeviceIdentificationResponse:
- modbus_pdu_read_device_identification_response: ModbusPDUReadDeviceIdentificationResponse = ModbusPDUReadDeviceIdentificationResponse(
+ modbus_pdu_read_device_identification_response: (
+ ModbusPDUReadDeviceIdentificationResponse
+ ) = ModbusPDUReadDeviceIdentificationResponse(
self.level,
self.individual_access,
self.conformity_level,
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.py
index d88d4bf623..3f1235b95c 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.py
@@ -119,7 +119,7 @@ class ModbusPDUReadDiscreteInputsResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadDiscreteInputsResponse:
- modbus_pdu_read_discrete_inputs_response: ModbusPDUReadDiscreteInputsResponse = ModbusPDUReadDiscreteInputsResponse(
- self.value
- )
+ modbus_pdu_read_discrete_inputs_response: (
+ ModbusPDUReadDiscreteInputsResponse
+ ) = ModbusPDUReadDiscreteInputsResponse(self.value)
return modbus_pdu_read_discrete_inputs_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.py
index 50f61bda45..8958d9117a 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.py
@@ -86,10 +86,11 @@ class ModbusPDUReadExceptionStatusRequest(ModbusPDU):
@dataclass
class ModbusPDUReadExceptionStatusRequestBuilder(ModbusPDUBuilder):
+
def build(
self,
) -> ModbusPDUReadExceptionStatusRequest:
- modbus_pdu_read_exception_status_request: ModbusPDUReadExceptionStatusRequest = (
- ModbusPDUReadExceptionStatusRequest()
- )
+ modbus_pdu_read_exception_status_request: (
+ ModbusPDUReadExceptionStatusRequest
+ ) = ModbusPDUReadExceptionStatusRequest()
return modbus_pdu_read_exception_status_request
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.py
index a725aa1592..2dfe2b82cf 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.py
@@ -102,7 +102,7 @@ class ModbusPDUReadExceptionStatusResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadExceptionStatusResponse:
- modbus_pdu_read_exception_status_response: ModbusPDUReadExceptionStatusResponse = ModbusPDUReadExceptionStatusResponse(
- self.value
- )
+ modbus_pdu_read_exception_status_response: (
+ ModbusPDUReadExceptionStatusResponse
+ ) = ModbusPDUReadExceptionStatusResponse(self.value)
return modbus_pdu_read_exception_status_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordRequestItem.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordRequestItem.py
index 1705d912a3..f8a7d672fa 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordRequestItem.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordRequestItem.py
@@ -104,7 +104,9 @@ class ModbusPDUReadFileRecordRequestItem:
read_buffer.pop_context("ModbusPDUReadFileRecordRequestItem")
# Create the instance
- _modbus_pdu_read_file_record_request_item: ModbusPDUReadFileRecordRequestItem = ModbusPDUReadFileRecordRequestItem(
+ _modbus_pdu_read_file_record_request_item: (
+ ModbusPDUReadFileRecordRequestItem
+ ) = ModbusPDUReadFileRecordRequestItem(
reference_type, file_number, record_number, record_length
)
return _modbus_pdu_read_file_record_request_item
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordResponseItem.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordResponseItem.py
index c30705d95c..ec75ef8b27 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordResponseItem.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadFileRecordResponseItem.py
@@ -92,9 +92,9 @@ class ModbusPDUReadFileRecordResponseItem:
read_buffer.pop_context("ModbusPDUReadFileRecordResponseItem")
# Create the instance
- _modbus_pdu_read_file_record_response_item: ModbusPDUReadFileRecordResponseItem = ModbusPDUReadFileRecordResponseItem(
- reference_type, data
- )
+ _modbus_pdu_read_file_record_response_item: (
+ ModbusPDUReadFileRecordResponseItem
+ ) = ModbusPDUReadFileRecordResponseItem(reference_type, data)
return _modbus_pdu_read_file_record_response_item
def equals(self, o: object) -> bool:
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.py
index 0b43f55eb4..b3f8e4426c 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.py
@@ -121,7 +121,7 @@ class ModbusPDUReadHoldingRegistersRequestBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadHoldingRegistersRequest:
- modbus_pdu_read_holding_registers_request: ModbusPDUReadHoldingRegistersRequest = ModbusPDUReadHoldingRegistersRequest(
- self.starting_address, self.quantity
- )
+ modbus_pdu_read_holding_registers_request: (
+ ModbusPDUReadHoldingRegistersRequest
+ ) = ModbusPDUReadHoldingRegistersRequest(self.starting_address, self.quantity)
return modbus_pdu_read_holding_registers_request
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.py
index d8d2c38615..15e88bc787 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.py
@@ -119,7 +119,7 @@ class ModbusPDUReadHoldingRegistersResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadHoldingRegistersResponse:
- modbus_pdu_read_holding_registers_response: ModbusPDUReadHoldingRegistersResponse = ModbusPDUReadHoldingRegistersResponse(
- self.value
- )
+ modbus_pdu_read_holding_registers_response: (
+ ModbusPDUReadHoldingRegistersResponse
+ ) = ModbusPDUReadHoldingRegistersResponse(self.value)
return modbus_pdu_read_holding_registers_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadInputRegistersResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadInputRegistersResponse.py
index 5aa5e0cde6..f7de49ad58 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadInputRegistersResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadInputRegistersResponse.py
@@ -119,7 +119,7 @@ class ModbusPDUReadInputRegistersResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUReadInputRegistersResponse:
- modbus_pdu_read_input_registers_response: ModbusPDUReadInputRegistersResponse = ModbusPDUReadInputRegistersResponse(
- self.value
- )
+ modbus_pdu_read_input_registers_response: (
+ ModbusPDUReadInputRegistersResponse
+ ) = ModbusPDUReadInputRegistersResponse(self.value)
return modbus_pdu_read_input_registers_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.py
index 5a48ef6924..bf9f31d642 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.py
@@ -189,7 +189,9 @@ class ModbusPDUReadWriteMultipleHoldingRegistersRequestBuilder(ModbusPDUBuilder)
def build(
self,
) -> ModbusPDUReadWriteMultipleHoldingRegistersRequest:
- modbus_pdu_read_write_multiple_holding_registers_request: ModbusPDUReadWriteMultipleHoldingRegistersRequest = ModbusPDUReadWriteMultipleHoldingRegistersRequest(
+ modbus_pdu_read_write_multiple_holding_registers_request: (
+ ModbusPDUReadWriteMultipleHoldingRegistersRequest
+ ) = ModbusPDUReadWriteMultipleHoldingRegistersRequest(
self.read_starting_address,
self.read_quantity,
self.write_starting_address,
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.py
index 8937dc1609..fc61a68570 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.py
@@ -119,7 +119,7 @@ class ModbusPDUReadWriteMultipleHoldingRegistersResponseBuilder(ModbusPDUBuilder
def build(
self,
) -> ModbusPDUReadWriteMultipleHoldingRegistersResponse:
- modbus_pdu_read_write_multiple_holding_registers_response: ModbusPDUReadWriteMultipleHoldingRegistersResponse = ModbusPDUReadWriteMultipleHoldingRegistersResponse(
- self.value
- )
+ modbus_pdu_read_write_multiple_holding_registers_response: (
+ ModbusPDUReadWriteMultipleHoldingRegistersResponse
+ ) = ModbusPDUReadWriteMultipleHoldingRegistersResponse(self.value)
return modbus_pdu_read_write_multiple_holding_registers_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReportServerIdRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReportServerIdRequest.py
index 14607d0227..b81156f67a 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReportServerIdRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUReportServerIdRequest.py
@@ -84,6 +84,7 @@ class ModbusPDUReportServerIdRequest(ModbusPDU):
@dataclass
class ModbusPDUReportServerIdRequestBuilder(ModbusPDUBuilder):
+
def build(
self,
) -> ModbusPDUReportServerIdRequest:
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordRequestItem.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordRequestItem.py
index 1d808a451a..cd8bbe1b36 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordRequestItem.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordRequestItem.py
@@ -118,7 +118,9 @@ class ModbusPDUWriteFileRecordRequestItem:
read_buffer.pop_context("ModbusPDUWriteFileRecordRequestItem")
# Create the instance
- _modbus_pdu_write_file_record_request_item: ModbusPDUWriteFileRecordRequestItem = ModbusPDUWriteFileRecordRequestItem(
+ _modbus_pdu_write_file_record_request_item: (
+ ModbusPDUWriteFileRecordRequestItem
+ ) = ModbusPDUWriteFileRecordRequestItem(
reference_type, file_number, record_number, record_data
)
return _modbus_pdu_write_file_record_request_item
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordResponseItem.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordResponseItem.py
index 023a53a250..b1e9f54b77 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordResponseItem.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteFileRecordResponseItem.py
@@ -118,7 +118,9 @@ class ModbusPDUWriteFileRecordResponseItem:
read_buffer.pop_context("ModbusPDUWriteFileRecordResponseItem")
# Create the instance
- _modbus_pdu_write_file_record_response_item: ModbusPDUWriteFileRecordResponseItem = ModbusPDUWriteFileRecordResponseItem(
+ _modbus_pdu_write_file_record_response_item: (
+ ModbusPDUWriteFileRecordResponseItem
+ ) = ModbusPDUWriteFileRecordResponseItem(
reference_type, file_number, record_number, record_data
)
return _modbus_pdu_write_file_record_response_item
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.py
index 8dd285aeb8..60828de8f9 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.py
@@ -121,7 +121,7 @@ class ModbusPDUWriteMultipleCoilsResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUWriteMultipleCoilsResponse:
- modbus_pdu_write_multiple_coils_response: ModbusPDUWriteMultipleCoilsResponse = ModbusPDUWriteMultipleCoilsResponse(
- self.starting_address, self.quantity
- )
+ modbus_pdu_write_multiple_coils_response: (
+ ModbusPDUWriteMultipleCoilsResponse
+ ) = ModbusPDUWriteMultipleCoilsResponse(self.starting_address, self.quantity)
return modbus_pdu_write_multiple_coils_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.py
index a04a760c52..cbb0919b44 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.py
@@ -153,7 +153,9 @@ class ModbusPDUWriteMultipleHoldingRegistersRequestBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUWriteMultipleHoldingRegistersRequest:
- modbus_pdu_write_multiple_holding_registers_request: ModbusPDUWriteMultipleHoldingRegistersRequest = ModbusPDUWriteMultipleHoldingRegistersRequest(
+ modbus_pdu_write_multiple_holding_registers_request: (
+ ModbusPDUWriteMultipleHoldingRegistersRequest
+ ) = ModbusPDUWriteMultipleHoldingRegistersRequest(
self.starting_address, self.quantity, self.value
)
return modbus_pdu_write_multiple_holding_registers_request
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.py
index 6bd8f4072d..7f5ac29543 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.py
@@ -123,7 +123,9 @@ class ModbusPDUWriteMultipleHoldingRegistersResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUWriteMultipleHoldingRegistersResponse:
- modbus_pdu_write_multiple_holding_registers_response: ModbusPDUWriteMultipleHoldingRegistersResponse = ModbusPDUWriteMultipleHoldingRegistersResponse(
+ modbus_pdu_write_multiple_holding_registers_response: (
+ ModbusPDUWriteMultipleHoldingRegistersResponse
+ ) = ModbusPDUWriteMultipleHoldingRegistersResponse(
self.starting_address, self.quantity
)
return modbus_pdu_write_multiple_holding_registers_response
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.py
index 90c33d472a..5e0dd6955d 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.py
@@ -119,7 +119,7 @@ class ModbusPDUWriteSingleRegisterRequestBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUWriteSingleRegisterRequest:
- modbus_pdu_write_single_register_request: ModbusPDUWriteSingleRegisterRequest = ModbusPDUWriteSingleRegisterRequest(
- self.address, self.value
- )
+ modbus_pdu_write_single_register_request: (
+ ModbusPDUWriteSingleRegisterRequest
+ ) = ModbusPDUWriteSingleRegisterRequest(self.address, self.value)
return modbus_pdu_write_single_register_request
diff --git a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.py b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.py
index ef96ece235..d551b3198b 100644
--- a/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.py
+++ b/sandbox/plc4py/plc4py/protocols/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.py
@@ -119,7 +119,7 @@ class ModbusPDUWriteSingleRegisterResponseBuilder(ModbusPDUBuilder):
def build(
self,
) -> ModbusPDUWriteSingleRegisterResponse:
- modbus_pdu_write_single_register_response: ModbusPDUWriteSingleRegisterResponse = ModbusPDUWriteSingleRegisterResponse(
- self.address, self.value
- )
+ modbus_pdu_write_single_register_response: (
+ ModbusPDUWriteSingleRegisterResponse
+ ) = ModbusPDUWriteSingleRegisterResponse(self.address, self.value)
return modbus_pdu_write_single_register_response
diff --git a/sandbox/plc4py/plc4py/protocols/simulated/readwrite/DataItem.py b/sandbox/plc4py/plc4py/protocols/simulated/readwrite/DataItem.py
index 55989bbfa0..17030d0c13 100644
--- a/sandbox/plc4py/plc4py/protocols/simulated/readwrite/DataItem.py
+++ b/sandbox/plc4py/plc4py/protocols/simulated/readwrite/DataItem.py
@@ -48,6 +48,7 @@ class DataItem:
@staticmethod
def static_parse(read_buffer: ReadBuffer, data_type: str, number_of_values: int):
if data_type == "_bool" and number_of_values == int(1): # BOOL
+
# Simple Field (value)
value: bool = read_buffer.read_bit("")
@@ -62,6 +63,7 @@ class DataItem:
return PlcList(value)
if data_type == "_byte" and number_of_values == int(1): # BYTE
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_short(8, logical_name="")
@@ -78,6 +80,7 @@ class DataItem:
return PlcList(value)
if data_type == "_word" and number_of_values == int(1): # WORD
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_int(16, logical_name="")
@@ -94,6 +97,7 @@ class DataItem:
return PlcList(value)
if data_type == "_dword" and number_of_values == int(1): # DWORD
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(32, logical_name="")
@@ -110,6 +114,7 @@ class DataItem:
return PlcList(value)
if data_type == "_lword" and number_of_values == int(1): # LWORD
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(64, logical_name="")
@@ -126,6 +131,7 @@ class DataItem:
return PlcList(value)
if data_type == "_sint" and number_of_values == int(1): # SINT
+
# Simple Field (value)
value: int = read_buffer.read_signed_byte(8, logical_name="")
@@ -142,6 +148,7 @@ class DataItem:
return PlcList(value)
if data_type == "_int" and number_of_values == int(1): # INT
+
# Simple Field (value)
value: int = read_buffer.read_short(16, logical_name="")
@@ -156,6 +163,7 @@ class DataItem:
return PlcList(value)
if data_type == "_dint" and number_of_values == int(1): # DINT
+
# Simple Field (value)
value: int = read_buffer.read_int(32, logical_name="")
@@ -170,6 +178,7 @@ class DataItem:
return PlcList(value)
if data_type == "_lint" and number_of_values == int(1): # LINT
+
# Simple Field (value)
value: int = read_buffer.read_long(64, logical_name="")
@@ -184,6 +193,7 @@ class DataItem:
return PlcList(value)
if data_type == "_usint" and number_of_values == int(1): # USINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_short(8, logical_name="")
@@ -200,6 +210,7 @@ class DataItem:
return PlcList(value)
if data_type == "_uint" and number_of_values == int(1): # UINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_int(16, logical_name="")
@@ -216,6 +227,7 @@ class DataItem:
return PlcList(value)
if data_type == "_udint" and number_of_values == int(1): # UDINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(32, logical_name="")
@@ -232,6 +244,7 @@ class DataItem:
return PlcList(value)
if data_type == "_ulint" and number_of_values == int(1): # ULINT
+
# Simple Field (value)
value: int = read_buffer.read_unsigned_long(64, logical_name="")
@@ -248,6 +261,7 @@ class DataItem:
return PlcList(value)
if data_type == "_real" and number_of_values == int(1): # REAL
+
# Simple Field (value)
value: float = read_buffer.read_float(32, logical_name="")
@@ -264,6 +278,7 @@ class DataItem:
return PlcList(value)
if data_type == "_lreal" and number_of_values == int(1): # LREAL
+
# Simple Field (value)
value: float = read_buffer.read_double(64, logical_name="")
@@ -280,6 +295,7 @@ class DataItem:
return PlcList(value)
if data_type == "_char" and number_of_values == int(1): # CHAR
+
# Simple Field (value)
value: str = read_buffer.read_str(8, logical_name="", encoding="")
@@ -298,6 +314,7 @@ class DataItem:
return PlcList(value)
if data_type == "_wchar" and number_of_values == int(1): # WCHAR
+
# Simple Field (value)
value: str = read_buffer.read_str(16, logical_name="", encoding="")
@@ -316,11 +333,13 @@ class DataItem:
return PlcList(value)
if data_type == "_string": # STRING
+
# Simple Field (value)
value: str = read_buffer.read_str(255, logical_name="", encoding="")
return PlcSTRING(value)
if data_type == "_wstring": # STRING
+
# Simple Field (value)
value: str = read_buffer.read_str(255, logical_name="", encoding="")
@@ -336,10 +355,12 @@ class DataItem:
byte_order: ByteOrder,
) -> None:
if data_type == "BOOL" and number_of_values == int(1): # BOOL
+
# Simple Field (value)
value: bool = _value.get_bool()
write_buffer.write_bit((value), "value")
if data_type == "BOOL": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -347,10 +368,12 @@ class DataItem:
write_buffer.write_bit((value), "value")
if data_type == "BYTE" and number_of_values == int(1): # BYTE
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_byte((value), 8, "value")
if data_type == "BYTE": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -358,10 +381,12 @@ class DataItem:
write_buffer.write_byte((value), 8, "value")
if data_type == "WORD" and number_of_values == int(1): # WORD
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == "WORD": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -369,10 +394,12 @@ class DataItem:
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == "DWORD" and number_of_values == int(1): # DWORD
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == "DWORD": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -380,10 +407,12 @@ class DataItem:
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == "LWORD" and number_of_values == int(1): # LWORD
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == "LWORD": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -391,10 +420,12 @@ class DataItem:
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == "SINT" and number_of_values == int(1): # SINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_signed_byte((value), 8, "value")
if data_type == "SINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -402,10 +433,12 @@ class DataItem:
write_buffer.write_signed_byte((value), 8, "value")
if data_type == "INT" and number_of_values == int(1): # INT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_short((value), 16, "value")
if data_type == "INT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -413,10 +446,12 @@ class DataItem:
write_buffer.write_short((value), 16, "value")
if data_type == "DINT" and number_of_values == int(1): # DINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_int((value), 32, "value")
if data_type == "DINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -424,10 +459,12 @@ class DataItem:
write_buffer.write_int((value), 32, "value")
if data_type == "LINT" and number_of_values == int(1): # LINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_long((value), 64, "value")
if data_type == "LINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -435,10 +472,12 @@ class DataItem:
write_buffer.write_long((value), 64, "value")
if data_type == "USINT" and number_of_values == int(1): # USINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_byte((value), 8, "value")
if data_type == "USINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -446,10 +485,12 @@ class DataItem:
write_buffer.write_byte((value), 8, "value")
if data_type == "UINT" and number_of_values == int(1): # UINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == "UINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -457,10 +498,12 @@ class DataItem:
write_buffer.write_unsigned_short((value), 16, "value")
if data_type == "UDINT" and number_of_values == int(1): # UDINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == "UDINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -468,10 +511,12 @@ class DataItem:
write_buffer.write_unsigned_int((value), 32, "value")
if data_type == "ULINT" and number_of_values == int(1): # ULINT
+
# Simple Field (value)
value: int = _value.get_int()
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == "ULINT": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -479,10 +524,12 @@ class DataItem:
write_buffer.write_unsigned_long((value), 64, "value")
if data_type == "REAL" and number_of_values == int(1): # REAL
+
# Simple Field (value)
value: float = _value.get_float()
write_buffer.write_float((value), 32, "value")
if data_type == "REAL": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -490,10 +537,12 @@ class DataItem:
write_buffer.write_float((value), 32, "value")
if data_type == "LREAL" and number_of_values == int(1): # LREAL
+
# Simple Field (value)
value: float = _value.get_float()
write_buffer.write_double((value), 64, "value")
if data_type == "LREAL": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -501,10 +550,12 @@ class DataItem:
write_buffer.write_double((value), 64, "value")
if data_type == "CHAR" and number_of_values == int(1): # CHAR
+
# Simple Field (value)
value: str = _value.get_str()
write_buffer.write_str((value), 8, "UTF-8", "value")
if data_type == "CHAR": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -512,10 +563,12 @@ class DataItem:
write_buffer.write_str((value), 8, "UTF-8", "value")
if data_type == "WCHAR" and number_of_values == int(1): # WCHAR
+
# Simple Field (value)
value: str = _value.get_str()
write_buffer.write_str((value), 16, "UTF-16", "value")
if data_type == "WCHAR": # List
+
values: PlcList = _value
for val in values.get_list():
@@ -523,10 +576,12 @@ class DataItem:
write_buffer.write_str((value), 16, "UTF-16", "value")
if data_type == "STRING": # STRING
+
# Simple Field (value)
value: str = _value.get_str()
write_buffer.write_str((value), 255, "UTF-8", "value")
if data_type == "WSTRING": # STRING
+
# Simple Field (value)
value: str = _value.get_str()
write_buffer.write_str((value), 255, "UTF-16", "value")
(plc4x) 03/03: fix: Reduced the version of the rat plugin till the version 0.16.1 is released, which will fix the problem causing the build to pause for several minutes.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 1f9a949a781955c6e38d355ba5f188b767062765
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sat Jan 27 19:25:11 2024 +0100
fix: Reduced the version of the rat plugin till the version 0.16.1 is released, which will fix the problem causing the build to pause for several minutes.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7c32f2b38d..71b4cc3c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1053,7 +1053,7 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<!-- TODO: There currently is a significant performance degradation when using version 0.16 which will be fixed in version 0.16.1, once it's released -->
- <version>0.16</version>
+ <version>0.15</version>
<configuration>
<!--
Make rat output the files with missing licensed directly into the