This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 93787080fc870af3e72c9497138a6415dd34b674
Author: Christofer Dutz <christofer.d...@c-ware.de>
AuthorDate: Fri Aug 22 19:19:11 2025 +0200
chore: Minor fixes.
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 52 +++++++++++++++++++++-
.../java/s7/readwrite/ManualS7CounterTest.java | 4 +-
.../plc4x/java/s7/readwrite/ManualS7Test.java | 23 ++++++++++
.../java/spi/generation/ReadBufferByteBased.java | 8 ++--
.../protocols/knxnetip/knx-master-data.mspec | 7 ++-
5 files changed, 84 insertions(+), 10 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 1f53679f1d..b71acef8cd 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -793,8 +793,11 @@ const (
KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH
KnxManufacturer = 747
KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD
KnxManufacturer = 748
KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED
KnxManufacturer = 749
- KnxManufacturer_M_ABB___RESERVED
KnxManufacturer = 750
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
KnxManufacturer = 751
+ KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_
KnxManufacturer = 750
+ KnxManufacturer_M_TECCO_PTY_LTD
KnxManufacturer = 751
+ KnxManufacturer_M_A_LAN_TECHNOLOGIE
KnxManufacturer = 752
+ KnxManufacturer_M_ABB___RESERVED
KnxManufacturer = 753
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
KnxManufacturer = 754
)
var KnxManufacturerValues []KnxManufacturer
@@ -1552,6 +1555,9 @@ func init() {
KnxManufacturer_M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH,
KnxManufacturer_M_GIANFRANCO_SMART_SOLUTIONS_LTD,
KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED,
+
KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_,
+ KnxManufacturer_M_TECCO_PTY_LTD,
+ KnxManufacturer_M_A_LAN_TECHNOLOGIE,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -4461,6 +4467,18 @@ func (e KnxManufacturer) Number() uint16 {
}
case 751:
{ /* '751' */
+ return 812
+ }
+ case 752:
+ { /* '752' */
+ return 813
+ }
+ case 753:
+ { /* '753' */
+ return 43954
+ }
+ case 754:
+ { /* '754' */
return 43959
}
case 76:
@@ -7487,6 +7505,18 @@ func (e KnxManufacturer) Name() string {
}
case 751:
{ /* '751' */
+ return "Tecco Pty Ltd"
+ }
+ case 752:
+ { /* '752' */
+ return "A-LAN Technologie"
+ }
+ case 753:
+ { /* '753' */
+ return "ABB - reserved"
+ }
+ case 754:
+ { /* '754' */
return "Busch-Jaeger Elektro - reserved"
}
case 76:
@@ -9061,6 +9091,12 @@ func KnxManufacturerByValue(value uint16) (enum
KnxManufacturer, ok bool) {
case 750:
return KnxManufacturer_M_ABB___RESERVED, true
case 751:
+ return KnxManufacturer_M_TECCO_PTY_LTD, true
+ case 752:
+ return KnxManufacturer_M_A_LAN_TECHNOLOGIE, true
+ case 753:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 754:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 76:
return KnxManufacturer_M_HDL, true
@@ -10568,6 +10604,12 @@ func KnxManufacturerByName(value string) (enum
KnxManufacturer, ok bool) {
return KnxManufacturer_M_ROGERWELL_CONTROL_SYSTEM_LIMITED, true
case "M_TAPKO_TECHNOLOGIES":
return KnxManufacturer_M_TAPKO_TECHNOLOGIES, true
+ case "M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_":
+ return
KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_, true
+ case "M_TECCO_PTY_LTD":
+ return KnxManufacturer_M_TECCO_PTY_LTD, true
+ case "M_A_LAN_TECHNOLOGIE":
+ return KnxManufacturer_M_A_LAN_TECHNOLOGIE, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -12150,6 +12192,12 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_ROGERWELL_CONTROL_SYSTEM_LIMITED"
case KnxManufacturer_M_TAPKO_TECHNOLOGIES:
return "M_TAPKO_TECHNOLOGIES"
+ case KnxManufacturer_M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_:
+ return "M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_"
+ case KnxManufacturer_M_TECCO_PTY_LTD:
+ return "M_TECCO_PTY_LTD"
+ case KnxManufacturer_M_A_LAN_TECHNOLOGIE:
+ return "M_A_LAN_TECHNOLOGIE"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
diff --git
a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7CounterTest.java
b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7CounterTest.java
index 1ebadc9c77..917a380c62 100644
---
a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7CounterTest.java
+++
b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7CounterTest.java
@@ -52,9 +52,9 @@ public class ManualS7CounterTest {
writeBuilder.addTagAddress("counter-3", "%C18:COUNTER",
Integer.decode("0x0012"));
final PlcWriteRequest writeRequest = writeBuilder.build();
- final PlcWriteResponse writeResposne =
writeRequest.execute().get();
+ final PlcWriteResponse writeResponse =
writeRequest.execute().get();
- if ( writeResposne.getResponseCode("counter-3") ==
PlcResponseCode.OK ){
+ if ( writeResponse.getResponseCode("counter-3") ==
PlcResponseCode.OK ){
System.out.println("Write the counter");
} else {
System.out.println("Problems....");
diff --git
a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7Test.java
b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7Test.java
new file mode 100644
index 0000000000..1593c1a4eb
--- /dev/null
+++
b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7Test.java
@@ -0,0 +1,23 @@
+package org.apache.plc4x.java.s7.readwrite;
+
+import org.apache.plc4x.java.DefaultPlcDriverManager;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
+import org.apache.plc4x.java.api.value.PlcValue;
+
+import java.util.List;
+
+public class ManualS7Test {
+
+ public static void main(String[] args) throws Exception {
+ try (PlcConnection connection = new
DefaultPlcDriverManager().getConnection("s7-light://192.168.23.30")) {
+ final PlcReadRequest.Builder readBuilder =
connection.readRequestBuilder();
+ readBuilder.addTagAddress("test", "%DB4:1:BYTE[100]");
+ PlcReadResponse plcReadResponse =
readBuilder.build().execute().get();
+ PlcValue test = plcReadResponse.getPlcValue("test");
+ List<? extends PlcValue> list = test.getList();
+ }
+ }
+
+}
diff --git
a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/ReadBufferByteBased.java
b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/ReadBufferByteBased.java
index c6f5befc52..c0be43d97b 100644
---
a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/ReadBufferByteBased.java
+++
b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/ReadBufferByteBased.java
@@ -144,7 +144,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned byte must contain at least 1
bit");
}
if (bitLength > 7) {
- throw new ParseException("unsigned byte can only contain max 4
bits");
+ throw new ParseException("unsigned byte can only contain max 7
bits");
}
try {
String encoding = extractEncoding(readerArgs).orElse("default");
@@ -177,7 +177,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned short must contain at least 1
bit");
}
if (bitLength > 15) {
- throw new ParseException("unsigned short can only contain max 8
bits");
+ throw new ParseException("unsigned short can only contain max 15
bits");
}
try {
String encoding = extractEncoding(readerArgs).orElse("default");
@@ -228,7 +228,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned int must contain at least 1
bit");
}
if (bitLength > 31) {
- throw new ParseException("unsigned int can only contain max 16
bits");
+ throw new ParseException("unsigned int can only contain max 31
bits");
}
try {
String encoding = extractEncoding(readerArgs).orElse("default");
@@ -282,7 +282,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned long must contain at least 1
bit");
}
if (bitLength > 63) {
- throw new ParseException("unsigned long can only contain max 32
bits");
+ throw new ParseException("unsigned long can only contain max 63
bits");
}
try {
String encoding = extractEncoding(readerArgs).orElse("default");
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 b18ccfddd9..fa0a5dbec4 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
@@ -1499,8 +1499,11 @@
['747' M_ALZINGERANDVOGEL_SOFTWAREENTWICKLUNGS_GMBH ['808',
'"Alzinger&Vogel Softwareentwicklungs GmbH"']]
['748' M_GIANFRANCO_SMART_SOLUTIONS_LTD ['809', '"Gianfranco Smart
Solutions Ltd"']]
['749' M_ROGERWELL_CONTROL_SYSTEM_LIMITED ['810', '"Rogerwell Control
System Limited"']]
- ['750' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['751' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
+ ['750' M_SHANGHAI_YUKON_AUTOMATION_TECHNOLOGIES_CO___LTD_ ['811',
'"Shanghai YUKON Automation Technologies Co., Ltd."']]
+ ['751' M_TECCO_PTY_LTD ['812', '"Tecco Pty Ltd"']]
+ ['752' M_A_LAN_TECHNOLOGIE ['813', '"A-LAN Technologie"']]
+ ['753' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['754' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
]
