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
The following commit(s) were added to refs/heads/develop by this push:
new b47ac1f280 fix: Made surefire and failsafe execute the dynamic tests
again and fixed any issues that were caused by the tests not running for
several weeks.
b47ac1f280 is described below
commit b47ac1f2801e0a187f3c222c80f7715265a47a95
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu Sep 18 16:38:12 2025 +0200
fix: Made surefire and failsafe execute the dynamic tests again and fixed
any issues that were caused by the tests not running for several weeks.
---
.../java/knxnetip/readwrite/KnxManufacturer.java | 19 +++--
.../java/modbus/readwrite/utils/StaticHelper.java | 4 +-
.../readwrite/OpenProtocolMessage.java | 4 +-
.../java/spi/generation/ReadBufferByteBased.java | 40 +++++----
.../java/spi/generation/WriteBufferByteBased.java | 28 +++----
pom.xml | 4 +-
.../protocols/knxnetip/knx-master-data.mspec | 17 ++--
.../tcp/Modbus-all-datatypes-little-endian.xml | 98 ++++++++++------------
.../protocols/modbus/tcp/Modbus-all-datatypes.xml | 98 ++++++++++------------
.../protocols/openprotocol/open-protocol.mspec | 36 ++++----
10 files changed, 172 insertions(+), 176 deletions(-)
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 d92379b9d0..39e11758d0 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
@@ -28,11 +28,11 @@ import java.util.Map;
public enum KnxManufacturer {
M_UNKNOWN((int) 0, (int) 0, (String) "Unknown Manufacturer"),
M_SIEMENS((int) 1, (int) 1, (String) "Siemens"),
- M_ABB((int) 2, (int) 2, (String) "ABB"),
+ M_ABB_AG_STOTZ___KONTAKT((int) 2, (int) 2, (String) "ABB AG (Stotz -
Kontakt)"),
M_ALBRECHT_JUNG((int) 3, (int) 4, (String) "Albrecht Jung"),
M_BTICINO((int) 4, (int) 5, (String) "Bticino"),
M_BERKER((int) 5, (int) 6, (String) "Berker"),
- M_BUSCH_JAEGER_ELEKTRO((int) 6, (int) 7, (String) "Busch-Jaeger Elektro"),
+ M_ABB_AG_BUSCH___JAEGER((int) 6, (int) 7, (String) "ABB AG (Busch -
Jaeger)"),
M_GIRA_GIERSIEPEN((int) 7, (int) 8, (String) "GIRA Giersiepen"),
M_HAGER_ELECTRO((int) 8, (int) 9, (String) "Hager Electro"),
M_INSTA_GMBH((int) 9, (int) 10, (String) "Insta GmbH"),
@@ -613,7 +613,8 @@ public enum KnxManufacturer {
(int) 533, (int) 588, (String) "WUERTH ELEKTRONIK STELVIO KONTEK
S.p.A."),
M_NANOTECO_CORPORATION((int) 534, (int) 589, (String) "NANOTECO
corporation"),
M_NIETIAN((int) 535, (int) 590, (String) "Nietian"),
- M_SUMSIR((int) 536, (int) 591, (String) "Sumsir"),
+ M_GUANGZHOU_SUMSIR_INTELLIGENT_TECHNOLOGY_CO___LTD(
+ (int) 536, (int) 591, (String) "Guangzhou Sumsir Intelligent Technology
Co., Ltd"),
M_ORBIS_TECNOLOGIA_ELECTRICA_SA((int) 537, (int) 592, (String) "ORBIS
TECNOLOGIA ELECTRICA SA"),
M_NANJING_ZHONGYI_IOT_TECHNOLOGY_CO___LTD_(
(int) 538, (int) 593, (String) "Nanjing Zhongyi IoT Technology Co.,
Ltd."),
@@ -835,7 +836,7 @@ public enum KnxManufacturer {
M_LAPP((int) 712, (int) 773, (String) "LAPP"),
M_ZEROBIT_DYNAMIC((int) 713, (int) 774, (String) "ZEROBIT DYNAMIC"),
M_HAVELLS((int) 714, (int) 775, (String) "havells"),
- M_MULLER_INTUITIV((int) 715, (int) 776, (String) "Muller Intuitiv"),
+ M_INTUIS_ELEC((int) 715, (int) 776, (String) "intuis-Elec"),
M_TASKIT_GMBH((int) 716, (int) 777, (String) "taskit GmbH"),
M_COSTER_GROUP((int) 717, (int) 778, (String) "Coster Group"),
M_NXP_SEMICONDUCTOR((int) 718, (int) 779, (String) "NXP Semiconductor"),
@@ -886,9 +887,15 @@ public enum KnxManufacturer {
M_VOLTAN_TECHNOLOGY((int) 753, (int) 814, (String) "Voltan Technology"),
M_BAERWINKEL_AND_STRASSER_GMBH((int) 754, (int) 815, (String) "Baerwinkel &
Strasser GmbH"),
M_CATERLUX((int) 755, (int) 816, (String) "Caterlux"),
- M_ABB___RESERVED((int) 756, (int) 43954, (String) "ABB - reserved"),
+ M_EVOTEC_SOLUTION_LTD((int) 756, (int) 817, (String) "evotec solution ltd"),
+ M_NANTONG_JINGXI((int) 757, (int) 818, (String) "NanTong JingXi"),
+ M_ENERVON_TECHNOLOGY((int) 758, (int) 819, (String) "Enervon Technology"),
+ M_STRUCTURED_CABLE_PRODUCTS((int) 759, (int) 820, (String) "structured cable
products"),
+ M_JIWU_FUZHOU_TECHNOLOGY_CO___LTD_(
+ (int) 760, (int) 821, (String) "Jiwu (Fuzhou) Technology Co., Ltd."),
+ M_ABB___RESERVED((int) 761, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 757, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 762, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
static {
diff --git
a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/readwrite/utils/StaticHelper.java
b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/readwrite/utils/StaticHelper.java
index 2dda3b161d..2d972cfca0 100644
---
a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/readwrite/utils/StaticHelper.java
+++
b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/readwrite/utils/StaticHelper.java
@@ -26,7 +26,7 @@ public class StaticHelper {
// 8 Bit checksum, (byte) transported as 2 characters
public static short asciiLrcCheck(short address, ModbusPDU pdu) {
- final WriteBufferByteBased writeBufferByteBased = new
WriteBufferByteBased(pdu.getLengthInBytes() + 2);
+ final WriteBufferByteBased writeBufferByteBased = new
WriteBufferByteBased(pdu.getLengthInBytes() + 1);
try {
writeBufferByteBased.writeUnsignedShort(8, address);
pdu.serialize(writeBufferByteBased);
@@ -53,7 +53,7 @@ public class StaticHelper {
// Using the algorithm from PI_MBUS_300.pdf page 121
public static int rtuCrcCheck(short address, ModbusPDU pdu) {
- final WriteBufferByteBased writeBufferByteBased = new
WriteBufferByteBased(pdu.getLengthInBytes() + 2);
+ final WriteBufferByteBased writeBufferByteBased = new
WriteBufferByteBased(pdu.getLengthInBytes() + 1);
try {
writeBufferByteBased.writeUnsignedShort(8, address);
pdu.serialize(writeBufferByteBased);
diff --git
a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java
b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java
index 4f761d86cb..657ac7ef6d 100644
---
a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java
+++
b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java
@@ -185,7 +185,7 @@ public abstract class OpenProtocolMessage implements
Message {
// Const Field (end)
writeConstField(
- "end", END, writeUnsignedShort(writeBuffer, 8),
WithOption.WithEncoding("ASCII"));
+ "end", END, writeUnsignedShort(writeBuffer, 8),
WithOption.WithEncoding("unsigned-binary"));
writeBuffer.popContext("OpenProtocolMessage");
}
@@ -484,7 +484,7 @@ public abstract class OpenProtocolMessage implements
Message {
"end",
readUnsignedShort(readBuffer, 8),
OpenProtocolMessage.END,
- WithOption.WithEncoding("ASCII"));
+ WithOption.WithEncoding("unsigned-binary"));
readBuffer.closeContext("OpenProtocolMessage");
// Create the instance
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..cacf9907d1 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
@@ -147,9 +147,9 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned byte can only contain max 4
bits");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("unsigned-binary");
switch (encoding) {
- case "default":
+ case "unsigned-binary":
return bi.readByte(true, bitLength);
// BCD = Binary Encoded Decimal (A decimal number is
represented by a sequence of 4 bit hexadecimal values from 0-9.
// https://www.elektronik-kompendium.de/sites/dig/1010311.htm
@@ -180,7 +180,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned short can only contain max 8
bits");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII":
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -194,6 +194,9 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
String stringValue = new String(stringBytes,
StandardCharsets.US_ASCII);
stringValue = stringValue.trim();
+ if(stringValue.isEmpty()) {
+ return 0;
+ }
return Short.parseShort(stringValue);
case "BCD":
if (bitLength % 4 != 0) {
@@ -210,7 +213,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
value += (short) (digit * Math.pow(10, i));
}
return value;
- case "default":
+ case "unsigned-binary":
// No need to flip here as we're only reading one byte.
return bi.readShort(true, bitLength);
default:
@@ -231,7 +234,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned int can only contain max 16
bits");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII":
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -245,6 +248,9 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
String stringValue = new String(stringBytes,
StandardCharsets.US_ASCII);
stringValue = stringValue.trim();
+ if(stringValue.isEmpty()) {
+ return 0;
+ }
return Integer.parseInt(stringValue);
case "BCD":
if (bitLength % 4 != 0) {
@@ -261,7 +267,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
value += (int) (digit * Math.pow(10, i));
}
return value;
- case "default":
+ case "unsigned-binary":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
final int longValue = bi.readInt(true, bitLength);
return Integer.reverseBytes(longValue) >>> (32 -
bitLength);
@@ -285,7 +291,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned long can only contain max 32
bits");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII":
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -299,6 +305,9 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
String stringValue = new String(stringBytes,
StandardCharsets.US_ASCII);
stringValue = stringValue.trim();
+ if(stringValue.isEmpty()) {
+ return 0L;
+ }
return Long.parseLong(stringValue);
case "BCD":
if (bitLength % 4 != 0) {
@@ -335,7 +344,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
return result;
}
- case "default":
+ case "unsigned-binary":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
final long longValue = bi.readLong(true, bitLength);
return Long.reverseBytes(longValue) >>> 32;
@@ -357,7 +366,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("unsigned long must contain at least 1
bit");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII":
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -371,6 +380,9 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
String stringValue = new String(stringBytes,
StandardCharsets.US_ASCII);
stringValue = stringValue.trim();
+ if(stringValue.isEmpty()) {
+ return BigInteger.ZERO;
+ }
return new BigInteger(stringValue);
case "BCD":
if (bitLength % 4 != 0) {
@@ -408,7 +420,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
return BigInteger.valueOf(result);
}
- case "default":
+ case "unsigned-binary":
// Read as signed value
long val = bi.readLong(false, bitLength);
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
@@ -473,7 +485,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("int can only contain max 32 bits");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("twos-complement");
switch (encoding) {
case "VARDINT": {
int result = 0;
@@ -496,7 +508,7 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
}
return result;
}
- case "default":
+ case "twos-complement":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
return Integer.reverseBytes(bi.readInt(false,
bitLength));
}
@@ -520,9 +532,9 @@ public class ReadBufferByteBased implements ReadBuffer,
BufferCommons {
throw new ParseException("long can only contain max 64 bits");
}
try {
- String encoding = extractEncoding(readerArgs).orElse("default");
+ String encoding =
extractEncoding(readerArgs).orElse("twos-complement");
switch (encoding) {
- case "default":
+ case "twos-complement":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
return Long.reverseBytes(bi.readLong(false,
bitLength));
}
diff --git
a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferByteBased.java
b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferByteBased.java
index d21a891f4e..d34bb8f8dc 100644
---
a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferByteBased.java
+++
b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferByteBased.java
@@ -105,7 +105,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
throw new SerializationException("unsigned byte can only contain
max 8 bits");
}
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("unsigned-binary");
switch (encoding) {
case "BCD":
if(bitLength % 4 != 0) {
@@ -116,7 +116,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
}
bo.writeByte(true, bitLength, value);
break;
- case "default":
+ case "unsigned-binary":
bo.writeByte(true, bitLength, value);
break;
default:
@@ -136,7 +136,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
throw new SerializationException("unsigned short can only contain
max 16 bits");
}
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII": {
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -171,7 +171,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
}
break;
}
- case "default":
+ case "unsigned-binary":
bo.writeShort(true, bitLength, value);
break;
default:
@@ -191,7 +191,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
throw new SerializationException("unsigned int can only contain
max 32 bits");
}
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII": {
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -226,7 +226,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
}
break;
}
- case "default":
+ case "unsigned-binary":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
value = Integer.reverseBytes(value) >> (32 -
bitLength);
}
@@ -249,7 +249,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
throw new SerializationException("unsigned long can only contain
max 63 bits");
}
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII": {
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -316,7 +316,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
}
break;
}
- case "default":
+ case "unsigned-binary":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
value = Long.reverseBytes(value) >> 32;
}
@@ -333,7 +333,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
@Override
public void writeUnsignedBigInteger(String logicalName, int bitLength,
BigInteger value, WithWriterArgs... writerArgs) throws SerializationException {
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("unsigned-binary");
switch (encoding) {
case "ASCII":
// AsciiUint can only decode values that have a multiple
of 8 length.
@@ -386,7 +386,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
writeByte((byte) b);
}
return;
- case "default":
+ case "unsigned-binary":
if (bitLength == 64) {
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
if
(value.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) >= 0) {
@@ -456,7 +456,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
throw new SerializationException("int can only contain max 32
bits");
}
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("twos-complement");
switch (encoding) {
// https://en.wikipedia.org/wiki/Variable-length_quantity
// The first byte of a var-length signed integer contains only
6 bits (the last 6)
@@ -485,7 +485,7 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
}
break;
}
- case "default":
+ case "twos-complement":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
value = Integer.reverseBytes(value);
}
@@ -509,9 +509,9 @@ public class WriteBufferByteBased implements WriteBuffer,
BufferCommons {
throw new SerializationException("long can only contain max 64
bits");
}
try {
- String encoding = extractEncoding(writerArgs).orElse("default");
+ String encoding =
extractEncoding(writerArgs).orElse("twos-complement");
switch (encoding) {
- case "default":
+ case "twos-complement":
if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
value = Long.reverseBytes(value);
}
diff --git a/pom.xml b/pom.xml
index 8c8e7a664e..62b6794b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1062,7 +1062,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.3</version>
+ <version>3.5.4</version>
<configuration>
<excludedGroups>${excluded-test-groups}</excludedGroups>
</configuration>
@@ -1071,7 +1071,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>3.5.3</version>
+ <version>3.5.4</version>
</plugin>
<plugin>
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 ac696d7461..ceb84bc8c8 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
@@ -751,11 +751,11 @@
[enum uint 16 KnxManufacturer(uint 16 number, string 8 name)
['0' M_UNKNOWN ['0', '"Unknown Manufacturer"']]
['1' M_SIEMENS ['1', '"Siemens"']]
- ['2' M_ABB ['2', '"ABB"']]
+ ['2' M_ABB_AG_STOTZ___KONTAKT ['2', '"ABB AG (Stotz - Kontakt)"']]
['3' M_ALBRECHT_JUNG ['4', '"Albrecht Jung"']]
['4' M_BTICINO ['5', '"Bticino"']]
['5' M_BERKER ['6', '"Berker"']]
- ['6' M_BUSCH_JAEGER_ELEKTRO ['7', '"Busch-Jaeger Elektro"']]
+ ['6' M_ABB_AG_BUSCH___JAEGER ['7', '"ABB AG (Busch - Jaeger)"']]
['7' M_GIRA_GIERSIEPEN ['8', '"GIRA Giersiepen"']]
['8' M_HAGER_ELECTRO ['9', '"Hager Electro"']]
['9' M_INSTA_GMBH ['10', '"Insta GmbH"']]
@@ -1285,7 +1285,7 @@
['533' M_WUERTH_ELEKTRONIK_STELVIO_KONTEK_S_P_A_ ['588', '"WUERTH
ELEKTRONIK STELVIO KONTEK S.p.A."']]
['534' M_NANOTECO_CORPORATION ['589', '"NANOTECO corporation"']]
['535' M_NIETIAN ['590', '"Nietian"']]
- ['536' M_SUMSIR ['591', '"Sumsir"']]
+ ['536' M_GUANGZHOU_SUMSIR_INTELLIGENT_TECHNOLOGY_CO___LTD ['591',
'"Guangzhou Sumsir Intelligent Technology Co., Ltd"']]
['537' M_ORBIS_TECNOLOGIA_ELECTRICA_SA ['592', '"ORBIS TECNOLOGIA
ELECTRICA SA"']]
['538' M_NANJING_ZHONGYI_IOT_TECHNOLOGY_CO___LTD_ ['593', '"Nanjing
Zhongyi IoT Technology Co., Ltd."']]
['539' M_ANLIPS ['594', '"Anlips"']]
@@ -1464,7 +1464,7 @@
['712' M_LAPP ['773', '"LAPP"']]
['713' M_ZEROBIT_DYNAMIC ['774', '"ZEROBIT DYNAMIC"']]
['714' M_HAVELLS ['775', '"havells"']]
- ['715' M_MULLER_INTUITIV ['776', '"Muller Intuitiv"']]
+ ['715' M_INTUIS_ELEC ['776', '"intuis-Elec"']]
['716' M_TASKIT_GMBH ['777', '"taskit GmbH"']]
['717' M_COSTER_GROUP ['778', '"Coster Group"']]
['718' M_NXP_SEMICONDUCTOR ['779', '"NXP Semiconductor"']]
@@ -1505,8 +1505,13 @@
['753' M_VOLTAN_TECHNOLOGY ['814', '"Voltan Technology"']]
['754' M_BAERWINKEL_AND_STRASSER_GMBH ['815', '"Baerwinkel & Strasser
GmbH"']]
['755' M_CATERLUX ['816', '"Caterlux"']]
- ['756' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['757' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
+ ['756' M_EVOTEC_SOLUTION_LTD ['817', '"evotec solution ltd"']]
+ ['757' M_NANTONG_JINGXI ['818', '"NanTong JingXi"']]
+ ['758' M_ENERVON_TECHNOLOGY ['819', '"Enervon Technology"']]
+ ['759' M_STRUCTURED_CABLE_PRODUCTS ['820', '"structured cable products"']]
+ ['760' M_JIWU_FUZHOU_TECHNOLOGY_CO___LTD_ ['821', '"Jiwu (Fuzhou)
Technology Co., Ltd."']]
+ ['761' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['762' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
]
diff --git
a/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes-little-endian.xml
b/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes-little-endian.xml
index 7e46dc7933..19ee986199 100644
---
a/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes-little-endian.xml
+++
b/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes-little-endian.xml
@@ -153,18 +153,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">0</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x0100</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">0</address>
+ <value dataType="uint" bitLength="16">256</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -348,18 +346,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">1</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x2a00</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">1</address>
+ <value dataType="uint" bitLength="16">10752</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -543,18 +539,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">2</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0xb8a5</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">2</address>
+ <value dataType="uint" bitLength="16">47269</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -933,18 +927,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">9</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0xd600</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">9</address>
+ <value dataType="uint" bitLength="16">54784</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -1128,18 +1120,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">10</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x2a00</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">10</address>
+ <value dataType="uint" bitLength="16">10752</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -1323,18 +1313,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">11</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x88f6</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">11</address>
+ <value dataType="uint" bitLength="16">35062</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -1518,18 +1506,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">12</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0xb8a5</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">12</address>
+ <value dataType="uint" bitLength="16">47269</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
diff --git
a/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes.xml
b/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes.xml
index 938027aff6..550a06dc86 100644
---
a/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes.xml
+++
b/protocols/modbus/src/test/resources/protocols/modbus/tcp/Modbus-all-datatypes.xml
@@ -147,18 +147,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">0</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x0001</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">0</address>
+ <value dataType="uint" bitLength="16">1</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -342,18 +340,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">1</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x002a</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">1</address>
+ <value dataType="uint" bitLength="16">42</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -537,18 +533,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">2</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0xa5b8</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">2</address>
+ <value dataType="uint" bitLength="16">42424</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -927,18 +921,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">9</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x00d6</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">9</address>
+ <value dataType="uint" bitLength="16">214</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -1122,18 +1114,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">10</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0x002a</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">10</address>
+ <value dataType="uint" bitLength="16">42</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -1317,18 +1307,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">11</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0xf688</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">11</address>
+ <value dataType="uint" bitLength="16">63112</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
@@ -1512,18 +1500,16 @@
<ModbusTcpADU>
<transactionIdentifier dataType="uint"
bitLength="16">1</transactionIdentifier>
<protocolIdentifier dataType="uint"
bitLength="16">0</protocolIdentifier>
- <length dataType="uint" bitLength="16">9</length>
+ <length dataType="uint" bitLength="16">6</length>
<unitIdentifier dataType="uint" bitLength="8">1</unitIdentifier>
<pdu>
<ModbusPDU>
<errorFlag dataType="bit" bitLength="1">false</errorFlag>
- <functionFlag dataType="uint" bitLength="7">16</functionFlag>
- <ModbusPDUWriteMultipleHoldingRegistersRequest>
- <startingAddress dataType="uint"
bitLength="16">12</startingAddress>
- <quantity dataType="uint" bitLength="16">1</quantity>
- <byteCount dataType="uint" bitLength="8">2</byteCount>
- <value dataType="byte" bitLength="16">0xa5b8</value>
- </ModbusPDUWriteMultipleHoldingRegistersRequest>
+ <functionFlag dataType="uint" bitLength="7">6</functionFlag>
+ <ModbusPDUWriteSingleRegisterRequest>
+ <address dataType="uint" bitLength="16">12</address>
+ <value dataType="uint" bitLength="16">42424</value>
+ </ModbusPDUWriteSingleRegisterRequest>
</ModbusPDU>
</pdu>
</ModbusTcpADU>
diff --git
a/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
b/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
index 23bed32894..718ed63dd5 100644
---
a/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
+++
b/protocols/open-protocol/src/main/resources/protocols/openprotocol/open-protocol.mspec
@@ -1531,7 +1531,7 @@
]
]
]
- [const uint 8 end 0x00
]
+ [const uint 8 end 0x00
encoding='"unsigned-binary"']
]
[type VariableDataField
@@ -1767,7 +1767,7 @@
['9999' KeepAliveOpenProtocolCommunication
] // OK *
]
-[enum uint 16 ApplicationCommunicationError
+[enum uint 16 ApplicationCommunicationError
['0' NoError
]
['1' InvalidData
]
['2' ParameterSetIdNotPresent
]
@@ -1863,7 +1863,7 @@
['99' UnknownMid
]
]
-[enum uint 32 LinkLevelNegativeAcknowledgeError
+[enum uint 32 LinkLevelNegativeAcknowledgeError
['0' NoError
]
['1' InvalidLength
]
['2' InvalidRevision
]
@@ -1871,40 +1871,40 @@
['4' InconsistencyOfNumberOfMessages
]
]
-[enum uint 8 RotationDirection
+[enum uint 8 RotationDirection
['0' Undefined
]
['1' Clockwise
]
['2' CounterClockwise
]
]
-[enum uint 8 NokOk
+[enum uint 8 NokOk
['0' NOK
]
['1' OK
]
]
-[enum uint 8 OkNok
+[enum uint 8 OkNok
['0' OK
]
['1' NOK
]
]
-[enum uint 8 NoYes
+[enum uint 8 NoYes
['0' No
]
['1' Yes
]
]
-[enum uint 8 Status
+[enum uint 8 Status
['0' Low
]
['1' OK
]
['2' High
]
]
-[enum uint 8 BatchStatus
+[enum uint 8 BatchStatus
['0' NOK
]
['1' OK
]
['2' Unused
]
]
-[enum uint 16 Strategy
+[enum uint 16 Strategy
['1' TorqueControl
]
['2' TorqueControlAngleMonitoring
]
['3' TorqueControlAngleControlAnd
]
@@ -1934,7 +1934,7 @@
['99' NoStrategy
]
]
-[enum uint 8 Unit
+[enum uint 8 Unit
['1' Nm
]
['2' LbfFt
]
['3' LbfIn
]
@@ -1945,7 +1945,7 @@
['8' Ncm
]
]
-[enum uint 8 ResultType
+[enum uint 8 ResultType
['1' Tightening
]
['2' Loosening
]
['3' BatchIncrement
]
@@ -1956,7 +1956,7 @@
['8' ReferenceSetup
]
]
-[enum uint 24 TraceType
+[enum uint 24 TraceType
['1' AngleTrace
]
['2' TorqueTrace
]
['3' CurrentTrace
]
@@ -1966,29 +1966,29 @@
['999' UnsubscribeOnAll
]
]
-[enum uint 8 AlarmActiveStatus
+[enum uint 8 AlarmActiveStatus
['0' NoAlarmIsActive
]
['1' AlarmIsActive
]
]
-[enum uint 8 ForcedOrder
+[enum uint 8 ForcedOrder
['0' FreeOrder
]
['1' ForcedOrder
]
['2' FreeAndForced
]
]
-[enum uint 8 ToolLoosening
+[enum uint 8 ToolLoosening
['0' Enable
]
['1' Disable
]
['2' EnableOnlyOnNokTightening
]
]
-[enum uint 8 JobBatchMode
+[enum uint 8 JobBatchMode
['0' OnlyOkTighteningsAreCounted
]
['1' BothOkAndNokTighteningsAreCounted
]
]
-[enum uint 8 IdentifierResult
+[enum uint 8 IdentifierResult
['0' JobVinNumber
]
['1' Other
]
]
