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 2021/11/01 08:55:32 UTC
[plc4x] branch feature/mspec-ng updated: - Updated the code to
compile a lot better (Still a WIP)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/mspec-ng
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/mspec-ng by this push:
new 18503fc - Updated the code to compile a lot better (Still a WIP)
18503fc is described below
commit 18503fcac28f19626bdea5bb22c6157d97c4cd48
Author: cdutz <ch...@c-ware.de>
AuthorDate: Mon Nov 1 09:54:38 2021 +0100
- Updated the code to compile a lot better (Still a WIP)
---
.../language/go/GoLanguageTemplateHelper.java | 2 -
.../resources/templates/go/enum-template.go.ftlh | 2 +-
.../resources/templates/go/model-template.go.ftlh | 54 +-
.../testing/protocols/ads/DriverTestsuite.xml | 131 +-
.../protocols/ads/ParserSerializerTestsuite.xml | 51 +-
.../knxnetip/ParserSerializerTestsuite.xml | 251 +---
.../testing/protocols/modbus/DriverTestsuite.xml | 60 +-
.../protocols/modbus/ParserSerializerTestsuite.xml | 242 +---
.../testing/protocols/s7/DriverTestsuite.xml | 699 ++++++-----
.../protocols/s7/ParserSerializerTestsuite.xml | 1292 ++++++++++----------
...mandResponseMessageProtectedTypedLogicalRead.go | 2 +-
.../abeth/readwrite/model/DF1ResponseMessage.go | 2 +-
.../ads/readwrite/model/AdsNotificationSample.go | 40 +-
.../readwrite/model/AdsReadDeviceInfoResponse.go | 40 +-
.../plc4go/ads/readwrite/model/AdsReadResponse.go | 40 +-
.../ads/readwrite/model/AdsReadWriteRequest.go | 40 +-
.../ads/readwrite/model/AdsReadWriteResponse.go | 40 +-
.../ads/readwrite/model/AdsWriteControlRequest.go | 40 +-
.../plc4go/ads/readwrite/model/AdsWriteRequest.go | 40 +-
.../plc4go/ads/readwrite/model/DataItem.go | 16 +-
.../readwrite/model/BACnetComplexTagOctetString.go | 4 +-
.../model/BACnetUnconfirmedServiceRequestWhoHas.go | 8 +-
.../readwrite/model/DF1UnprotectedReadResponse.go | 12 +-
.../plc4go/eip/readwrite/model/CipExchange.go | 22 +-
.../plc4go/eip/readwrite/model/CipReadRequest.go | 66 +-
.../plc4go/eip/readwrite/model/CipReadResponse.go | 55 +-
.../plc4go/eip/readwrite/model/CipWriteRequest.go | 121 +-
.../eip/readwrite/model/MultipleServiceRequest.go | 44 +-
.../eip/readwrite/model/MultipleServiceResponse.go | 40 +-
.../readwrite/model/FirmataCommandSetPinMode.go | 15 +-
.../model/SysexCommandReportFirmwareResponse.go | 12 +-
plc4go/internal/plc4go/knxnetip/Connection.go | 19 +-
.../internal/plc4go/knxnetip/ConnectionHelper.go | 17 +-
.../knxnetip/ConnectionInternalOperations.go | 34 +-
plc4go/internal/plc4go/knxnetip/Discoverer.go | 6 +-
plc4go/internal/plc4go/knxnetip/Subscriber.go | 8 +-
.../internal/plc4go/knxnetip/SubscriptionEvent.go | 6 +-
plc4go/internal/plc4go/knxnetip/Utils.go | 12 +-
.../plc4go/knxnetip/readwrite/ParserHelper.go | 2 +-
.../plc4go/knxnetip/readwrite/XmlParserHelper.go | 4 +-
.../model/ApduDataDeviceDescriptorResponse.go | 40 +-
.../readwrite/model/ApduDataExtAuthorizeRequest.go | 40 +-
.../model/ApduDataExtPropertyValueResponse.go | 40 +-
.../model/ApduDataExtPropertyValueWrite.go | 40 +-
.../readwrite/model/ApduDataGroupValueResponse.go | 40 +-
.../readwrite/model/ApduDataGroupValueWrite.go | 40 +-
.../readwrite/model/ApduDataMemoryResponse.go | 40 +-
.../plc4go/knxnetip/readwrite/model/CEMI.go | 2 +-
.../knxnetip/readwrite/model/DIBDeviceInfo.go | 78 +-
.../readwrite/model/DeviceConfigurationRequest.go | 2 +-
.../plc4go/knxnetip/readwrite/model/IPAddress.go | 40 +-
.../knxnetip/readwrite/model/KnxDatapoint.go | 20 +-
.../plc4go/knxnetip/readwrite/model/KnxProperty.go | 244 ++--
.../knxnetip/readwrite/model/LDataExtended.go | 40 +-
.../plc4go/knxnetip/readwrite/model/LDataFrame.go | 15 +-
.../plc4go/knxnetip/readwrite/model/LPollData.go | 40 +-
.../plc4go/knxnetip/readwrite/model/MACAddress.go | 40 +-
.../knxnetip/readwrite/model/TunnelingRequest.go | 2 +-
.../knxnetip/readwrite/model/UnknownMessage.go | 40 +-
plc4go/internal/plc4go/modbus/Reader.go | 8 +-
plc4go/internal/plc4go/modbus/Writer.go | 2 +-
.../modbus/readwrite/model/ModbusPDUError.go | 15 +-
.../model/ModbusPDUGetComEventLogResponse.go | 40 +-
.../readwrite/model/ModbusPDUReadCoilsResponse.go | 40 +-
.../model/ModbusPDUReadDiscreteInputsResponse.go | 40 +-
.../model/ModbusPDUReadFileRecordResponseItem.go | 42 +-
.../model/ModbusPDUReadHoldingRegistersResponse.go | 40 +-
.../model/ModbusPDUReadInputRegistersResponse.go | 40 +-
...sPDUReadWriteMultipleHoldingRegistersRequest.go | 40 +-
...PDUReadWriteMultipleHoldingRegistersResponse.go | 40 +-
.../model/ModbusPDUReportServerIdResponse.go | 40 +-
.../model/ModbusPDUWriteFileRecordRequestItem.go | 42 +-
.../model/ModbusPDUWriteFileRecordResponseItem.go | 42 +-
.../model/ModbusPDUWriteMultipleCoilsRequest.go | 40 +-
...odbusPDUWriteMultipleHoldingRegistersRequest.go | 40 +-
.../internal/plc4go/s7/readwrite/ParserHelper.go | 6 +-
.../plc4go/s7/readwrite/XmlParserHelper.go | 3 +-
.../plc4go/s7/readwrite/model/COTPParameter.go | 2 +-
...COTPParameterDisconnectAdditionalInformation.go | 2 +-
.../internal/plc4go/s7/readwrite/model/DataItem.go | 32 +-
.../s7/readwrite/model/S7PayloadReadVarResponse.go | 9 +-
...ayloadUserDataItemCpuFunctionMsgSubscription.go | 6 +-
.../s7/readwrite/model/S7PayloadWriteVarRequest.go | 9 +-
.../s7/readwrite/model/S7VarPayloadDataItem.go | 19 +-
.../plc4go/simulated/readwrite/model/DataItem.go | 8 +-
plc4go/internal/plc4go/spi/utils/CastUtils.go | 13 +
86 files changed, 1915 insertions(+), 3179 deletions(-)
diff --git a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
index 22e50a6..50fe7f5 100644
--- a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
+++ b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
@@ -829,8 +829,6 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
.asStringLiteral()
.orElseThrow(() -> new RuntimeException("Expecting the first argument of a 'STATIC_CALL' to be a StringLiteral")).
getValue();
- // Cut off the double-quotes
- staticCall = staticCall.substring(1, staticCall.length() - 1);
// Remove all the previous parts prior to the Class name (Which starts with an uppercase letter)
while (staticCall.contains(".") && !StringUtils.isAllUpperCase(staticCall.substring(0, 1))) {
staticCall = staticCall.substring(staticCall.indexOf(".") + 1);
diff --git a/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
index 07bef8c..0e44367 100644
--- a/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
@@ -168,7 +168,7 @@ func (m ${type.name}) LengthInBytes() uint16 {
func ${type.name}Parse(readBuffer utils.ReadBuffer) (${type.name}, error) {
val, err := ${helper.getReadBufferReadMethodCall(type.name, type.type, null)}
if err != nil {
-<#-- return <#if type.type.isStringTypeReference()>""<#elseif baseType == "bool">false<#else>0</#if>, nil-->
+ return <#if type.type.isStringTypeReference() || type.type.isVstringTypeReference()>""<#elseif baseType == "bool">false<#else>0</#if>, nil
}
return ${type.name}ByValue(val), nil
}
diff --git a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
index abd6986..b9f8c08 100644
--- a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
@@ -856,27 +856,17 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
</#if>
- <#assign hasFieldParams=complexTypeReference.params.isPresent()>
- <#assign fieldParams>
- <#if hasFieldParams>
- ,
- <#list complexTypeReference.params.orElseThrow() as parserArgument>
- ${helper.toTypedParseExpression(optionalField, helper.getArgumentType(optionalField.type, parserArgument?index), parserArgument, parserArguments)}
- <#sep>, </#sep>
- </#list>
- </#if>
- </#assign>
- <#assign hasRefParams=complexTypeReference.params.isPresent() && typeDefinition.parserArguments.isPresent()>
- <#assign refParams>
- <#if hasRefParams>
- ,
- <#list complexTypeReference.params.orElseThrow() as typeParam>
- ${helper.toTypedParseExpression(optionalField, null, typeParam, null)}
- <#sep>, </#sep>
- </#list>
- </#if>
- </#assign>
- _val, _err := ${typeName}Parse(readBuffer${fieldParams}${refParams})
+ <#assign hasRefParams=complexTypeReference.params.isPresent()>
+ <#assign refParams>
+ <#if hasRefParams>
+ ,
+ <#list complexTypeReference.params.orElseThrow() as parserArgument>
+ ${helper.toTypedParseExpression(optionalField, helper.getArgumentType(optionalField.type, parserArgument?index), parserArgument, parserArguments)}
+ <#sep>, </#sep>
+ </#list>
+ </#if>
+ </#assign>
+ _val, _err := ${typeName}Parse(readBuffer${refParams})
</...@compress>
if _err != nil {
@@ -913,12 +903,10 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
</#if>
- <#assign hasFieldParams=complexTypeReference.params.isPresent()>
- <#assign fieldParams><#if hasFieldParams>, <#list complexTypeReference.params.orElseThrow() as parserArgument>${helper.toTypedParseExpression(assertField, helper.getArgumentType(assertField.type, parserArgument?index), parserArgument, parserArguments)}<#sep>, </#sep></#list></#if></#assign>
<#assign hasRefParams=complexTypeReference.params.isPresent() && typeDefinition.parserArguments.isPresent()>
<#assign refParams> <#if hasRefParams>, <#list complexTypeReference.params.orElseThrow() as typeParam>${helper.toTypedParseExpression(assertField, null, typeParam, null)}<#sep>, </#sep></#list> </#if> </#assign>
</...@compress>
- _val, _err := ${helper.getLanguageTypeNameForField(field)}Parse(readBuffer${fieldParams}${refParams})
+ _val, _err := ${helper.getLanguageTypeNameForField(field)}Parse(readBuffer${refParams})
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing '${assertField.name}' field")<@emitImport import="github.com/pkg/errors" />
}
@@ -988,27 +976,17 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign typeName=typeDefinition.parentType.name>
<#assign typeDefinition=typeDefinition.parentType>
</#if>
- <#assign hasFieldParams=complexTypeReference.params.isPresent()>
- <#assign fieldParams>
- <#if hasFieldParams>
- ,
- <#list complexTypeReference.params.orElseThrow() as parserArgument>
- ${helper.toTypedParseExpression(simpleField, helper.getArgumentType(simpleField.type, parserArgument?index), parserArgument, parserArguments)}
- <#sep>, </#sep>
- </#list>
- </#if>
- </#assign>
- <#assign hasRefParams=complexTypeReference.params.isPresent() && typeDefinition.parserArguments.isPresent()>
+ <#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
<#if hasRefParams>
,
- <#list complexTypeReference.params.orElseThrow() as typeParam>
- ${helper.toTypedParseExpression(simpleField, null, typeParam, null)}
+ <#list complexTypeReference.params.orElseThrow() as parserArgument>
+ ${helper.toTypedParseExpression(simpleField, helper.getArgumentType(simpleField.type, parserArgument?index), parserArgument, parserArguments)}
<#sep>, </#sep>
</#list>
</#if>
</#assign>
- ${typeName}Parse(readBuffer${fieldParams}${refParams})
+ ${typeName}Parse(readBuffer${refParams})
</#if>
</...@compress>
diff --git a/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml b/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
index bb509cb..77443ba 100644
--- a/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
@@ -178,9 +178,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">1</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="8">0x01</data>
</AdsReadResponse>
</AdsData>
</data>
@@ -308,8 +306,7 @@
</AdsMultiRequestItemRead>
</AdsMultiRequestItem>
</items>
- <data isList="true">
- </data>
+ <data dataType="byte" bitLength="0">0x</data>
</AdsReadWriteRequest>
</AdsData>
</data>
@@ -373,18 +370,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">10</length>
- <data isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="80">0x00000000000000000101</data>
</AdsReadWriteResponse>
</AdsData>
</data>
@@ -509,34 +495,7 @@
<writeLength dataType="uint" bitLength="32">26</writeLength>
<items isList="true">
</items>
- <data isList="true">
- <value dataType="int" bitLength="8">109</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">46</value>
- <value dataType="int" bitLength="8">102</value>
- <value dataType="int" bitLength="8">95</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">114</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">103</value>
- <value dataType="int" bitLength="8">68</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">71</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">115</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">46</value>
- <value dataType="int" bitLength="8">77</value>
- <value dataType="int" bitLength="8">0</value>
- </data>
+ <data dataType="byte" bitLength="208">0x6d61696e2e665f74726967446174656947656c6573656e2e4d00</data>
</AdsReadWriteRequest>
</AdsData>
</data>
@@ -599,12 +558,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">4</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">-128</value>
- <value dataType="int" bitLength="8">27</value>
- </data>
+ <data dataType="byte" bitLength="32">0x0100801b</data>
</AdsReadWriteResponse>
</AdsData>
</data>
@@ -728,18 +682,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">10</length>
- <data isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="80">0x00000000000000000101</data>
</AdsReadResponse>
</AdsData>
</data>
@@ -848,34 +791,7 @@
<writeLength dataType="uint" bitLength="32">26</writeLength>
<items isList="true">
</items>
- <data isList="true">
- <value dataType="int" bitLength="8">109</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">46</value>
- <value dataType="int" bitLength="8">102</value>
- <value dataType="int" bitLength="8">95</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">114</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">103</value>
- <value dataType="int" bitLength="8">68</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">71</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">115</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">46</value>
- <value dataType="int" bitLength="8">77</value>
- <value dataType="int" bitLength="8">0</value>
- </data>
+ <data dataType="byte" bitLength="208">0x6d61696e2e665f74726967446174656947656c6573656e2e4d00</data>
</AdsReadWriteRequest>
</AdsData>
</data>
@@ -938,12 +854,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">4</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">-128</value>
- <value dataType="int" bitLength="8">27</value>
- </data>
+ <data dataType="byte" bitLength="32">0x0100801b</data>
</AdsReadWriteResponse>
</AdsData>
</data>
@@ -1068,18 +979,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">10</length>
- <data isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="80">0x00000000000000000101</data>
</AdsReadResponse>
</AdsData>
</data>
@@ -1238,18 +1138,7 @@
<ReturnCode dataType="uint" bitLength="32">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">10</length>
- <data isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="80">0x00000000000000000101</data>
</AdsReadResponse>
</AdsData>
</data>
diff --git a/plc4go/assets/testing/protocols/ads/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/ads/ParserSerializerTestsuite.xml
index 8f6e507..3e38fcc 100644
--- a/plc4go/assets/testing/protocols/ads/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/ads/ParserSerializerTestsuite.xml
@@ -151,9 +151,7 @@
<ReturnCode dataType="uint" bitLength="32" stringRepresentation="OK">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">1</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="8">0x01</data>
</AdsReadResponse>
</AdsData>
</data>
@@ -224,34 +222,7 @@
<writeLength dataType="uint" bitLength="32">26</writeLength>
<items isList="true">
</items>
- <data isList="true">
- <value dataType="int" bitLength="8">109</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">46</value>
- <value dataType="int" bitLength="8">102</value>
- <value dataType="int" bitLength="8">95</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">114</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">103</value>
- <value dataType="int" bitLength="8">68</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">71</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">115</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">46</value>
- <value dataType="int" bitLength="8">77</value>
- <value dataType="int" bitLength="8">0</value>
- </data>
+ <data dataType="byte" bitLength="208">0x6d61696e2e665f74726967446174656947656c6573656e2e4d00</data>
</AdsReadWriteRequest>
</AdsData>
</data>
@@ -320,12 +291,7 @@
<ReturnCode dataType="uint" bitLength="32" stringRepresentation="OK">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">4</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">-128</value>
- <value dataType="int" bitLength="8">27</value>
- </data>
+ <data dataType="byte" bitLength="32">0x0100801b</data>
</AdsReadWriteResponse>
</AdsData>
</data>
@@ -461,9 +427,7 @@
<ReturnCode dataType="uint" bitLength="32" stringRepresentation="OK">0</ReturnCode>
</result>
<length dataType="uint" bitLength="32">1</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- </data>
+ <data dataType="byte" bitLength="8">0x01</data>
</AdsReadResponse>
</AdsData>
</data>
@@ -531,12 +495,7 @@
<indexGroup dataType="uint" bitLength="32">61446</indexGroup>
<indexOffset dataType="uint" bitLength="32">0</indexOffset>
<length dataType="uint" bitLength="32">4</length>
- <data isList="true">
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">-128</value>
- <value dataType="int" bitLength="8">27</value>
- </data>
+ <data dataType="byte" bitLength="32">0x0100801b</data>
</AdsWriteRequest>
</AdsData>
</data>
diff --git a/plc4go/assets/testing/protocols/knxnetip/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/knxnetip/ParserSerializerTestsuite.xml
index 05588e5..666ca62 100644
--- a/plc4go/assets/testing/protocols/knxnetip/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/knxnetip/ParserSerializerTestsuite.xml
@@ -137,12 +137,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">-56</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82ac8</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">54964</ipPort>
@@ -174,12 +169,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">11</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82a0b</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">3671</ipPort>
@@ -211,68 +201,18 @@
<installationNumber dataType="uint" bitLength="8">0</installationNumber>
</ProjectInstallationIdentifier>
</projectInstallationIdentifier>
- <knxNetIpDeviceSerialNumber isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">8</value>
- <value dataType="int" bitLength="8">45</value>
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">-104</value>
- <value dataType="int" bitLength="8">82</value>
- </knxNetIpDeviceSerialNumber>
+ <knxNetIpDeviceSerialNumber dataType="byte" bitLength="48">0x00082d409852</knxNetIpDeviceSerialNumber>
<knxNetIpDeviceMulticastAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-32</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">23</value>
- <value dataType="int" bitLength="8">12</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xe000170c</addr>
</IPAddress>
</knxNetIpDeviceMulticastAddress>
<knxNetIpDeviceMacAddress>
<MACAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">10</value>
- <value dataType="int" bitLength="8">-77</value>
- <value dataType="int" bitLength="8">39</value>
- <value dataType="int" bitLength="8">85</value>
- <value dataType="int" bitLength="8">54</value>
- </addr>
+ <addr dataType="byte" bitLength="48">0x000ab3275536</addr>
</MACAddress>
</knxNetIpDeviceMacAddress>
- <deviceFriendlyName isList="true">
- <value dataType="int" bitLength="8">71</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">114</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">32</value>
- <value dataType="int" bitLength="8">75</value>
- <value dataType="int" bitLength="8">78</value>
- <value dataType="int" bitLength="8">88</value>
- <value dataType="int" bitLength="8">47</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">80</value>
- <value dataType="int" bitLength="8">45</value>
- <value dataType="int" bitLength="8">83</value>
- <value dataType="int" bitLength="8">99</value>
- <value dataType="int" bitLength="8">104</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">115</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </deviceFriendlyName>
+ <deviceFriendlyName dataType="byte" bitLength="240">0x47697261204b4e582f49502d5363686e6974747374656c6c650000000000</deviceFriendlyName>
</DIBDeviceInfo>
</dibDeviceInfo>
<dibSuppSvcFamilies>
@@ -325,12 +265,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0x00000000</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">0</ipPort>
@@ -380,68 +315,18 @@
<installationNumber dataType="uint" bitLength="8">0</installationNumber>
</ProjectInstallationIdentifier>
</projectInstallationIdentifier>
- <knxNetIpDeviceSerialNumber isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">8</value>
- <value dataType="int" bitLength="8">45</value>
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">-104</value>
- <value dataType="int" bitLength="8">82</value>
- </knxNetIpDeviceSerialNumber>
+ <knxNetIpDeviceSerialNumber dataType="byte" bitLength="48">0x00082d409852</knxNetIpDeviceSerialNumber>
<knxNetIpDeviceMulticastAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-32</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">23</value>
- <value dataType="int" bitLength="8">12</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xe000170c</addr>
</IPAddress>
</knxNetIpDeviceMulticastAddress>
<knxNetIpDeviceMacAddress>
<MACAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">10</value>
- <value dataType="int" bitLength="8">-77</value>
- <value dataType="int" bitLength="8">39</value>
- <value dataType="int" bitLength="8">85</value>
- <value dataType="int" bitLength="8">54</value>
- </addr>
+ <addr dataType="byte" bitLength="48">0x000ab3275536</addr>
</MACAddress>
</knxNetIpDeviceMacAddress>
- <deviceFriendlyName isList="true">
- <value dataType="int" bitLength="8">71</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">114</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">32</value>
- <value dataType="int" bitLength="8">75</value>
- <value dataType="int" bitLength="8">78</value>
- <value dataType="int" bitLength="8">88</value>
- <value dataType="int" bitLength="8">47</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">80</value>
- <value dataType="int" bitLength="8">45</value>
- <value dataType="int" bitLength="8">83</value>
- <value dataType="int" bitLength="8">99</value>
- <value dataType="int" bitLength="8">104</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">115</value>
- <value dataType="int" bitLength="8">116</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">108</value>
- <value dataType="int" bitLength="8">101</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </deviceFriendlyName>
+ <deviceFriendlyName dataType="byte" bitLength="240">0x47697261204b4e582f49502d5363686e6974747374656c6c650000000000</deviceFriendlyName>
</DIBDeviceInfo>
</dibDeviceInfo>
<dibSuppSvcFamilies>
@@ -495,12 +380,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">-56</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82ac8</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">54964</ipPort>
@@ -514,12 +394,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">-56</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82ac8</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">54964</ipPort>
@@ -557,36 +432,35 @@
<status>
<Status dataType="uint" bitLength="8" stringRepresentation="NO_ERROR">0</Status>
</status>
- <HPAIDataEndpoint>
- <structureLength dataType="uint" bitLength="8">8</structureLength>
- <hostProtocolCode>
- <HostProtocolCode dataType="uint" bitLength="8" stringRepresentation="IPV4_UDP">1</HostProtocolCode>
- </hostProtocolCode>
- <ipAddress>
- <IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">11</value>
- </addr>
- </IPAddress>
- </ipAddress>
- <ipPort dataType="uint" bitLength="16">3671</ipPort>
- </HPAIDataEndpoint>
- <ConnectionResponseDataBlock>
- <structureLength dataType="uint" bitLength="8">4</structureLength>
- <connectionType dataType="uint" bitLength="8">4</connectionType>
- <ConnectionResponseDataBlockTunnelConnection>
- <knxAddress>
- <KnxAddress>
- <mainGroup dataType="uint" bitLength="4">15</mainGroup>
- <middleGroup dataType="uint" bitLength="4">15</middleGroup>
- <subGroup dataType="uint" bitLength="8">254</subGroup>
- </KnxAddress>
- </knxAddress>
- </ConnectionResponseDataBlockTunnelConnection>
- </ConnectionResponseDataBlock>
+ <hpaiDataEndpoint>
+ <HPAIDataEndpoint>
+ <structureLength dataType="uint" bitLength="8">8</structureLength>
+ <hostProtocolCode>
+ <HostProtocolCode dataType="uint" bitLength="8" stringRepresentation="IPV4_UDP">1</HostProtocolCode>
+ </hostProtocolCode>
+ <ipAddress>
+ <IPAddress>
+ <addr dataType="byte" bitLength="32">0xc0a82a0b</addr>
+ </IPAddress>
+ </ipAddress>
+ <ipPort dataType="uint" bitLength="16">3671</ipPort>
+ </HPAIDataEndpoint>
+ </hpaiDataEndpoint>
+ <connectionResponseDataBlock>
+ <ConnectionResponseDataBlock>
+ <structureLength dataType="uint" bitLength="8">4</structureLength>
+ <connectionType dataType="uint" bitLength="8">4</connectionType>
+ <ConnectionResponseDataBlockTunnelConnection>
+ <knxAddress>
+ <KnxAddress>
+ <mainGroup dataType="uint" bitLength="4">15</mainGroup>
+ <middleGroup dataType="uint" bitLength="4">15</middleGroup>
+ <subGroup dataType="uint" bitLength="8">254</subGroup>
+ </KnxAddress>
+ </knxAddress>
+ </ConnectionResponseDataBlockTunnelConnection>
+ </ConnectionResponseDataBlock>
+ </connectionResponseDataBlock>
</ConnectionResponse>
</KnxNetIpMessage>
</xml>
@@ -613,12 +487,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">-56</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82ac8</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">54964</ipPort>
@@ -732,12 +601,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">11</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82a0b</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">3671</ipPort>
@@ -816,10 +680,7 @@
<subGroup dataType="uint" bitLength="8">10</subGroup>
</KnxAddress>
</sourceAddress>
- <destinationAddress isList="true">
- <value dataType="int" bitLength="8">18</value>
- <value dataType="int" bitLength="8">12</value>
- </destinationAddress>
+ <destinationAddress dataType="byte" bitLength="16">0x120c</destinationAddress>
<dataLength dataType="uint" bitLength="8">1</dataLength>
<apdu>
<Apdu>
@@ -832,8 +693,7 @@
<apciType dataType="uint" bitLength="4">2</apciType>
<ApduDataGroupValueWrite>
<dataFirstByte dataType="int" bitLength="6">1</dataFirstByte>
- <data isList="true">
- </data>
+ <data dataType="byte" bitLength="0">0x</data>
</ApduDataGroupValueWrite>
</ApduData>
</dataApdu>
@@ -926,10 +786,7 @@
<subGroup dataType="uint" bitLength="8">30</subGroup>
</KnxAddress>
</sourceAddress>
- <destinationAddress isList="true">
- <value dataType="int" bitLength="8">12</value>
- <value dataType="int" bitLength="8">-31</value>
- </destinationAddress>
+ <destinationAddress dataType="byte" bitLength="16">0x0ce1</destinationAddress>
<dataLength dataType="uint" bitLength="8">0</dataLength>
<apdu>
<Apdu>
@@ -1004,12 +861,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">70</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82a46</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">50185</ipPort>
@@ -1023,12 +875,7 @@
</hostProtocolCode>
<ipAddress>
<IPAddress>
- <addr isList="true">
- <value dataType="int" bitLength="8">-64</value>
- <value dataType="int" bitLength="8">-88</value>
- <value dataType="int" bitLength="8">42</value>
- <value dataType="int" bitLength="8">70</value>
- </addr>
+ <addr dataType="byte" bitLength="32">0xc0a82a46</addr>
</IPAddress>
</ipAddress>
<ipPort dataType="uint" bitLength="16">50186</ipPort>
diff --git a/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml b/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
index 9093dec..cadd145 100644
--- a/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
@@ -78,12 +78,7 @@
<functionFlag dataType="uint" bitLength="7">3</functionFlag>
<ModbusPDUReadHoldingRegistersResponse>
<byteCount dataType="uint" bitLength="8">4</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- </value>
+ <value dataType="byte" bitLength="32">0x40490fdb</value>
</ModbusPDUReadHoldingRegistersResponse>
</ModbusPDU>
</pdu>
@@ -106,7 +101,7 @@
<hurz>
<ResponseItem>
<result dataType="string" bitLength="16" encoding="UTF-8">OK</result>
- <PlcREAL dataType="float" bitLength="31">3.1415927410125732</PlcREAL>
+ <PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</ResponseItem>
</hurz>
</values>
@@ -164,16 +159,7 @@
<functionFlag dataType="uint" bitLength="7">3</functionFlag>
<ModbusPDUReadHoldingRegistersResponse>
<byteCount dataType="uint" bitLength="8">8</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- </value>
+ <value dataType="byte" bitLength="64">0x40490fdb40490fdb</value>
</ModbusPDUReadHoldingRegistersResponse>
</ModbusPDU>
</pdu>
@@ -197,8 +183,8 @@
<ResponseItem>
<result dataType="string" bitLength="16" encoding="UTF-8">OK</result>
<PlcList>
- <PlcREAL dataType="float" bitLength="31">3.1415927410125732</PlcREAL>
- <PlcREAL dataType="float" bitLength="31">3.1415927410125732</PlcREAL>
+ <PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
+ <PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</PlcList>
</ResponseItem>
</hurz>
@@ -261,12 +247,7 @@
<functionFlag dataType="uint" bitLength="7">3</functionFlag>
<ModbusPDUReadHoldingRegistersResponse>
<byteCount dataType="uint" bitLength="8">4</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- </value>
+ <value dataType="byte" bitLength="32">0x40490fdb</value>
</ModbusPDUReadHoldingRegistersResponse>
</ModbusPDU>
</pdu>
@@ -308,12 +289,7 @@
<functionFlag dataType="uint" bitLength="7">3</functionFlag>
<ModbusPDUReadHoldingRegistersResponse>
<byteCount dataType="uint" bitLength="8">4</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- </value>
+ <value dataType="byte" bitLength="32">0x40490fdb</value>
</ModbusPDUReadHoldingRegistersResponse>
</ModbusPDU>
</pdu>
@@ -343,13 +319,13 @@
<hurz1>
<ResponseItem>
<result dataType="string" bitLength="16" encoding="UTF-8">OK</result>
- <PlcREAL dataType="float" bitLength="31">3.1415927410125732</PlcREAL>
+ <PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</ResponseItem>
</hurz1>
<hurz2>
<ResponseItem>
<result dataType="string" bitLength="16" encoding="UTF-8">OK</result>
- <PlcREAL dataType="float" bitLength="31">3.1415927410125732</PlcREAL>
+ <PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</ResponseItem>
</hurz2>
</values>
@@ -389,12 +365,7 @@
<startingAddress dataType="uint" bitLength="16">0</startingAddress>
<quantity dataType="uint" bitLength="16">2</quantity>
<byteCount dataType="uint" bitLength="8">4</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- </value>
+ <value dataType="byte" bitLength="32">0x40490fdb</value>
</ModbusPDUWriteMultipleHoldingRegistersRequest>
</ModbusPDU>
</pdu>
@@ -475,16 +446,7 @@
<startingAddress dataType="uint" bitLength="16">0</startingAddress>
<quantity dataType="uint" bitLength="16">4</quantity>
<byteCount dataType="uint" bitLength="8">8</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- <value dataType="int" bitLength="8">64</value>
- <value dataType="int" bitLength="8">73</value>
- <value dataType="int" bitLength="8">15</value>
- <value dataType="int" bitLength="8">-37</value>
- </value>
+ <value dataType="byte" bitLength="64">0x40490fdb40490fdb</value>
</ModbusPDUWriteMultipleHoldingRegistersRequest>
</ModbusPDU>
</pdu>
diff --git a/plc4go/assets/testing/protocols/modbus/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/modbus/ParserSerializerTestsuite.xml
index 3031f5c..f3cc5b3 100644
--- a/plc4go/assets/testing/protocols/modbus/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/modbus/ParserSerializerTestsuite.xml
@@ -73,206 +73,7 @@
<functionFlag dataType="uint" bitLength="7">4</functionFlag>
<ModbusPDUReadInputRegistersResponse>
<byteCount dataType="uint" bitLength="8">198</byteCount>
- <value isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">4</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">-37</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">1</value>
- <value dataType="int" bitLength="8">-42</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">74</value>
- <value dataType="int" bitLength="8">56</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">100</value>
- <value dataType="int" bitLength="8">97</value>
- <value dataType="int" bitLength="8">105</value>
- <value dataType="int" bitLength="8">109</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">110</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">48</value>
- <value dataType="int" bitLength="8">49</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">48</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </value>
+ <value dataType="byte" bitLength="1584">0x00000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000004000000000000000000000000000001db000001d600004a380000000000000000000000000000000000000000000000000000000000006461696d006e0000000000000000000000000000303100300000000000000000000000000000000000000000000000000000000000000000000000000000</value>
</ModbusPDUReadInputRegistersResponse>
</ModbusPDU>
</pdu>
@@ -343,34 +144,12 @@
<ModbusPDUReadFileRecordResponseItem>
<dataLength dataType="uint" bitLength="8">5</dataLength>
<referenceType dataType="uint" bitLength="8">6</referenceType>
- <data isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </data>
+ <data dataType="byte" bitLength="32">0x00000000</data>
</ModbusPDUReadFileRecordResponseItem>
<ModbusPDUReadFileRecordResponseItem>
<dataLength dataType="uint" bitLength="8">17</dataLength>
<referenceType dataType="uint" bitLength="8">6</referenceType>
- <data isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </data>
+ <data dataType="byte" bitLength="128">0x00000000000000000000000000000000</data>
</ModbusPDUReadFileRecordResponseItem>
</items>
</ModbusPDUReadFileRecordResponse>
@@ -406,10 +185,7 @@
<fileNumber dataType="uint" bitLength="16">2</fileNumber>
<recordNumber dataType="uint" bitLength="16">0</recordNumber>
<recordLength dataType="uint" bitLength="16">1</recordLength>
- <recordData isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">8</value>
- </recordData>
+ <recordData dataType="byte" bitLength="16">0x0008</recordData>
</ModbusPDUWriteFileRecordRequestItem>
</items>
</ModbusPDUWriteFileRecordRequest>
@@ -444,20 +220,14 @@
<fileNumber dataType="uint" bitLength="16">1</fileNumber>
<recordNumber dataType="uint" bitLength="16">9999</recordNumber>
<recordLength dataType="uint" bitLength="16">1</recordLength>
- <recordData isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </recordData>
+ <recordData dataType="byte" bitLength="16">0x0000</recordData>
</ModbusPDUWriteFileRecordRequestItem>
<ModbusPDUWriteFileRecordRequestItem>
<referenceType dataType="uint" bitLength="8">6</referenceType>
<fileNumber dataType="uint" bitLength="16">2</fileNumber>
<recordNumber dataType="uint" bitLength="16">0</recordNumber>
<recordLength dataType="uint" bitLength="16">1</recordLength>
- <recordData isList="true">
- <value dataType="int" bitLength="8">0</value>
- <value dataType="int" bitLength="8">0</value>
- </recordData>
+ <recordData dataType="byte" bitLength="16">0x0000</recordData>
</ModbusPDUWriteFileRecordRequestItem>
</items>
</ModbusPDUWriteFileRecordRequest>
diff --git a/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml b/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
index dceb88a..e6576c3 100644
--- a/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
@@ -136,25 +136,29 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">1</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">0</tpduReference>
- <parameterLength dataType="uint" bitLength="16">8</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageRequest>
- </S7MessageRequest>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">240</parameterType>
- <S7ParameterSetupCommunication>
- <reserved dataType="uint" bitLength="8">0</reserved>
- <maxAmqCaller dataType="uint" bitLength="16">8</maxAmqCaller>
- <maxAmqCallee dataType="uint" bitLength="16">8</maxAmqCallee>
- <pduLength dataType="uint" bitLength="16">1008</pduLength>
- </S7ParameterSetupCommunication>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">1</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">0</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">8</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageRequest>
+ </S7MessageRequest>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">240</parameterType>
+ <S7ParameterSetupCommunication>
+ <reserved dataType="uint" bitLength="8">0</reserved>
+ <maxAmqCaller dataType="uint" bitLength="16">8</maxAmqCaller>
+ <maxAmqCallee dataType="uint" bitLength="16">8</maxAmqCallee>
+ <pduLength dataType="uint" bitLength="16">1008</pduLength>
+ </S7ParameterSetupCommunication>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -175,27 +179,31 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">3</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">0</tpduReference>
- <parameterLength dataType="uint" bitLength="16">8</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageResponseData>
- <errorClass dataType="uint" bitLength="8">0</errorClass>
- <errorCode dataType="uint" bitLength="8">0</errorCode>
- </S7MessageResponseData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">240</parameterType>
- <S7ParameterSetupCommunication>
- <reserved dataType="uint" bitLength="8">0</reserved>
- <maxAmqCaller dataType="uint" bitLength="16">3</maxAmqCaller>
- <maxAmqCallee dataType="uint" bitLength="16">3</maxAmqCallee>
- <pduLength dataType="uint" bitLength="16">240</pduLength>
- </S7ParameterSetupCommunication>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">3</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">0</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">8</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageResponseData>
+ <errorClass dataType="uint" bitLength="8">0</errorClass>
+ <errorCode dataType="uint" bitLength="8">0</errorCode>
+ </S7MessageResponseData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">240</parameterType>
+ <S7ParameterSetupCommunication>
+ <reserved dataType="uint" bitLength="8">0</reserved>
+ <maxAmqCaller dataType="uint" bitLength="16">3</maxAmqCaller>
+ <maxAmqCallee dataType="uint" bitLength="16">3</maxAmqCallee>
+ <pduLength dataType="uint" bitLength="16">240</pduLength>
+ </S7ParameterSetupCommunication>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -217,66 +225,75 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">7</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">1</tpduReference>
- <parameterLength dataType="uint" bitLength="16">8</parameterLength>
- <payloadLength dataType="uint" bitLength="16">8</payloadLength>
- <S7MessageUserData>
- </S7MessageUserData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">0</parameterType>
- <S7ParameterUserData>
- <numItems dataType="uint" bitLength="8">1</numItems>
- <items isList="true">
- <S7ParameterUserDataItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7ParameterUserDataItemCPUFunctions>
- <itemLength dataType="uint" bitLength="8">4</itemLength>
- <method dataType="uint" bitLength="8">17</method>
- <cpuFunctionType dataType="uint" bitLength="4">4</cpuFunctionType>
- <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
- <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
- <sequenceNumber dataType="uint" bitLength="8">0</sequenceNumber>
- </S7ParameterUserDataItemCPUFunctions>
- </S7ParameterUserDataItem>
- </items>
- </S7ParameterUserData>
- </S7Parameter>
- <S7Payload>
- <S7PayloadUserData>
- <items isList="true">
- <S7PayloadUserDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">4</dataLength>
- <S7PayloadUserDataItemCpuFunctionReadSzlRequest>
- <szlId>
- <SzlId>
- <typeClass>
- <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0</SzlModuleTypeClass>
- </typeClass>
- <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
- <sublistList>
- <SzlSublist dataType="uint" bitLength="8" stringRepresentation="MODULE_IDENTIFICATION">17</SzlSublist>
- </sublistList>
- </SzlId>
- </szlId>
- <szlIndex dataType="uint" bitLength="16">0</szlIndex>
- </S7PayloadUserDataItemCpuFunctionReadSzlRequest>
- </S7PayloadUserDataItem>
- </items>
- </S7PayloadUserData>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">7</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">1</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">8</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">8</payloadLength>
+ <S7MessageUserData>
+ </S7MessageUserData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">0</parameterType>
+ <S7ParameterUserData>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ <items isList="true">
+ <S7ParameterUserDataItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7ParameterUserDataItemCPUFunctions>
+ <itemLength dataType="uint" bitLength="8">4</itemLength>
+ <method dataType="uint" bitLength="8">17</method>
+ <cpuFunctionType dataType="uint" bitLength="4">4</cpuFunctionType>
+ <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
+ <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
+ <sequenceNumber dataType="uint" bitLength="8">0</sequenceNumber>
+ </S7ParameterUserDataItemCPUFunctions>
+ </S7ParameterUserDataItem>
+ </items>
+ </S7ParameterUserData>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadUserData>
+ <items isList="true">
+ <S7PayloadUserDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
+ </DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9
+ </DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">4</dataLength>
+ <S7PayloadUserDataItemCpuFunctionReadSzlRequest>
+ <szlId>
+ <SzlId>
+ <typeClass>
+ <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0
+ </SzlModuleTypeClass>
+ </typeClass>
+ <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
+ <sublistList>
+ <SzlSublist dataType="uint" bitLength="8"
+ stringRepresentation="MODULE_IDENTIFICATION">17
+ </SzlSublist>
+ </sublistList>
+ </SzlId>
+ </szlId>
+ <szlIndex dataType="uint" bitLength="16">0</szlIndex>
+ </S7PayloadUserDataItemCpuFunctionReadSzlRequest>
+ </S7PayloadUserDataItem>
+ </items>
+ </S7PayloadUserData>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -297,96 +314,103 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">7</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">1</tpduReference>
- <parameterLength dataType="uint" bitLength="16">12</parameterLength>
- <payloadLength dataType="uint" bitLength="16">96</payloadLength>
- <S7MessageUserData>
- </S7MessageUserData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">0</parameterType>
- <S7ParameterUserData>
- <numItems dataType="uint" bitLength="8">1</numItems>
- <items isList="true">
- <S7ParameterUserDataItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7ParameterUserDataItemCPUFunctions>
- <itemLength dataType="uint" bitLength="8">8</itemLength>
- <method dataType="uint" bitLength="8">18</method>
- <cpuFunctionType dataType="uint" bitLength="4">8</cpuFunctionType>
- <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
- <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
- <sequenceNumber dataType="uint" bitLength="8">1</sequenceNumber>
- <dataUnitReferenceNumber dataType="uint" bitLength="8">0</dataUnitReferenceNumber>
- <lastDataUnit dataType="uint" bitLength="8">0</lastDataUnit>
- <errorCode dataType="uint" bitLength="16">0</errorCode>
- </S7ParameterUserDataItemCPUFunctions>
- </S7ParameterUserDataItem>
- </items>
- </S7ParameterUserData>
- </S7Parameter>
- <S7Payload>
- <S7PayloadUserData>
- <items isList="true">
- <S7PayloadUserDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">92</dataLength>
- <S7PayloadUserDataItemCpuFunctionReadSzlResponse>
- <szlId>
- <SzlId>
- <typeClass>
- <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0
- </SzlModuleTypeClass>
- </typeClass>
- <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
- <sublistList>
- <SzlSublist dataType="uint" bitLength="8" stringRepresentation="MODULE_IDENTIFICATION">17
- </SzlSublist>
- </sublistList>
- </SzlId>
- </szlId>
- <szlIndex dataType="uint" bitLength="16">0</szlIndex>
- <szlItemLength dataType="uint" bitLength="16">28</szlItemLength>
- <szlItemCount dataType="uint" bitLength="16">3</szlItemCount>
- <items isList="true">
- <SzlDataTreeItem>
- <itemIndex dataType="uint" bitLength="16">1</itemIndex>
- <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
- <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
- <ausbg dataType="uint" bitLength="16">1</ausbg>
- <ausbe dataType="uint" bitLength="16">8224</ausbe>
- </SzlDataTreeItem>
- <SzlDataTreeItem>
- <itemIndex dataType="uint" bitLength="16">6</itemIndex>
- <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
- <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
- <ausbg dataType="uint" bitLength="16">1</ausbg>
- <ausbe dataType="uint" bitLength="16">8224</ausbe>
- </SzlDataTreeItem>
- <SzlDataTreeItem>
- <itemIndex dataType="uint" bitLength="16">7</itemIndex>
- <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
- <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
- <ausbg dataType="uint" bitLength="16">22018</ausbg>
- <ausbe dataType="uint" bitLength="16">2</ausbe>
- </SzlDataTreeItem>
- </items>
- </S7PayloadUserDataItemCpuFunctionReadSzlResponse>
- </S7PayloadUserDataItem>
- </items>
- </S7PayloadUserData>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">7</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">1</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">12</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">96</payloadLength>
+ <S7MessageUserData>
+ </S7MessageUserData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">0</parameterType>
+ <S7ParameterUserData>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ <items isList="true">
+ <S7ParameterUserDataItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7ParameterUserDataItemCPUFunctions>
+ <itemLength dataType="uint" bitLength="8">8</itemLength>
+ <method dataType="uint" bitLength="8">18</method>
+ <cpuFunctionType dataType="uint" bitLength="4">8</cpuFunctionType>
+ <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
+ <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
+ <sequenceNumber dataType="uint" bitLength="8">1</sequenceNumber>
+ <dataUnitReferenceNumber dataType="uint" bitLength="8">0</dataUnitReferenceNumber>
+ <lastDataUnit dataType="uint" bitLength="8">0</lastDataUnit>
+ <errorCode dataType="uint" bitLength="16">0</errorCode>
+ </S7ParameterUserDataItemCPUFunctions>
+ </S7ParameterUserDataItem>
+ </items>
+ </S7ParameterUserData>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadUserData>
+ <items isList="true">
+ <S7PayloadUserDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
+ </DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9
+ </DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">92</dataLength>
+ <S7PayloadUserDataItemCpuFunctionReadSzlResponse>
+ <szlId>
+ <SzlId>
+ <typeClass>
+ <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0
+ </SzlModuleTypeClass>
+ </typeClass>
+ <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
+ <sublistList>
+ <SzlSublist dataType="uint" bitLength="8"
+ stringRepresentation="MODULE_IDENTIFICATION">17
+ </SzlSublist>
+ </sublistList>
+ </SzlId>
+ </szlId>
+ <szlIndex dataType="uint" bitLength="16">0</szlIndex>
+ <szlItemLength dataType="uint" bitLength="16">28</szlItemLength>
+ <szlItemCount dataType="uint" bitLength="16">3</szlItemCount>
+ <items isList="true">
+ <SzlDataTreeItem>
+ <itemIndex dataType="uint" bitLength="16">1</itemIndex>
+ <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
+ <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
+ <ausbg dataType="uint" bitLength="16">1</ausbg>
+ <ausbe dataType="uint" bitLength="16">8224</ausbe>
+ </SzlDataTreeItem>
+ <SzlDataTreeItem>
+ <itemIndex dataType="uint" bitLength="16">6</itemIndex>
+ <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
+ <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
+ <ausbg dataType="uint" bitLength="16">1</ausbg>
+ <ausbe dataType="uint" bitLength="16">8224</ausbe>
+ </SzlDataTreeItem>
+ <SzlDataTreeItem>
+ <itemIndex dataType="uint" bitLength="16">7</itemIndex>
+ <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
+ <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
+ <ausbg dataType="uint" bitLength="16">22018</ausbg>
+ <ausbe dataType="uint" bitLength="16">2</ausbe>
+ </SzlDataTreeItem>
+ </items>
+ </S7PayloadUserDataItemCpuFunctionReadSzlResponse>
+ </S7PayloadUserDataItem>
+ </items>
+ </S7PayloadUserData>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -421,50 +445,54 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">1</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">10</tpduReference>
- <parameterLength dataType="uint" bitLength="16">14</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageRequest>
- </S7MessageRequest>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">4</parameterType>
- <S7ParameterReadVarRequest>
- <numItems dataType="uint" bitLength="8">1</numItems>
- <items isList="true">
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- </items>
- </S7ParameterReadVarRequest>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">1</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">10</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">14</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageRequest>
+ </S7MessageRequest>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">4</parameterType>
+ <S7ParameterReadVarRequest>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ <items isList="true">
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
+ </TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
+ </MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ </items>
+ </S7ParameterReadVarRequest>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -473,7 +501,7 @@
<TPKTPacket>
<protocolId dataType="uint" bitLength="8">3</protocolId>
<reserved dataType="uint" bitLength="8">0</reserved>
- <len dataType="uint" bitLength="16">26</len>
+ <len dataType="uint" bitLength="16">27</len>
<payload>
<COTPPacket>
<headerLength dataType="uint" bitLength="8">2</headerLength>
@@ -484,44 +512,51 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">3</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">10</tpduReference>
- <parameterLength dataType="uint" bitLength="16">2</parameterLength>
- <payloadLength dataType="uint" bitLength="16">5</payloadLength>
- <S7MessageResponseData>
- <errorClass dataType="uint" bitLength="8">0</errorClass>
- <errorCode dataType="uint" bitLength="8">0</errorCode>
- </S7MessageResponseData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">4</parameterType>
- <S7ParameterReadVarResponse>
- <numItems dataType="uint" bitLength="8">1</numItems>
- </S7ParameterReadVarResponse>
- </S7Parameter>
- <S7Payload>
- <S7PayloadReadVarResponse>
- <items isList="true">
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- </padding>
- </S7VarPayloadDataItem>
- </items>
- </S7PayloadReadVarResponse>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">3</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">10</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">2</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">6</payloadLength>
+ <S7MessageResponseData>
+ <errorClass dataType="uint" bitLength="8">0</errorClass>
+ <errorCode dataType="uint" bitLength="8">0</errorCode>
+ </S7MessageResponseData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">4</parameterType>
+ <S7ParameterReadVarResponse>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ </S7ParameterReadVarResponse>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadReadVarResponse>
+ <items isList="true">
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
+ </DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
+ </DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ </items>
+ </S7PayloadReadVarResponse>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -583,50 +618,54 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">1</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">10</tpduReference>
- <parameterLength dataType="uint" bitLength="16">14</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageRequest>
- </S7MessageRequest>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">4</parameterType>
- <S7ParameterReadVarRequest>
- <numItems dataType="uint" bitLength="8">1</numItems>
- <items isList="true">
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- </items>
- </S7ParameterReadVarRequest>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">1</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">10</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">14</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageRequest>
+ </S7MessageRequest>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">4</parameterType>
+ <S7ParameterReadVarRequest>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ <items isList="true">
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
+ </TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
+ </MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ </items>
+ </S7ParameterReadVarRequest>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -646,18 +685,20 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">2</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">10</tpduReference>
- <parameterLength dataType="uint" bitLength="16">0</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageResponse>
- <errorClass dataType="uint" bitLength="8">129</errorClass>
- <errorCode dataType="uint" bitLength="8">4</errorCode>
- </S7MessageResponse>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">2</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">10</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">0</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageResponse>
+ <errorClass dataType="uint" bitLength="8">129</errorClass>
+ <errorCode dataType="uint" bitLength="8">4</errorCode>
+ </S7MessageResponse>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
diff --git a/plc4go/assets/testing/protocols/s7/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/s7/ParserSerializerTestsuite.xml
index 3119fc0..91ee906 100644
--- a/plc4go/assets/testing/protocols/s7/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/s7/ParserSerializerTestsuite.xml
@@ -146,25 +146,29 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">1</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">0</tpduReference>
- <parameterLength dataType="uint" bitLength="16">8</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageRequest>
- </S7MessageRequest>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">240</parameterType>
- <S7ParameterSetupCommunication>
- <reserved dataType="uint" bitLength="8">0</reserved>
- <maxAmqCaller dataType="uint" bitLength="16">8</maxAmqCaller>
- <maxAmqCallee dataType="uint" bitLength="16">8</maxAmqCallee>
- <pduLength dataType="uint" bitLength="16">1008</pduLength>
- </S7ParameterSetupCommunication>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">1</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">0</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">8</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageRequest>
+ </S7MessageRequest>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">240</parameterType>
+ <S7ParameterSetupCommunication>
+ <reserved dataType="uint" bitLength="8">0</reserved>
+ <maxAmqCaller dataType="uint" bitLength="16">8</maxAmqCaller>
+ <maxAmqCallee dataType="uint" bitLength="16">8</maxAmqCallee>
+ <pduLength dataType="uint" bitLength="16">1008</pduLength>
+ </S7ParameterSetupCommunication>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -190,27 +194,31 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">3</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">0</tpduReference>
- <parameterLength dataType="uint" bitLength="16">8</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageResponseData>
- <errorClass dataType="uint" bitLength="8">0</errorClass>
- <errorCode dataType="uint" bitLength="8">0</errorCode>
- </S7MessageResponseData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">240</parameterType>
- <S7ParameterSetupCommunication>
- <reserved dataType="uint" bitLength="8">0</reserved>
- <maxAmqCaller dataType="uint" bitLength="16">3</maxAmqCaller>
- <maxAmqCallee dataType="uint" bitLength="16">3</maxAmqCallee>
- <pduLength dataType="uint" bitLength="16">240</pduLength>
- </S7ParameterSetupCommunication>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">3</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">0</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">8</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageResponseData>
+ <errorClass dataType="uint" bitLength="8">0</errorClass>
+ <errorCode dataType="uint" bitLength="8">0</errorCode>
+ </S7MessageResponseData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">240</parameterType>
+ <S7ParameterSetupCommunication>
+ <reserved dataType="uint" bitLength="8">0</reserved>
+ <maxAmqCaller dataType="uint" bitLength="16">3</maxAmqCaller>
+ <maxAmqCallee dataType="uint" bitLength="16">3</maxAmqCallee>
+ <pduLength dataType="uint" bitLength="16">240</pduLength>
+ </S7ParameterSetupCommunication>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -236,66 +244,70 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">7</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">1</tpduReference>
- <parameterLength dataType="uint" bitLength="16">8</parameterLength>
- <payloadLength dataType="uint" bitLength="16">8</payloadLength>
- <S7MessageUserData>
- </S7MessageUserData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">0</parameterType>
- <S7ParameterUserData>
- <numItems dataType="uint" bitLength="8">1</numItems>
- <items isList="true">
- <S7ParameterUserDataItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7ParameterUserDataItemCPUFunctions>
- <itemLength dataType="uint" bitLength="8">4</itemLength>
- <method dataType="uint" bitLength="8">17</method>
- <cpuFunctionType dataType="uint" bitLength="4">4</cpuFunctionType>
- <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
- <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
- <sequenceNumber dataType="uint" bitLength="8">0</sequenceNumber>
- </S7ParameterUserDataItemCPUFunctions>
- </S7ParameterUserDataItem>
- </items>
- </S7ParameterUserData>
- </S7Parameter>
- <S7Payload>
- <S7PayloadUserData>
- <items isList="true">
- <S7PayloadUserDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">4</dataLength>
- <S7PayloadUserDataItemCpuFunctionReadSzlRequest>
- <szlId>
- <SzlId>
- <typeClass>
- <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0</SzlModuleTypeClass>
- </typeClass>
- <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
- <sublistList>
- <SzlSublist dataType="uint" bitLength="8" stringRepresentation="MODULE_IDENTIFICATION">17</SzlSublist>
- </sublistList>
- </SzlId>
- </szlId>
- <szlIndex dataType="uint" bitLength="16">0</szlIndex>
- </S7PayloadUserDataItemCpuFunctionReadSzlRequest>
- </S7PayloadUserDataItem>
- </items>
- </S7PayloadUserData>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">7</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">1</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">8</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">8</payloadLength>
+ <S7MessageUserData>
+ </S7MessageUserData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">0</parameterType>
+ <S7ParameterUserData>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ <items isList="true">
+ <S7ParameterUserDataItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7ParameterUserDataItemCPUFunctions>
+ <itemLength dataType="uint" bitLength="8">4</itemLength>
+ <method dataType="uint" bitLength="8">17</method>
+ <cpuFunctionType dataType="uint" bitLength="4">4</cpuFunctionType>
+ <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
+ <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
+ <sequenceNumber dataType="uint" bitLength="8">0</sequenceNumber>
+ </S7ParameterUserDataItemCPUFunctions>
+ </S7ParameterUserDataItem>
+ </items>
+ </S7ParameterUserData>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadUserData>
+ <items isList="true">
+ <S7PayloadUserDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">4</dataLength>
+ <S7PayloadUserDataItemCpuFunctionReadSzlRequest>
+ <szlId>
+ <SzlId>
+ <typeClass>
+ <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0</SzlModuleTypeClass>
+ </typeClass>
+ <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
+ <sublistList>
+ <SzlSublist dataType="uint" bitLength="8" stringRepresentation="MODULE_IDENTIFICATION">17</SzlSublist>
+ </sublistList>
+ </SzlId>
+ </szlId>
+ <szlIndex dataType="uint" bitLength="16">0</szlIndex>
+ </S7PayloadUserDataItemCpuFunctionReadSzlRequest>
+ </S7PayloadUserDataItem>
+ </items>
+ </S7PayloadUserData>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -323,92 +335,98 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">7</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">1</tpduReference>
- <parameterLength dataType="uint" bitLength="16">12</parameterLength>
- <payloadLength dataType="uint" bitLength="16">96</payloadLength>
- <S7MessageUserData>
- </S7MessageUserData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">0</parameterType>
- <S7ParameterUserData>
- <numItems dataType="uint" bitLength="8">1</numItems>
- <items isList="true">
- <S7ParameterUserDataItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7ParameterUserDataItemCPUFunctions>
- <itemLength dataType="uint" bitLength="8">8</itemLength>
- <method dataType="uint" bitLength="8">18</method>
- <cpuFunctionType dataType="uint" bitLength="4">8</cpuFunctionType>
- <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
- <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
- <sequenceNumber dataType="uint" bitLength="8">1</sequenceNumber>
- <dataUnitReferenceNumber dataType="uint" bitLength="8">0</dataUnitReferenceNumber>
- <lastDataUnit dataType="uint" bitLength="8">0</lastDataUnit>
- <errorCode dataType="uint" bitLength="16">0</errorCode>
- </S7ParameterUserDataItemCPUFunctions>
- </S7ParameterUserDataItem>
- </items>
- </S7ParameterUserData>
- </S7Parameter>
- <S7Payload>
- <S7PayloadUserData>
- <items isList="true">
- <S7PayloadUserDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9</DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">92</dataLength>
- <S7PayloadUserDataItemCpuFunctionReadSzlResponse>
- <szlId>
- <SzlId>
- <typeClass>
- <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0</SzlModuleTypeClass>
- </typeClass>
- <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
- <sublistList>
- <SzlSublist dataType="uint" bitLength="8" stringRepresentation="MODULE_IDENTIFICATION">17</SzlSublist>
- </sublistList>
- </SzlId>
- </szlId>
- <szlIndex dataType="uint" bitLength="16">0</szlIndex>
- <szlItemLength dataType="uint" bitLength="16">28</szlItemLength>
- <szlItemCount dataType="uint" bitLength="16">3</szlItemCount>
- <items isList="true">
- <SzlDataTreeItem>
- <itemIndex dataType="uint" bitLength="16">1</itemIndex>
- <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
- <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
- <ausbg dataType="uint" bitLength="16">1</ausbg>
- <ausbe dataType="uint" bitLength="16">8224</ausbe>
- </SzlDataTreeItem>
- <SzlDataTreeItem>
- <itemIndex dataType="uint" bitLength="16">6</itemIndex>
- <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
- <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
- <ausbg dataType="uint" bitLength="16">1</ausbg>
- <ausbe dataType="uint" bitLength="16">8224</ausbe>
- </SzlDataTreeItem>
- <SzlDataTreeItem>
- <itemIndex dataType="uint" bitLength="16">7</itemIndex>
- <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
- <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
- <ausbg dataType="uint" bitLength="16">22018</ausbg>
- <ausbe dataType="uint" bitLength="16">2</ausbe>
- </SzlDataTreeItem>
- </items>
- </S7PayloadUserDataItemCpuFunctionReadSzlResponse>
- </S7PayloadUserDataItem>
- </items>
- </S7PayloadUserData>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">7</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">1</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">12</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">96</payloadLength>
+ <S7MessageUserData>
+ </S7MessageUserData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">0</parameterType>
+ <S7ParameterUserData>
+ <numItems dataType="uint" bitLength="8">1</numItems>
+ <items isList="true">
+ <S7ParameterUserDataItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7ParameterUserDataItemCPUFunctions>
+ <itemLength dataType="uint" bitLength="8">8</itemLength>
+ <method dataType="uint" bitLength="8">18</method>
+ <cpuFunctionType dataType="uint" bitLength="4">8</cpuFunctionType>
+ <cpuFunctionGroup dataType="uint" bitLength="4">4</cpuFunctionGroup>
+ <cpuSubfunction dataType="uint" bitLength="8">1</cpuSubfunction>
+ <sequenceNumber dataType="uint" bitLength="8">1</sequenceNumber>
+ <dataUnitReferenceNumber dataType="uint" bitLength="8">0</dataUnitReferenceNumber>
+ <lastDataUnit dataType="uint" bitLength="8">0</lastDataUnit>
+ <errorCode dataType="uint" bitLength="16">0</errorCode>
+ </S7ParameterUserDataItemCPUFunctions>
+ </S7ParameterUserDataItem>
+ </items>
+ </S7ParameterUserData>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadUserData>
+ <items isList="true">
+ <S7PayloadUserDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="OCTET_STRING">9</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">92</dataLength>
+ <S7PayloadUserDataItemCpuFunctionReadSzlResponse>
+ <szlId>
+ <SzlId>
+ <typeClass>
+ <SzlModuleTypeClass dataType="uint" bitLength="4" stringRepresentation="CPU">0</SzlModuleTypeClass>
+ </typeClass>
+ <sublistExtract dataType="uint" bitLength="4">0</sublistExtract>
+ <sublistList>
+ <SzlSublist dataType="uint" bitLength="8" stringRepresentation="MODULE_IDENTIFICATION">17</SzlSublist>
+ </sublistList>
+ </SzlId>
+ </szlId>
+ <szlIndex dataType="uint" bitLength="16">0</szlIndex>
+ <szlItemLength dataType="uint" bitLength="16">28</szlItemLength>
+ <szlItemCount dataType="uint" bitLength="16">3</szlItemCount>
+ <items isList="true">
+ <SzlDataTreeItem>
+ <itemIndex dataType="uint" bitLength="16">1</itemIndex>
+ <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
+ <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
+ <ausbg dataType="uint" bitLength="16">1</ausbg>
+ <ausbe dataType="uint" bitLength="16">8224</ausbe>
+ </SzlDataTreeItem>
+ <SzlDataTreeItem>
+ <itemIndex dataType="uint" bitLength="16">6</itemIndex>
+ <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
+ <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
+ <ausbg dataType="uint" bitLength="16">1</ausbg>
+ <ausbe dataType="uint" bitLength="16">8224</ausbe>
+ </SzlDataTreeItem>
+ <SzlDataTreeItem>
+ <itemIndex dataType="uint" bitLength="16">7</itemIndex>
+ <mlfb dataType="byte" bitLength="160">0x36455337203231322d31424433302d3058423020</mlfb>
+ <moduleTypeId dataType="uint" bitLength="16">8224</moduleTypeId>
+ <ausbg dataType="uint" bitLength="16">22018</ausbg>
+ <ausbe dataType="uint" bitLength="16">2</ausbe>
+ </SzlDataTreeItem>
+ </items>
+ </S7PayloadUserDataItemCpuFunctionReadSzlResponse>
+ </S7PayloadUserDataItem>
+ </items>
+ </S7PayloadUserData>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -436,128 +454,124 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">1</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">11</tpduReference>
- <parameterLength dataType="uint" bitLength="16">50</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageRequest>
- </S7MessageRequest>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">4</parameterType>
- <S7ParameterReadVarRequest>
- <numItems dataType="uint" bitLength="8">4</numItems>
- <items isList="true">
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- </items>
- </S7ParameterReadVarRequest>
- </S7Parameter>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">1</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">11</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">50</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageRequest>
+ </S7MessageRequest>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">4</parameterType>
+ <S7ParameterReadVarRequest>
+ <numItems dataType="uint" bitLength="8">4</numItems>
+ <items isList="true">
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ </items>
+ </S7ParameterReadVarRequest>
+ </S7Parameter>
+ </parameter>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -566,13 +580,13 @@
<testcase>
<name>S7 Read Response</name>
- <raw>0300002c02f08032030000000b0002001700000404ff0300010100ff0300010100ff0300010100ff03000101</raw>
+ <raw>0300002d02f08032030000000b0002001800000404ff0300010100ff0300010100ff0300010100ff0300010100</raw>
<root-type>TPKTPacket</root-type>
<xml>
<TPKTPacket>
<protocolId dataType="uint" bitLength="8">3</protocolId>
<reserved dataType="uint" bitLength="8">0</reserved>
- <len dataType="uint" bitLength="16">44</len>
+ <len dataType="uint" bitLength="16">45</len>
<payload>
<COTPPacket>
<headerLength dataType="uint" bitLength="8">2</headerLength>
@@ -583,89 +597,88 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">3</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">11</tpduReference>
- <parameterLength dataType="uint" bitLength="16">2</parameterLength>
- <payloadLength dataType="uint" bitLength="16">23</payloadLength>
- <S7MessageResponseData>
- <errorClass dataType="uint" bitLength="8">0</errorClass>
- <errorCode dataType="uint" bitLength="8">0</errorCode>
- </S7MessageResponseData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">4</parameterType>
- <S7ParameterReadVarResponse>
- <numItems dataType="uint" bitLength="8">4</numItems>
- </S7ParameterReadVarResponse>
- </S7Parameter>
- <S7Payload>
- <S7PayloadReadVarResponse>
- <items isList="true">
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- <value dataType="uint" bitLength="8">0</value>
- </padding>
- </S7VarPayloadDataItem>
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- <value dataType="uint" bitLength="8">0</value>
- </padding>
- </S7VarPayloadDataItem>
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- <value dataType="uint" bitLength="8">0</value>
- </padding>
- </S7VarPayloadDataItem>
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- </padding>
- </S7VarPayloadDataItem>
- </items>
- </S7PayloadReadVarResponse>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">3</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">11</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">2</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">24</payloadLength>
+ <S7MessageResponseData>
+ <errorClass dataType="uint" bitLength="8">0</errorClass>
+ <errorCode dataType="uint" bitLength="8">0</errorCode>
+ </S7MessageResponseData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">4</parameterType>
+ <S7ParameterReadVarResponse>
+ <numItems dataType="uint" bitLength="8">4</numItems>
+ </S7ParameterReadVarResponse>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadReadVarResponse>
+ <items isList="true">
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ </items>
+ </S7PayloadReadVarResponse>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -691,18 +704,20 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">2</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">10</tpduReference>
- <parameterLength dataType="uint" bitLength="16">0</parameterLength>
- <payloadLength dataType="uint" bitLength="16">0</payloadLength>
- <S7MessageResponse>
- <errorClass dataType="uint" bitLength="8">133</errorClass>
- <errorCode dataType="uint" bitLength="8">0</errorCode>
- </S7MessageResponse>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">2</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">10</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">0</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">0</payloadLength>
+ <S7MessageResponse>
+ <errorClass dataType="uint" bitLength="8">133</errorClass>
+ <errorCode dataType="uint" bitLength="8">0</errorCode>
+ </S7MessageResponse>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -712,14 +727,14 @@
<testcase>
<name>S7 Write Request</name>
<raw>
- 0300005a02f08e32010000000e003200170504120a10010001000082000000120a10010001000082000001120a10010001000082000002120a10010001000082000003ff0300010100ff0300010100ff0300010100ff03000101
+ 0300005b02f08e32010000000e003200180504120a10010001000082000000120a10010001000082000001120a10010001000082000002120a10010001000082000003ff0300010100ff0300010100ff0300010100ff0300010100
</raw>
<root-type>TPKTPacket</root-type>
<xml>
<TPKTPacket>
<protocolId dataType="uint" bitLength="8">3</protocolId>
<reserved dataType="uint" bitLength="8">0</reserved>
- <len dataType="uint" bitLength="16">90</len>
+ <len dataType="uint" bitLength="16">91</len>
<payload>
<COTPPacket>
<headerLength dataType="uint" bitLength="8">2</headerLength>
@@ -730,193 +745,184 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">1</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">14</tpduReference>
- <parameterLength dataType="uint" bitLength="16">50</parameterLength>
- <payloadLength dataType="uint" bitLength="16">23</payloadLength>
- <S7MessageRequest>
- </S7MessageRequest>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">5</parameterType>
- <S7ParameterWriteVarRequest>
- <numItems dataType="uint" bitLength="8">4</numItems>
- <items isList="true">
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">0</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">1</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">2</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- <S7VarRequestParameterItem>
- <itemType dataType="uint" bitLength="8">18</itemType>
- <S7VarRequestParameterItemAddress>
- <itemLength dataType="uint" bitLength="8">10</itemLength>
- <address>
- <S7Address>
- <addressType dataType="uint" bitLength="8">16</addressType>
- <S7AddressAny>
- <transportSize>
- <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1
- </TransportSize>
- </transportSize>
- <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
- <dbNumber dataType="uint" bitLength="16">0</dbNumber>
- <area>
- <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130
- </MemoryArea>
- </area>
- <reserved dataType="uint" bitLength="5">0</reserved>
- <byteAddress dataType="uint" bitLength="16">0</byteAddress>
- <bitAddress dataType="uint" bitLength="3">3</bitAddress>
- </S7AddressAny>
- </S7Address>
- </address>
- </S7VarRequestParameterItemAddress>
- </S7VarRequestParameterItem>
- </items>
- </S7ParameterWriteVarRequest>
- </S7Parameter>
- <S7Payload>
- <S7PayloadWriteVarRequest>
- <items isList="true">
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- <value dataType="uint" bitLength="8">0</value>
- </padding>
- </S7VarPayloadDataItem>
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- <value dataType="uint" bitLength="8">0</value>
- </padding>
- </S7VarPayloadDataItem>
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- <value dataType="uint" bitLength="8">0</value>
- </padding>
- </S7VarPayloadDataItem>
- <S7VarPayloadDataItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- <transportSize>
- <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3
- </DataTransportSize>
- </transportSize>
- <dataLength dataType="uint" bitLength="16">1</dataLength>
- <data dataType="byte" bitLength="8">0x01</data>
- <padding isList="true">
- </padding>
- </S7VarPayloadDataItem>
- </items>
- </S7PayloadWriteVarRequest>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">1</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">14</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">50</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">24</payloadLength>
+ <S7MessageRequest>
+ </S7MessageRequest>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">5</parameterType>
+ <S7ParameterWriteVarRequest>
+ <numItems dataType="uint" bitLength="8">4</numItems>
+ <items isList="true">
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">0</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">1</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">2</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ <S7VarRequestParameterItem>
+ <itemType dataType="uint" bitLength="8">18</itemType>
+ <S7VarRequestParameterItemAddress>
+ <itemLength dataType="uint" bitLength="8">10</itemLength>
+ <address>
+ <S7Address>
+ <addressType dataType="uint" bitLength="8">16</addressType>
+ <S7AddressAny>
+ <transportSize>
+ <TransportSize dataType="uint" bitLength="8" stringRepresentation="BOOL">1</TransportSize>
+ </transportSize>
+ <numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
+ <dbNumber dataType="uint" bitLength="16">0</dbNumber>
+ <area>
+ <MemoryArea dataType="uint" bitLength="8" stringRepresentation="OUTPUTS">130</MemoryArea>
+ </area>
+ <reserved dataType="uint" bitLength="5">0</reserved>
+ <byteAddress dataType="uint" bitLength="16">0</byteAddress>
+ <bitAddress dataType="uint" bitLength="3">3</bitAddress>
+ </S7AddressAny>
+ </S7Address>
+ </address>
+ </S7VarRequestParameterItemAddress>
+ </S7VarRequestParameterItem>
+ </items>
+ </S7ParameterWriteVarRequest>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadWriteVarRequest>
+ <items isList="true">
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ <S7VarPayloadDataItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ <transportSize>
+ <DataTransportSize dataType="uint" bitLength="8" stringRepresentation="BIT">3</DataTransportSize>
+ </transportSize>
+ <dataLength dataType="uint" bitLength="16">1</dataLength>
+ <data dataType="byte" bitLength="8">0x01</data>
+ <padding isList="true">
+ <value dataType="uint" bitLength="8">0</value>
+ </padding>
+ </S7VarPayloadDataItem>
+ </items>
+ </S7PayloadWriteVarRequest>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
@@ -942,54 +948,56 @@
</COTPPacketData>
<parameters isList="true">
</parameters>
- <S7Message>
- <protocolId dataType="uint" bitLength="8">50</protocolId>
- <messageType dataType="uint" bitLength="8">3</messageType>
- <reserved dataType="uint" bitLength="16">0</reserved>
- <tpduReference dataType="uint" bitLength="16">14</tpduReference>
- <parameterLength dataType="uint" bitLength="16">2</parameterLength>
- <payloadLength dataType="uint" bitLength="16">4</payloadLength>
- <S7MessageResponseData>
- <errorClass dataType="uint" bitLength="8">0</errorClass>
- <errorCode dataType="uint" bitLength="8">0</errorCode>
- </S7MessageResponseData>
- <S7Parameter>
- <parameterType dataType="uint" bitLength="8">5</parameterType>
- <S7ParameterWriteVarResponse>
- <numItems dataType="uint" bitLength="8">4</numItems>
- </S7ParameterWriteVarResponse>
- </S7Parameter>
- <S7Payload>
- <S7PayloadWriteVarResponse>
- <items isList="true">
- <S7VarPayloadStatusItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- </S7VarPayloadStatusItem>
- <S7VarPayloadStatusItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- </S7VarPayloadStatusItem>
- <S7VarPayloadStatusItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- </S7VarPayloadStatusItem>
- <S7VarPayloadStatusItem>
- <returnCode>
- <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255
- </DataTransportErrorCode>
- </returnCode>
- </S7VarPayloadStatusItem>
- </items>
- </S7PayloadWriteVarResponse>
- </S7Payload>
- </S7Message>
+ <payload>
+ <S7Message>
+ <protocolId dataType="uint" bitLength="8">50</protocolId>
+ <messageType dataType="uint" bitLength="8">3</messageType>
+ <reserved dataType="uint" bitLength="16">0</reserved>
+ <tpduReference dataType="uint" bitLength="16">14</tpduReference>
+ <parameterLength dataType="uint" bitLength="16">2</parameterLength>
+ <payloadLength dataType="uint" bitLength="16">4</payloadLength>
+ <S7MessageResponseData>
+ <errorClass dataType="uint" bitLength="8">0</errorClass>
+ <errorCode dataType="uint" bitLength="8">0</errorCode>
+ </S7MessageResponseData>
+ <parameter>
+ <S7Parameter>
+ <parameterType dataType="uint" bitLength="8">5</parameterType>
+ <S7ParameterWriteVarResponse>
+ <numItems dataType="uint" bitLength="8">4</numItems>
+ </S7ParameterWriteVarResponse>
+ </S7Parameter>
+ </parameter>
+ <payload>
+ <S7Payload>
+ <S7PayloadWriteVarResponse>
+ <items isList="true">
+ <S7VarPayloadStatusItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ </S7VarPayloadStatusItem>
+ <S7VarPayloadStatusItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ </S7VarPayloadStatusItem>
+ <S7VarPayloadStatusItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ </S7VarPayloadStatusItem>
+ <S7VarPayloadStatusItem>
+ <returnCode>
+ <DataTransportErrorCode dataType="uint" bitLength="8" stringRepresentation="OK">255</DataTransportErrorCode>
+ </returnCode>
+ </S7VarPayloadStatusItem>
+ </items>
+ </S7PayloadWriteVarResponse>
+ </S7Payload>
+ </payload>
+ </S7Message>
+ </payload>
</COTPPacket>
</payload>
</TPKTPacket>
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
index a56801a..626fd11 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
@@ -104,7 +104,7 @@ func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) LengthInBytes() uin
return m.LengthInBits() / 8
}
-func DF1CommandResponseMessageProtectedTypedLogicalReadParse(readBuffer utils.ReadBuffer, payloadLength uint16, status uint8) (*DF1ResponseMessage, error) {
+func DF1CommandResponseMessageProtectedTypedLogicalReadParse(readBuffer utils.ReadBuffer, status uint8) (*DF1ResponseMessage, error) {
if pullErr := readBuffer.PullContext("DF1CommandResponseMessageProtectedTypedLogicalRead"); pullErr != nil {
return nil, pullErr
}
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
index 2c4913a..bc32664 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
@@ -183,7 +183,7 @@ func DF1ResponseMessageParse(readBuffer utils.ReadBuffer, payloadLength uint16)
var typeSwitchError error
switch {
case commandCode == 0x4F: // DF1CommandResponseMessageProtectedTypedLogicalRead
- _parent, typeSwitchError = DF1CommandResponseMessageProtectedTypedLogicalReadParse(readBuffer, payloadLength, status)
+ _parent, typeSwitchError = DF1CommandResponseMessageProtectedTypedLogicalReadParse(readBuffer, status)
default:
// TODO: return actual type
typeSwitchError = errors.New("Unmapped type")
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go
index 66d724e..88d92be 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go
@@ -30,7 +30,7 @@ import (
type AdsNotificationSample struct {
NotificationHandle uint32
SampleSize uint32
- Data []int8
+ Data []byte
}
// The corresponding interface
@@ -40,7 +40,7 @@ type IAdsNotificationSample interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewAdsNotificationSample(notificationHandle uint32, sampleSize uint32, data []int8) *AdsNotificationSample {
+func NewAdsNotificationSample(notificationHandle uint32, sampleSize uint32, data []byte) *AdsNotificationSample {
return &AdsNotificationSample{NotificationHandle: notificationHandle, SampleSize: sampleSize, Data: data}
}
@@ -102,22 +102,11 @@ func AdsNotificationSampleParse(readBuffer utils.ReadBuffer) (*AdsNotificationSa
if _sampleSizeErr != nil {
return nil, errors.Wrap(_sampleSizeErr, "Error parsing 'sampleSize' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, sampleSize)
- for curItem := uint16(0); curItem < uint16(sampleSize); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(sampleSize)
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("AdsNotificationSample"); closeErr != nil {
@@ -149,17 +138,10 @@ func (m *AdsNotificationSample) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
index 0981bb1..6625ec7 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
@@ -32,7 +32,7 @@ type AdsReadDeviceInfoResponse struct {
MajorVersion uint8
MinorVersion uint8
Version uint16
- Device []int8
+ Device []byte
Parent *AdsData
}
@@ -57,7 +57,7 @@ func (m *AdsReadDeviceInfoResponse) Response() bool {
func (m *AdsReadDeviceInfoResponse) InitializeParent(parent *AdsData) {
}
-func NewAdsReadDeviceInfoResponse(result ReturnCode, majorVersion uint8, minorVersion uint8, version uint16, device []int8) *AdsData {
+func NewAdsReadDeviceInfoResponse(result ReturnCode, majorVersion uint8, minorVersion uint8, version uint16, device []byte) *AdsData {
child := &AdsReadDeviceInfoResponse{
Result: result,
MajorVersion: majorVersion,
@@ -158,22 +158,11 @@ func AdsReadDeviceInfoResponseParse(readBuffer utils.ReadBuffer) (*AdsData, erro
if _versionErr != nil {
return nil, errors.Wrap(_versionErr, "Error parsing 'version' field")
}
-
- // Array field (device)
- if pullErr := readBuffer.PullContext("device", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- device := make([]int8, uint16(16))
- for curItem := uint16(0); curItem < uint16(uint16(16)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'device' field")
- }
- device[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("device", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (device)
+ numberOfBytes := int(uint16(16))
+ device, _readArrayErr := readBuffer.ReadByteArray("device", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'device' field")
}
if closeErr := readBuffer.CloseContext("AdsReadDeviceInfoResponse"); closeErr != nil {
@@ -234,17 +223,10 @@ func (m *AdsReadDeviceInfoResponse) Serialize(writeBuffer utils.WriteBuffer) err
// Array Field (device)
if m.Device != nil {
- if pushErr := writeBuffer.PushContext("device", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Device {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'device' field")
- }
- }
- if popErr := writeBuffer.PopContext("device", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (device)
+ _writeArrayErr := writeBuffer.WriteByteArray("device", m.Device)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'device' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
index 9eb97e3..d0504d2 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type AdsReadResponse struct {
Result ReturnCode
- Data []int8
+ Data []byte
Parent *AdsData
}
@@ -54,7 +54,7 @@ func (m *AdsReadResponse) Response() bool {
func (m *AdsReadResponse) InitializeParent(parent *AdsData) {
}
-func NewAdsReadResponse(result ReturnCode, data []int8) *AdsData {
+func NewAdsReadResponse(result ReturnCode, data []byte) *AdsData {
child := &AdsReadResponse{
Result: result,
Data: data,
@@ -135,22 +135,11 @@ func AdsReadResponseParse(readBuffer utils.ReadBuffer) (*AdsData, error) {
if _lengthErr != nil {
return nil, errors.Wrap(_lengthErr, "Error parsing 'length' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, length)
- for curItem := uint16(0); curItem < uint16(length); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(length)
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("AdsReadResponse"); closeErr != nil {
@@ -194,17 +183,10 @@ func (m *AdsReadResponse) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
index df5b4ea..d3fa4d8 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
@@ -32,7 +32,7 @@ type AdsReadWriteRequest struct {
IndexOffset uint32
ReadLength uint32
Items []*AdsMultiRequestItem
- Data []int8
+ Data []byte
Parent *AdsData
}
@@ -57,7 +57,7 @@ func (m *AdsReadWriteRequest) Response() bool {
func (m *AdsReadWriteRequest) InitializeParent(parent *AdsData) {
}
-func NewAdsReadWriteRequest(indexGroup uint32, indexOffset uint32, readLength uint32, items []*AdsMultiRequestItem, data []int8) *AdsData {
+func NewAdsReadWriteRequest(indexGroup uint32, indexOffset uint32, readLength uint32, items []*AdsMultiRequestItem, data []byte) *AdsData {
child := &AdsReadWriteRequest{
IndexGroup: indexGroup,
IndexOffset: indexOffset,
@@ -178,22 +178,11 @@ func AdsReadWriteRequestParse(readBuffer utils.ReadBuffer) (*AdsData, error) {
if closeErr := readBuffer.CloseContext("items", utils.WithRenderAsList(true)); closeErr != nil {
return nil, closeErr
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, uint16(writeLength)-uint16(uint16(uint16(uint16(len(items)))*uint16(uint16(12)))))
- for curItem := uint16(0); curItem < uint16(uint16(writeLength)-uint16(uint16(uint16(uint16(len(items)))*uint16(uint16(12))))); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(writeLength) - uint16(uint16(uint16(uint16(len(items)))*uint16(uint16(12)))))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("AdsReadWriteRequest"); closeErr != nil {
@@ -265,17 +254,10 @@ func (m *AdsReadWriteRequest) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
index 2d620bb..20e38d0 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type AdsReadWriteResponse struct {
Result ReturnCode
- Data []int8
+ Data []byte
Parent *AdsData
}
@@ -54,7 +54,7 @@ func (m *AdsReadWriteResponse) Response() bool {
func (m *AdsReadWriteResponse) InitializeParent(parent *AdsData) {
}
-func NewAdsReadWriteResponse(result ReturnCode, data []int8) *AdsData {
+func NewAdsReadWriteResponse(result ReturnCode, data []byte) *AdsData {
child := &AdsReadWriteResponse{
Result: result,
Data: data,
@@ -135,22 +135,11 @@ func AdsReadWriteResponseParse(readBuffer utils.ReadBuffer) (*AdsData, error) {
if _lengthErr != nil {
return nil, errors.Wrap(_lengthErr, "Error parsing 'length' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, length)
- for curItem := uint16(0); curItem < uint16(length); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(length)
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("AdsReadWriteResponse"); closeErr != nil {
@@ -194,17 +183,10 @@ func (m *AdsReadWriteResponse) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
index a871f38..fcc8c97 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
@@ -30,7 +30,7 @@ import (
type AdsWriteControlRequest struct {
AdsState uint16
DeviceState uint16
- Data []int8
+ Data []byte
Parent *AdsData
}
@@ -55,7 +55,7 @@ func (m *AdsWriteControlRequest) Response() bool {
func (m *AdsWriteControlRequest) InitializeParent(parent *AdsData) {
}
-func NewAdsWriteControlRequest(adsState uint16, deviceState uint16, data []int8) *AdsData {
+func NewAdsWriteControlRequest(adsState uint16, deviceState uint16, data []byte) *AdsData {
child := &AdsWriteControlRequest{
AdsState: adsState,
DeviceState: deviceState,
@@ -140,22 +140,11 @@ func AdsWriteControlRequestParse(readBuffer utils.ReadBuffer) (*AdsData, error)
if _lengthErr != nil {
return nil, errors.Wrap(_lengthErr, "Error parsing 'length' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, length)
- for curItem := uint16(0); curItem < uint16(length); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(length)
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("AdsWriteControlRequest"); closeErr != nil {
@@ -202,17 +191,10 @@ func (m *AdsWriteControlRequest) Serialize(writeBuffer utils.WriteBuffer) error
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
index 3273b5b..e56ad32 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
@@ -30,7 +30,7 @@ import (
type AdsWriteRequest struct {
IndexGroup uint32
IndexOffset uint32
- Data []int8
+ Data []byte
Parent *AdsData
}
@@ -55,7 +55,7 @@ func (m *AdsWriteRequest) Response() bool {
func (m *AdsWriteRequest) InitializeParent(parent *AdsData) {
}
-func NewAdsWriteRequest(indexGroup uint32, indexOffset uint32, data []int8) *AdsData {
+func NewAdsWriteRequest(indexGroup uint32, indexOffset uint32, data []byte) *AdsData {
child := &AdsWriteRequest{
IndexGroup: indexGroup,
IndexOffset: indexOffset,
@@ -140,22 +140,11 @@ func AdsWriteRequestParse(readBuffer utils.ReadBuffer) (*AdsData, error) {
if _lengthErr != nil {
return nil, errors.Wrap(_lengthErr, "Error parsing 'length' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, length)
- for curItem := uint16(0); curItem < uint16(length); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(length)
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("AdsWriteRequest"); closeErr != nil {
@@ -202,17 +191,10 @@ func (m *AdsWriteRequest) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go b/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go
index 8d8e456..af46809 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go
@@ -166,7 +166,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataFormatName string, stringLen
case dataFormatName == "IEC61131_CHAR": // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((8)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(8))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -175,7 +175,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataFormatName string, stringLen
case dataFormatName == "IEC61131_WCHAR": // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((16)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(16))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -184,7 +184,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataFormatName string, stringLen
case dataFormatName == "IEC61131_STRING": // STRING
// Manual Field (value)
- value, _valueErr := StaticHelperParseAmsString(readBuffer, stringLength, "TF-")
+ value, _valueErr := StaticHelperParseAmsString(readBuffer, stringLength, "UTF-8")
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -193,7 +193,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataFormatName string, stringLen
case dataFormatName == "IEC61131_WSTRING": // STRING
// Manual Field (value)
- value, _valueErr := StaticHelperParseAmsString(readBuffer, stringLength, "TF-")
+ value, _valueErr := StaticHelperParseAmsString(readBuffer, stringLength, "UTF-16")
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -345,26 +345,26 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataFo
case dataFormatName == "IEC61131_CHAR": // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((8)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(8), "UTF-8", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case dataFormatName == "IEC61131_WCHAR": // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((16)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(16), "UTF-16", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case dataFormatName == "IEC61131_STRING": // STRING
// Manual Field (value)
- _valueErr := StaticHelperSerializeAmsString(writeBuffer, value, stringLength, "TF-")
+ _valueErr := StaticHelperSerializeAmsString(writeBuffer, value, stringLength, "UTF-8")
if _valueErr != nil {
return errors.Wrap(_valueErr, "Error serializing 'value' field")
}
case dataFormatName == "IEC61131_WSTRING": // STRING
// Manual Field (value)
- _valueErr := StaticHelperSerializeAmsString(writeBuffer, value, stringLength, "TF-")
+ _valueErr := StaticHelperSerializeAmsString(writeBuffer, value, stringLength, "UTF-16")
if _valueErr != nil {
return errors.Wrap(_valueErr, "Error serializing 'value' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetComplexTagOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetComplexTagOctetString.go
index 08b0adc..d362886 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetComplexTagOctetString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetComplexTagOctetString.go
@@ -116,7 +116,7 @@ func BACnetComplexTagOctetStringParse(readBuffer utils.ReadBuffer, actualLength
actualLengthInBit := uint16(actualLength) * uint16(uint16(8))
// Simple Field (theString)
- theString, _theStringErr := readBuffer.ReadString("theString", uint32(actualLengthInBit))
+ theString, _theStringErr := readBuffer.ReadString("theString", uint32(-1))
if _theStringErr != nil {
return nil, errors.Wrap(_theStringErr, "Error parsing 'theString' field")
}
@@ -142,7 +142,7 @@ func (m *BACnetComplexTagOctetString) Serialize(writeBuffer utils.WriteBuffer) e
// Simple Field (theString)
theString := string(m.TheString)
- _theStringErr := writeBuffer.WriteString("theString", uint8(m.ActualLengthInBit), "TF-", (theString))
+ _theStringErr := writeBuffer.WriteString("theString", uint8(-1), "ASCII", (theString))
if _theStringErr != nil {
return errors.Wrap(_theStringErr, "Error serializing 'theString' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index 399210e..a27720a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -129,7 +129,7 @@ func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer) (*B
// Optional Field (deviceInstanceRangeLowLimit) (Can be skipped, if a given expression evaluates to false)
var deviceInstanceRangeLowLimit *BACnetComplexTagUnsignedInteger = nil
{
- _val, _err := BACnetComplexTagParse(readBuffer, (0), BACnetDataType_UNSIGNED_INTEGER)
+ _val, _err := BACnetComplexTagParse(readBuffer, uint8(0), BACnetDataType_UNSIGNED_INTEGER)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'deviceInstanceRangeLowLimit' field")
}
@@ -139,7 +139,7 @@ func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer) (*B
// Optional Field (deviceInstanceRangeHighLimit) (Can be skipped, if a given expression evaluates to false)
var deviceInstanceRangeHighLimit *BACnetComplexTagUnsignedInteger = nil
if bool((deviceInstanceRangeLowLimit) != (nil)) {
- _val, _err := BACnetComplexTagParse(readBuffer, (1), BACnetDataType_UNSIGNED_INTEGER)
+ _val, _err := BACnetComplexTagParse(readBuffer, uint8(1), BACnetDataType_UNSIGNED_INTEGER)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'deviceInstanceRangeHighLimit' field")
}
@@ -149,7 +149,7 @@ func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer) (*B
// Optional Field (objectIdentifier) (Can be skipped, if a given expression evaluates to false)
var objectIdentifier *BACnetComplexTagOctetString = nil
{
- _val, _err := BACnetComplexTagParse(readBuffer, (2), BACnetDataType_OCTET_STRING)
+ _val, _err := BACnetComplexTagParse(readBuffer, uint8(2), BACnetDataType_OCTET_STRING)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'objectIdentifier' field")
}
@@ -159,7 +159,7 @@ func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer) (*B
// Optional Field (objectName) (Can be skipped, if a given expression evaluates to false)
var objectName *BACnetComplexTagOctetString = nil
if bool((objectIdentifier) == (nil)) {
- _val, _err := BACnetComplexTagParse(readBuffer, (3), BACnetDataType_OCTET_STRING)
+ _val, _err := BACnetComplexTagParse(readBuffer, uint8(3), BACnetDataType_OCTET_STRING)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'objectName' field")
}
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
index 857daa1..6f1e950 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
@@ -27,7 +27,7 @@ import (
// The data-structure of this message
type DF1UnprotectedReadResponse struct {
- Data []uint8
+ Data []byte
Parent *DF1Command
}
@@ -50,7 +50,7 @@ func (m *DF1UnprotectedReadResponse) InitializeParent(parent *DF1Command, status
m.Parent.TransactionCounter = transactionCounter
}
-func NewDF1UnprotectedReadResponse(data []uint8, status uint8, transactionCounter uint16) *DF1Command {
+func NewDF1UnprotectedReadResponse(data []byte, status uint8, transactionCounter uint16) *DF1Command {
child := &DF1UnprotectedReadResponse{
Data: data,
Parent: NewDF1Command(status, transactionCounter),
@@ -109,14 +109,14 @@ func DF1UnprotectedReadResponseParse(readBuffer utils.ReadBuffer) (*DF1Command,
}
// Manual Array Field (data)
// Terminated array
- _dataList := make([]uint8, 0)
+ _dataList := make([]byte, 0)
for !((bool)(DF1UtilsDataTerminate(readBuffer))) {
- _dataList = append(_dataList, ((uint8)(DF1UtilsReadData(readBuffer))))
+ _dataList = append(_dataList, ((byte)(DF1UtilsReadData(readBuffer))))
}
- data := make([]uint8, len(_dataList))
+ data := make([]byte, len(_dataList))
for i := 0; i < len(_dataList); i++ {
- data[i] = uint8(_dataList[i])
+ data[i] = byte(_dataList[i])
}
if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
return nil, closeErr
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
index ff04331..9cced8f 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
@@ -78,7 +78,7 @@ func (m *CipExchange) LengthInBitsConditional(lastItem bool) uint16 {
// Const Field (nullPtr)
lengthInBits += 32
- // Const Field (UnconnectedData)
+ // Const Field (unconnectedData)
lengthInBits += 16
// Implicit Field (size)
@@ -117,13 +117,13 @@ func CipExchangeParse(readBuffer utils.ReadBuffer, exchangeLen uint16) (*CipExch
return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", CipExchange_NULLPTR) + " but got " + fmt.Sprintf("%d", nullPtr))
}
- // Const Field (UnconnectedData)
- UnconnectedData, _UnconnectedDataErr := readBuffer.ReadUint16("UnconnectedData", 16)
- if _UnconnectedDataErr != nil {
- return nil, errors.Wrap(_UnconnectedDataErr, "Error parsing 'UnconnectedData' field")
+ // Const Field (unconnectedData)
+ unconnectedData, _unconnectedDataErr := readBuffer.ReadUint16("unconnectedData", 16)
+ if _unconnectedDataErr != nil {
+ return nil, errors.Wrap(_unconnectedDataErr, "Error parsing 'unconnectedData' field")
}
- if UnconnectedData != CipExchange_UNCONNECTEDDATA {
- return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", CipExchange_UNCONNECTEDDATA) + " but got " + fmt.Sprintf("%d", UnconnectedData))
+ if unconnectedData != CipExchange_UNCONNECTEDDATA {
+ return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", CipExchange_UNCONNECTEDDATA) + " but got " + fmt.Sprintf("%d", unconnectedData))
}
// Implicit Field (size) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
@@ -170,10 +170,10 @@ func (m *CipExchange) Serialize(writeBuffer utils.WriteBuffer) error {
return errors.Wrap(_nullPtrErr, "Error serializing 'nullPtr' field")
}
- // Const Field (UnconnectedData)
- _UnconnectedDataErr := writeBuffer.WriteUint16("UnconnectedData", 16, 0x00B2)
- if _UnconnectedDataErr != nil {
- return errors.Wrap(_UnconnectedDataErr, "Error serializing 'UnconnectedData' field")
+ // Const Field (unconnectedData)
+ _unconnectedDataErr := writeBuffer.WriteUint16("unconnectedData", 16, 0x00B2)
+ if _unconnectedDataErr != nil {
+ return errors.Wrap(_unconnectedDataErr, "Error serializing 'unconnectedData' field")
}
// Implicit Field (size) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
index 3e018ca..aec519d 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type CipReadRequest struct {
RequestPathSize int8
- Tag []int8
+ Tag []byte
ElementNb uint16
Parent *CipService
}
@@ -51,9 +51,9 @@ func (m *CipReadRequest) Service() uint8 {
func (m *CipReadRequest) InitializeParent(parent *CipService) {
}
-func NewCipReadRequest(RequestPathSize int8, tag []int8, elementNb uint16) *CipService {
+func NewCipReadRequest(requestPathSize int8, tag []byte, elementNb uint16) *CipService {
child := &CipReadRequest{
- RequestPathSize: RequestPathSize,
+ RequestPathSize: requestPathSize,
Tag: tag,
ElementNb: elementNb,
Parent: NewCipService(),
@@ -92,7 +92,7 @@ func (m *CipReadRequest) LengthInBits() uint16 {
func (m *CipReadRequest) LengthInBitsConditional(lastItem bool) uint16 {
lengthInBits := uint16(m.Parent.ParentLengthInBits())
- // Simple field (RequestPathSize)
+ // Simple field (requestPathSize)
lengthInBits += 8
// Array field
@@ -115,29 +115,16 @@ func CipReadRequestParse(readBuffer utils.ReadBuffer) (*CipService, error) {
return nil, pullErr
}
- // Simple Field (RequestPathSize)
- RequestPathSize, _RequestPathSizeErr := readBuffer.ReadInt8("RequestPathSize", 8)
- if _RequestPathSizeErr != nil {
- return nil, errors.Wrap(_RequestPathSizeErr, "Error parsing 'RequestPathSize' field")
+ // Simple Field (requestPathSize)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ if _requestPathSizeErr != nil {
+ return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field")
}
-
- // Array field (tag)
- if pullErr := readBuffer.PullContext("tag", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Length array
- tag := make([]int8, 0)
- _tagLength := uint16(uint16(RequestPathSize) * uint16(uint16(2)))
- _tagEndPos := readBuffer.GetPos() + uint16(_tagLength)
- for readBuffer.GetPos() < _tagEndPos {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'tag' field")
- }
- tag = append(tag, _item)
- }
- if closeErr := readBuffer.CloseContext("tag", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (tag)
+ numberOfBytes := int(uint16(uint16(requestPathSize) * uint16(uint16(2))))
+ tag, _readArrayErr := readBuffer.ReadByteArray("tag", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'tag' field")
}
// Simple Field (elementNb)
@@ -152,7 +139,7 @@ func CipReadRequestParse(readBuffer utils.ReadBuffer) (*CipService, error) {
// Create a partially initialized instance
_child := &CipReadRequest{
- RequestPathSize: RequestPathSize,
+ RequestPathSize: requestPathSize,
Tag: tag,
ElementNb: elementNb,
Parent: &CipService{},
@@ -167,26 +154,19 @@ func (m *CipReadRequest) Serialize(writeBuffer utils.WriteBuffer) error {
return pushErr
}
- // Simple Field (RequestPathSize)
- RequestPathSize := int8(m.RequestPathSize)
- _RequestPathSizeErr := writeBuffer.WriteInt8("RequestPathSize", 8, (RequestPathSize))
- if _RequestPathSizeErr != nil {
- return errors.Wrap(_RequestPathSizeErr, "Error serializing 'RequestPathSize' field")
+ // Simple Field (requestPathSize)
+ requestPathSize := int8(m.RequestPathSize)
+ _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ if _requestPathSizeErr != nil {
+ return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
// Array Field (tag)
if m.Tag != nil {
- if pushErr := writeBuffer.PushContext("tag", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Tag {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'tag' field")
- }
- }
- if popErr := writeBuffer.PopContext("tag", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (tag)
+ _writeArrayErr := writeBuffer.WriteByteArray("tag", m.Tag)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'tag' field")
}
}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
index 70d4b34..1b9ab4e 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
@@ -32,7 +32,7 @@ type CipReadResponse struct {
Status uint8
ExtStatus uint8
DataType CIPDataTypeCode
- Data []int8
+ Data []byte
Parent *CipService
}
@@ -53,7 +53,7 @@ func (m *CipReadResponse) Service() uint8 {
func (m *CipReadResponse) InitializeParent(parent *CipService) {
}
-func NewCipReadResponse(status uint8, extStatus uint8, dataType CIPDataTypeCode, data []int8) *CipService {
+func NewCipReadResponse(status uint8, extStatus uint8, dataType CIPDataTypeCode, data []byte) *CipService {
child := &CipReadResponse{
Status: status,
ExtStatus: extStatus,
@@ -104,7 +104,7 @@ func (m *CipReadResponse) LengthInBitsConditional(lastItem bool) uint16 {
// Simple field (extStatus)
lengthInBits += 8
- // Enum Field (dataType)
+ // Simple field (dataType)
lengthInBits += 16
// Array field
@@ -150,10 +150,10 @@ func CipReadResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipS
return nil, errors.Wrap(_extStatusErr, "Error parsing 'extStatus' field")
}
+ // Simple Field (dataType)
if pullErr := readBuffer.PullContext("dataType"); pullErr != nil {
return nil, pullErr
}
- // Enum field (dataType)
dataType, _dataTypeErr := CIPDataTypeCodeParse(readBuffer)
if _dataTypeErr != nil {
return nil, errors.Wrap(_dataTypeErr, "Error parsing 'dataType' field")
@@ -161,22 +161,11 @@ func CipReadResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipS
if closeErr := readBuffer.CloseContext("dataType"); closeErr != nil {
return nil, closeErr
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, uint16(serviceLen)-uint16(uint16(6)))
- for curItem := uint16(0); curItem < uint16(uint16(serviceLen)-uint16(uint16(6))); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(serviceLen) - uint16(uint16(6)))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("CipReadResponse"); closeErr != nil {
@@ -223,32 +212,24 @@ func (m *CipReadResponse) Serialize(writeBuffer utils.WriteBuffer) error {
return errors.Wrap(_extStatusErr, "Error serializing 'extStatus' field")
}
+ // Simple Field (dataType)
if pushErr := writeBuffer.PushContext("dataType"); pushErr != nil {
return pushErr
}
- // Enum field (dataType)
- dataType := CastCIPDataTypeCode(m.DataType)
- _dataTypeErr := dataType.Serialize(writeBuffer)
- if _dataTypeErr != nil {
- return errors.Wrap(_dataTypeErr, "Error serializing 'dataType' field")
- }
+ _dataTypeErr := m.DataType.Serialize(writeBuffer)
if popErr := writeBuffer.PopContext("dataType"); popErr != nil {
return popErr
}
+ if _dataTypeErr != nil {
+ return errors.Wrap(_dataTypeErr, "Error serializing 'dataType' field")
+ }
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
index f7cedf2..ae71b09 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
@@ -29,10 +29,10 @@ import (
// The data-structure of this message
type CipWriteRequest struct {
RequestPathSize int8
- Tag []int8
+ Tag []byte
DataType CIPDataTypeCode
ElementNb uint16
- Data []int8
+ Data []byte
Parent *CipService
}
@@ -53,9 +53,9 @@ func (m *CipWriteRequest) Service() uint8 {
func (m *CipWriteRequest) InitializeParent(parent *CipService) {
}
-func NewCipWriteRequest(RequestPathSize int8, tag []int8, dataType CIPDataTypeCode, elementNb uint16, data []int8) *CipService {
+func NewCipWriteRequest(requestPathSize int8, tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte) *CipService {
child := &CipWriteRequest{
- RequestPathSize: RequestPathSize,
+ RequestPathSize: requestPathSize,
Tag: tag,
DataType: dataType,
ElementNb: elementNb,
@@ -96,7 +96,7 @@ func (m *CipWriteRequest) LengthInBits() uint16 {
func (m *CipWriteRequest) LengthInBitsConditional(lastItem bool) uint16 {
lengthInBits := uint16(m.Parent.ParentLengthInBits())
- // Simple field (RequestPathSize)
+ // Simple field (requestPathSize)
lengthInBits += 8
// Array field
@@ -104,7 +104,7 @@ func (m *CipWriteRequest) LengthInBitsConditional(lastItem bool) uint16 {
lengthInBits += 8 * uint16(len(m.Tag))
}
- // Enum Field (dataType)
+ // Simple field (dataType)
lengthInBits += 16
// Simple field (elementNb)
@@ -127,35 +127,22 @@ func CipWriteRequestParse(readBuffer utils.ReadBuffer) (*CipService, error) {
return nil, pullErr
}
- // Simple Field (RequestPathSize)
- RequestPathSize, _RequestPathSizeErr := readBuffer.ReadInt8("RequestPathSize", 8)
- if _RequestPathSizeErr != nil {
- return nil, errors.Wrap(_RequestPathSizeErr, "Error parsing 'RequestPathSize' field")
+ // Simple Field (requestPathSize)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ if _requestPathSizeErr != nil {
+ return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field")
}
-
- // Array field (tag)
- if pullErr := readBuffer.PullContext("tag", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Length array
- tag := make([]int8, 0)
- _tagLength := uint16(uint16(RequestPathSize) * uint16(uint16(2)))
- _tagEndPos := readBuffer.GetPos() + uint16(_tagLength)
- for readBuffer.GetPos() < _tagEndPos {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'tag' field")
- }
- tag = append(tag, _item)
- }
- if closeErr := readBuffer.CloseContext("tag", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (tag)
+ numberOfBytes := int(uint16(requestPathSize) * uint16(uint16(2)))
+ tag, _readArrayErr := readBuffer.ReadByteArray("tag", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'tag' field")
}
+ // Simple Field (dataType)
if pullErr := readBuffer.PullContext("dataType"); pullErr != nil {
return nil, pullErr
}
- // Enum field (dataType)
dataType, _dataTypeErr := CIPDataTypeCodeParse(readBuffer)
if _dataTypeErr != nil {
return nil, errors.Wrap(_dataTypeErr, "Error parsing 'dataType' field")
@@ -169,24 +156,11 @@ func CipWriteRequestParse(readBuffer utils.ReadBuffer) (*CipService, error) {
if _elementNbErr != nil {
return nil, errors.Wrap(_elementNbErr, "Error parsing 'elementNb' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Length array
- data := make([]int8, 0)
- _dataLength := uint16(dataType.Size()) * uint16(elementNb)
- _dataEndPos := readBuffer.GetPos() + uint16(_dataLength)
- for readBuffer.GetPos() < _dataEndPos {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data = append(data, _item)
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(dataType.Size()) * uint16(elementNb))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("CipWriteRequest"); closeErr != nil {
@@ -195,7 +169,7 @@ func CipWriteRequestParse(readBuffer utils.ReadBuffer) (*CipService, error) {
// Create a partially initialized instance
_child := &CipWriteRequest{
- RequestPathSize: RequestPathSize,
+ RequestPathSize: requestPathSize,
Tag: tag,
DataType: dataType,
ElementNb: elementNb,
@@ -212,41 +186,33 @@ func (m *CipWriteRequest) Serialize(writeBuffer utils.WriteBuffer) error {
return pushErr
}
- // Simple Field (RequestPathSize)
- RequestPathSize := int8(m.RequestPathSize)
- _RequestPathSizeErr := writeBuffer.WriteInt8("RequestPathSize", 8, (RequestPathSize))
- if _RequestPathSizeErr != nil {
- return errors.Wrap(_RequestPathSizeErr, "Error serializing 'RequestPathSize' field")
+ // Simple Field (requestPathSize)
+ requestPathSize := int8(m.RequestPathSize)
+ _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ if _requestPathSizeErr != nil {
+ return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
// Array Field (tag)
if m.Tag != nil {
- if pushErr := writeBuffer.PushContext("tag", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Tag {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'tag' field")
- }
- }
- if popErr := writeBuffer.PopContext("tag", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (tag)
+ _writeArrayErr := writeBuffer.WriteByteArray("tag", m.Tag)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'tag' field")
}
}
+ // Simple Field (dataType)
if pushErr := writeBuffer.PushContext("dataType"); pushErr != nil {
return pushErr
}
- // Enum field (dataType)
- dataType := CastCIPDataTypeCode(m.DataType)
- _dataTypeErr := dataType.Serialize(writeBuffer)
- if _dataTypeErr != nil {
- return errors.Wrap(_dataTypeErr, "Error serializing 'dataType' field")
- }
+ _dataTypeErr := m.DataType.Serialize(writeBuffer)
if popErr := writeBuffer.PopContext("dataType"); popErr != nil {
return popErr
}
+ if _dataTypeErr != nil {
+ return errors.Wrap(_dataTypeErr, "Error serializing 'dataType' field")
+ }
// Simple Field (elementNb)
elementNb := uint16(m.ElementNb)
@@ -257,17 +223,10 @@ func (m *CipWriteRequest) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
index 21ab65d..fe78105 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
@@ -93,10 +93,10 @@ func (m *MultipleServiceRequest) LengthInBits() uint16 {
func (m *MultipleServiceRequest) LengthInBitsConditional(lastItem bool) uint16 {
lengthInBits := uint16(m.Parent.ParentLengthInBits())
- // Const Field (RequestPathSize)
+ // Const Field (requestPathSize)
lengthInBits += 8
- // Const Field (RequestPath)
+ // Const Field (requestPath)
lengthInBits += 32
// Simple field (data)
@@ -114,22 +114,22 @@ func MultipleServiceRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16)
return nil, pullErr
}
- // Const Field (RequestPathSize)
- RequestPathSize, _RequestPathSizeErr := readBuffer.ReadInt8("RequestPathSize", 8)
- if _RequestPathSizeErr != nil {
- return nil, errors.Wrap(_RequestPathSizeErr, "Error parsing 'RequestPathSize' field")
+ // Const Field (requestPathSize)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ if _requestPathSizeErr != nil {
+ return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field")
}
- if RequestPathSize != MultipleServiceRequest_REQUESTPATHSIZE {
- return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", MultipleServiceRequest_REQUESTPATHSIZE) + " but got " + fmt.Sprintf("%d", RequestPathSize))
+ if requestPathSize != MultipleServiceRequest_REQUESTPATHSIZE {
+ return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", MultipleServiceRequest_REQUESTPATHSIZE) + " but got " + fmt.Sprintf("%d", requestPathSize))
}
- // Const Field (RequestPath)
- RequestPath, _RequestPathErr := readBuffer.ReadUint32("RequestPath", 32)
- if _RequestPathErr != nil {
- return nil, errors.Wrap(_RequestPathErr, "Error parsing 'RequestPath' field")
+ // Const Field (requestPath)
+ requestPath, _requestPathErr := readBuffer.ReadUint32("requestPath", 32)
+ if _requestPathErr != nil {
+ return nil, errors.Wrap(_requestPathErr, "Error parsing 'requestPath' field")
}
- if RequestPath != MultipleServiceRequest_REQUESTPATH {
- return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", MultipleServiceRequest_REQUESTPATH) + " but got " + fmt.Sprintf("%d", RequestPath))
+ if requestPath != MultipleServiceRequest_REQUESTPATH {
+ return nil, errors.New("Expected constant value " + fmt.Sprintf("%d", MultipleServiceRequest_REQUESTPATH) + " but got " + fmt.Sprintf("%d", requestPath))
}
// Simple Field (data)
@@ -163,16 +163,16 @@ func (m *MultipleServiceRequest) Serialize(writeBuffer utils.WriteBuffer) error
return pushErr
}
- // Const Field (RequestPathSize)
- _RequestPathSizeErr := writeBuffer.WriteInt8("RequestPathSize", 8, 0x02)
- if _RequestPathSizeErr != nil {
- return errors.Wrap(_RequestPathSizeErr, "Error serializing 'RequestPathSize' field")
+ // Const Field (requestPathSize)
+ _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, 0x02)
+ if _requestPathSizeErr != nil {
+ return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
- // Const Field (RequestPath)
- _RequestPathErr := writeBuffer.WriteUint32("RequestPath", 32, 0x01240220)
- if _RequestPathErr != nil {
- return errors.Wrap(_RequestPathErr, "Error serializing 'RequestPath' field")
+ // Const Field (requestPath)
+ _requestPathErr := writeBuffer.WriteUint32("requestPath", 32, 0x01240220)
+ if _requestPathErr != nil {
+ return errors.Wrap(_requestPathErr, "Error serializing 'requestPath' field")
}
// Simple Field (data)
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
index 6be511d..1bc193b 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
@@ -33,7 +33,7 @@ type MultipleServiceResponse struct {
ExtStatus uint8
ServiceNb uint16
Offsets []uint16
- ServicesData []int8
+ ServicesData []byte
Parent *CipService
}
@@ -54,7 +54,7 @@ func (m *MultipleServiceResponse) Service() uint8 {
func (m *MultipleServiceResponse) InitializeParent(parent *CipService) {
}
-func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []int8) *CipService {
+func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte) *CipService {
child := &MultipleServiceResponse{
Status: status,
ExtStatus: extStatus,
@@ -179,22 +179,11 @@ func MultipleServiceResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16
if closeErr := readBuffer.CloseContext("offsets", utils.WithRenderAsList(true)); closeErr != nil {
return nil, closeErr
}
-
- // Array field (servicesData)
- if pullErr := readBuffer.PullContext("servicesData", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- servicesData := make([]int8, uint16(uint16(serviceLen)-uint16(uint16(6)))-uint16(uint16(uint16(uint16(2))*uint16(serviceNb))))
- for curItem := uint16(0); curItem < uint16(uint16(uint16(serviceLen)-uint16(uint16(6)))-uint16(uint16(uint16(uint16(2))*uint16(serviceNb)))); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'servicesData' field")
- }
- servicesData[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("servicesData", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (servicesData)
+ numberOfBytes := int(uint16(uint16(serviceLen)-uint16(uint16(6))) - uint16(uint16(uint16(uint16(2))*uint16(serviceNb))))
+ servicesData, _readArrayErr := readBuffer.ReadByteArray("servicesData", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'servicesData' field")
}
if closeErr := readBuffer.CloseContext("MultipleServiceResponse"); closeErr != nil {
@@ -267,17 +256,10 @@ func (m *MultipleServiceResponse) Serialize(writeBuffer utils.WriteBuffer) error
// Array Field (servicesData)
if m.ServicesData != nil {
- if pushErr := writeBuffer.PushContext("servicesData", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.ServicesData {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'servicesData' field")
- }
- }
- if popErr := writeBuffer.PopContext("servicesData", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (servicesData)
+ _writeArrayErr := writeBuffer.WriteByteArray("servicesData", m.ServicesData)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'servicesData' field")
}
}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
index 819237a..512fb36 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
@@ -93,7 +93,7 @@ func (m *FirmataCommandSetPinMode) LengthInBitsConditional(lastItem bool) uint16
// Simple field (pin)
lengthInBits += 8
- // Enum Field (mode)
+ // Simple field (mode)
lengthInBits += 8
return lengthInBits
@@ -114,10 +114,10 @@ func FirmataCommandSetPinModeParse(readBuffer utils.ReadBuffer) (*FirmataCommand
return nil, errors.Wrap(_pinErr, "Error parsing 'pin' field")
}
+ // Simple Field (mode)
if pullErr := readBuffer.PullContext("mode"); pullErr != nil {
return nil, pullErr
}
- // Enum field (mode)
mode, _modeErr := PinModeParse(readBuffer)
if _modeErr != nil {
return nil, errors.Wrap(_modeErr, "Error parsing 'mode' field")
@@ -153,18 +153,17 @@ func (m *FirmataCommandSetPinMode) Serialize(writeBuffer utils.WriteBuffer) erro
return errors.Wrap(_pinErr, "Error serializing 'pin' field")
}
+ // Simple Field (mode)
if pushErr := writeBuffer.PushContext("mode"); pushErr != nil {
return pushErr
}
- // Enum field (mode)
- mode := CastPinMode(m.Mode)
- _modeErr := mode.Serialize(writeBuffer)
- if _modeErr != nil {
- return errors.Wrap(_modeErr, "Error serializing 'mode' field")
- }
+ _modeErr := m.Mode.Serialize(writeBuffer)
if popErr := writeBuffer.PopContext("mode"); popErr != nil {
return popErr
}
+ if _modeErr != nil {
+ return errors.Wrap(_modeErr, "Error serializing 'mode' field")
+ }
if popErr := writeBuffer.PopContext("FirmataCommandSetPinMode"); popErr != nil {
return popErr
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
index 13d171d..b6d9177 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
@@ -30,7 +30,7 @@ import (
type SysexCommandReportFirmwareResponse struct {
MajorVersion uint8
MinorVersion uint8
- FileName []int8
+ FileName []byte
Parent *SysexCommand
}
@@ -55,7 +55,7 @@ func (m *SysexCommandReportFirmwareResponse) Response() bool {
func (m *SysexCommandReportFirmwareResponse) InitializeParent(parent *SysexCommand) {
}
-func NewSysexCommandReportFirmwareResponse(majorVersion uint8, minorVersion uint8, fileName []int8) *SysexCommand {
+func NewSysexCommandReportFirmwareResponse(majorVersion uint8, minorVersion uint8, fileName []byte) *SysexCommand {
child := &SysexCommandReportFirmwareResponse{
MajorVersion: majorVersion,
MinorVersion: minorVersion,
@@ -134,14 +134,14 @@ func SysexCommandReportFirmwareResponseParse(readBuffer utils.ReadBuffer) (*Syse
}
// Manual Array Field (fileName)
// Terminated array
- _fileNameList := make([]int8, 0)
+ _fileNameList := make([]byte, 0)
for !((bool)(FirmataUtilsIsSysexEnd(readBuffer))) {
- _fileNameList = append(_fileNameList, ((int8)(FirmataUtilsParseSysexString(readBuffer))))
+ _fileNameList = append(_fileNameList, ((byte)(FirmataUtilsParseSysexString(readBuffer))))
}
- fileName := make([]int8, len(_fileNameList))
+ fileName := make([]byte, len(_fileNameList))
for i := 0; i < len(_fileNameList); i++ {
- fileName[i] = int8(_fileNameList[i])
+ fileName[i] = byte(_fileNameList[i])
}
if closeErr := readBuffer.CloseContext("fileName", utils.WithRenderAsList(true)); closeErr != nil {
return nil, closeErr
diff --git a/plc4go/internal/plc4go/knxnetip/Connection.go b/plc4go/internal/plc4go/knxnetip/Connection.go
index 339797d..76e58d5 100644
--- a/plc4go/internal/plc4go/knxnetip/Connection.go
+++ b/plc4go/internal/plc4go/knxnetip/Connection.go
@@ -50,9 +50,9 @@ type ConnectionMetadata struct {
ProjectNumber uint8
InstallationNumber uint8
- DeviceSerialNumber []int8
- DeviceMulticastAddress []int8
- DeviceMacAddress []int8
+ DeviceSerialNumber []byte
+ DeviceMulticastAddress []byte
+ DeviceMacAddress []byte
SupportedServices []string
}
@@ -65,9 +65,9 @@ func (m ConnectionMetadata) GetConnectionAttributes() map[string]string {
"ProjectNumber": strconv.Itoa(int(m.ProjectNumber)),
"InstallationNumber": strconv.Itoa(int(m.InstallationNumber)),
- "DeviceSerialNumber": utils.Int8ArrayToString(m.DeviceSerialNumber, " "),
- "DeviceMulticastAddress": utils.Int8ArrayToString(m.DeviceSerialNumber, "."),
- "DeviceMacAddress": utils.Int8ArrayToString(m.DeviceSerialNumber, ":"),
+ "DeviceSerialNumber": utils.ByteArrayToString(m.DeviceSerialNumber, " "),
+ "DeviceMulticastAddress": utils.ByteArrayToString(m.DeviceSerialNumber, "."),
+ "DeviceMacAddress": utils.ByteArrayToString(m.DeviceSerialNumber, ":"),
"SupportedServices": strings.Join(m.SupportedServices, ", "),
}
}
@@ -108,7 +108,7 @@ type Connection struct {
quitConnectionStateTimer chan struct{}
subscribers []*Subscriber
- valueCache map[uint16][]int8
+ valueCache map[uint16][]byte
valueCacheMutex sync.RWMutex
metadata *ConnectionMetadata
defaultTtl time.Duration
@@ -173,7 +173,7 @@ func NewConnection(transportInstance transports.TransportInstance, options map[s
internalModel.NewDefaultPlcWriteResponse,
),
subscribers: []*Subscriber{},
- valueCache: map[uint16][]int8{},
+ valueCache: map[uint16][]byte{},
valueCacheMutex: sync.RWMutex{},
metadata: &ConnectionMetadata{},
defaultTtl: time.Second * 10,
@@ -216,8 +216,7 @@ func (m *Connection) Connect() <-chan plc4go.PlcConnectionConnectResult {
// Save some important information
m.metadata.KnxMedium = searchResponse.DibDeviceInfo.KnxMedium
- m.metadata.GatewayName = string(bytes.Trim(utils.Int8ArrayToByteArray(
- searchResponse.DibDeviceInfo.DeviceFriendlyName), "\x00"))
+ m.metadata.GatewayName = string(bytes.Trim(searchResponse.DibDeviceInfo.DeviceFriendlyName, "\x00"))
m.GatewayKnxAddress = searchResponse.DibDeviceInfo.KnxAddress
m.metadata.GatewayKnxAddress = KnxAddressToString(m.GatewayKnxAddress)
m.metadata.ProjectNumber = searchResponse.DibDeviceInfo.ProjectInstallationIdentifier.ProjectNumber
diff --git a/plc4go/internal/plc4go/knxnetip/ConnectionHelper.go b/plc4go/internal/plc4go/knxnetip/ConnectionHelper.go
index 49e0fc3..3c777e6 100644
--- a/plc4go/internal/plc4go/knxnetip/ConnectionHelper.go
+++ b/plc4go/internal/plc4go/knxnetip/ConnectionHelper.go
@@ -30,7 +30,6 @@ import (
driverModel "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports/udp"
- "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
@@ -48,7 +47,7 @@ func (m *Connection) interceptIncomingMessage(interface{}) {
}
func (m *Connection) castIpToKnxAddress(ip net.IP) *driverModel.IPAddress {
- return driverModel.NewIPAddress(utils.ByteArrayToInt8Array(ip)[len(ip)-4:])
+ return driverModel.NewIPAddress(ip[len(ip)-4:])
}
func (m *Connection) handleIncomingTunnelingRequest(tunnelingRequest *driverModel.TunnelingRequest) {
@@ -57,7 +56,7 @@ func (m *Connection) handleIncomingTunnelingRequest(tunnelingRequest *driverMode
if lDataInd == nil {
return
}
- var destinationAddress []int8
+ var destinationAddress []byte
switch lDataInd.DataFrame.Child.(type) {
case *driverModel.LDataExtended:
dataFrame := driverModel.CastLDataExtended(lDataInd.DataFrame)
@@ -71,8 +70,8 @@ func (m *Connection) handleIncomingTunnelingRequest(tunnelingRequest *driverMode
if destinationAddress == nil {
return
}
- var payload []int8
- payload = append(payload, groupValueWrite.DataFirstByte)
+ var payload []byte
+ payload = append(payload, byte(groupValueWrite.DataFirstByte))
payload = append(payload, groupValueWrite.Data...)
m.handleValueCacheUpdate(destinationAddress, payload)
@@ -81,7 +80,7 @@ func (m *Connection) handleIncomingTunnelingRequest(tunnelingRequest *driverMode
return
}
// If this is an individual address and it is targeted at us, we need to ack that.
- targetAddress := Int8ArrayToKnxAddress(dataFrame.DestinationAddress)
+ targetAddress := ByteArrayToKnxAddress(dataFrame.DestinationAddress)
if *targetAddress == *m.ClientKnxAddress {
log.Info().Msg("Acknowleding an unhandled data message.")
_ = m.sendDeviceAck(*dataFrame.SourceAddress, dataFrame.Apdu.Counter, func(err error) {})
@@ -92,7 +91,7 @@ func (m *Connection) handleIncomingTunnelingRequest(tunnelingRequest *driverMode
return
}
// If this is an individual address and it is targeted at us, we need to ack that.
- targetAddress := Int8ArrayToKnxAddress(dataFrame.DestinationAddress)
+ targetAddress := ByteArrayToKnxAddress(dataFrame.DestinationAddress)
if *targetAddress == *m.ClientKnxAddress {
log.Info().Msg("Acknowleding an unhandled contol message.")
_ = m.sendDeviceAck(*dataFrame.SourceAddress, dataFrame.Apdu.Counter, func(err error) {})
@@ -104,7 +103,7 @@ func (m *Connection) handleIncomingTunnelingRequest(tunnelingRequest *driverMode
}()
}
-func (m *Connection) handleValueCacheUpdate(destinationAddress []int8, payload []int8) {
+func (m *Connection) handleValueCacheUpdate(destinationAddress []byte, payload []byte) {
addressData := uint16(destinationAddress[0])<<8 | (uint16(destinationAddress[1]) & 0xFF)
m.valueCacheMutex.RLock()
@@ -181,7 +180,7 @@ func (m *Connection) removeSubscriber(subscriber *Subscriber) {
}
// TODO: we can replace this with reflect.DeepEqual()
-func (m *Connection) sliceEqual(a, b []int8) bool {
+func (m *Connection) sliceEqual(a, b []byte) bool {
if len(a) != len(b) {
return false
}
diff --git a/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go b/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go
index 96de836..09ef1a9 100644
--- a/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go
+++ b/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go
@@ -47,7 +47,7 @@ func (m *Connection) sendGatewaySearchRequest() (*driverModel.SearchResponse, er
return nil, errors.Wrap(err, "error getting local address")
}
- localAddr := driverModel.NewIPAddress(utils.ByteArrayToInt8Array(localAddress.IP))
+ localAddr := driverModel.NewIPAddress(localAddress.IP)
discoveryEndpoint := driverModel.NewHPAIDiscoveryEndpoint(
driverModel.HostProtocolCode_IPV4_UDP, localAddr, uint16(localAddress.Port),
)
@@ -104,7 +104,7 @@ func (m *Connection) sendGatewayConnectionRequest() (*driverModel.ConnectionResp
return nil, errors.Wrap(err, "error getting local address")
}
- localAddr := driverModel.NewIPAddress(utils.ByteArrayToInt8Array(localAddress.IP)[len(localAddress.IP)-4:])
+ localAddr := driverModel.NewIPAddress(localAddress.IP[len(localAddress.IP)-4:])
connectionRequest := driverModel.NewConnectionRequest(
driverModel.NewHPAIDiscoveryEndpoint(driverModel.HostProtocolCode_IPV4_UDP, localAddr, uint16(localAddress.Port)),
driverModel.NewHPAIDataEndpoint(driverModel.HostProtocolCode_IPV4_UDP, localAddr, uint16(localAddress.Port)),
@@ -151,7 +151,7 @@ func (m *Connection) sendGatewayDisconnectionRequest() (*driverModel.DisconnectR
return nil, errors.Wrap(err, "error getting local address")
}
- localAddr := driverModel.NewIPAddress(utils.ByteArrayToInt8Array(localAddress.IP)[len(localAddress.IP)-4:])
+ localAddr := driverModel.NewIPAddress(localAddress.IP[len(localAddress.IP)-4:])
disconnectRequest := driverModel.NewDisconnectRequest(
m.CommunicationChannelId,
driverModel.NewHPAIControlEndpoint(
@@ -201,7 +201,7 @@ func (m *Connection) sendConnectionStateRequest() (*driverModel.ConnectionStateR
return nil, errors.Wrap(err, "error getting local address")
}
- localAddr := driverModel.NewIPAddress(utils.ByteArrayToInt8Array(localAddress.IP)[len(localAddress.IP)-4:])
+ localAddr := driverModel.NewIPAddress(localAddress.IP[len(localAddress.IP)-4:])
connectionStateRequest := driverModel.NewConnectionStateRequest(
m.CommunicationChannelId,
driverModel.NewHPAIControlEndpoint(
@@ -242,7 +242,7 @@ func (m *Connection) sendConnectionStateRequest() (*driverModel.ConnectionStateR
}
}
-func (m *Connection) sendGroupAddressReadRequest(groupAddress []int8) (*driverModel.ApduDataGroupValueResponse, error) {
+func (m *Connection) sendGroupAddressReadRequest(groupAddress []byte) (*driverModel.ApduDataGroupValueResponse, error) {
// Send the property read request and wait for a confirmation that this property is readable.
groupAddressReadRequest := driverModel.NewTunnelingRequest(
driverModel.NewTunnelingRequestDataBlock(m.CommunicationChannelId, m.getNewSequenceCounter()),
@@ -336,7 +336,7 @@ func (m *Connection) sendDeviceConnectionRequest(targetAddress driverModel.KnxAd
false,
6,
uint8(0),
- driverModel.NewKnxAddress(0, 0, 0), KnxAddressToInt8Array(targetAddress),
+ driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress),
driverModel.NewApduControlContainer(driverModel.NewApduControlConnect(), false, 0),
true,
true,
@@ -367,7 +367,7 @@ func (m *Connection) sendDeviceConnectionRequest(targetAddress driverModel.KnxAd
return false
}
// Check if the address matches
- if *Int8ArrayToKnxAddress(lDataFrameExt.DestinationAddress) != targetAddress {
+ if *ByteArrayToKnxAddress(lDataFrameExt.DestinationAddress) != targetAddress {
return false
}
apduControlContainer := driverModel.CastApduControlContainer(lDataFrameExt.Apdu)
@@ -426,7 +426,7 @@ func (m *Connection) sendDeviceDisconnectionRequest(targetAddress driverModel.Kn
false,
6,
uint8(0),
- driverModel.NewKnxAddress(0, 0, 0), KnxAddressToInt8Array(targetAddress),
+ driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress),
driverModel.NewApduControlContainer(driverModel.NewApduControlDisconnect(), false, 0),
true,
true,
@@ -456,7 +456,7 @@ func (m *Connection) sendDeviceDisconnectionRequest(targetAddress driverModel.Kn
if dataFrameExt == nil {
return false
}
- curTargetAddress := Int8ArrayToKnxAddress(dataFrameExt.DestinationAddress)
+ curTargetAddress := ByteArrayToKnxAddress(dataFrameExt.DestinationAddress)
// Check if the address matches
if *curTargetAddress != targetAddress {
return false
@@ -526,7 +526,7 @@ func (m *Connection) sendDeviceAuthentication(targetAddress driverModel.KnxAddre
false,
6,
uint8(0),
- driverModel.NewKnxAddress(0, 0, 0), KnxAddressToInt8Array(targetAddress),
+ driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress),
driverModel.NewApduDataContainer(driverModel.NewApduDataOther(
driverModel.NewApduDataExtAuthorizeRequest(authenticationLevel, utils.ByteArrayToUint8Array(buildingKey))),
true,
@@ -572,7 +572,7 @@ func (m *Connection) sendDeviceAuthentication(targetAddress driverModel.KnxAddre
if apduAuthorizeResponse == nil {
return false
}
- curTargetAddress := Int8ArrayToKnxAddress(dataFrameExt.DestinationAddress)
+ curTargetAddress := ByteArrayToKnxAddress(dataFrameExt.DestinationAddress)
// Check if the addresses match
if *curTargetAddress != *m.ClientKnxAddress {
return false
@@ -643,7 +643,7 @@ func (m *Connection) sendDeviceDeviceDescriptorReadRequest(targetAddress driverM
6,
uint8(0),
driverModel.NewKnxAddress(0, 0, 0),
- KnxAddressToInt8Array(targetAddress),
+ KnxAddressToByteArray(targetAddress),
driverModel.NewApduDataContainer(
driverModel.NewApduDataDeviceDescriptorRead(0), true, counter),
true,
@@ -748,7 +748,7 @@ func (m *Connection) sendDevicePropertyReadRequest(targetAddress driverModel.Knx
6,
0,
driverModel.NewKnxAddress(0, 0, 0),
- KnxAddressToInt8Array(targetAddress),
+ KnxAddressToByteArray(targetAddress),
driverModel.NewApduDataContainer(
driverModel.NewApduDataOther(
driverModel.NewApduDataExtPropertyValueRead(objectId, propertyId, numElements, propertyIndex),
@@ -863,7 +863,7 @@ func (m *Connection) sendDevicePropertyDescriptionReadRequest(targetAddress driv
6,
0,
driverModel.NewKnxAddress(0, 0, 0),
- KnxAddressToInt8Array(targetAddress),
+ KnxAddressToByteArray(targetAddress),
driverModel.NewApduDataContainer(
driverModel.NewApduDataOther(
driverModel.NewApduDataExtPropertyDescriptionRead(objectId, propertyId, 1),
@@ -979,7 +979,7 @@ func (m *Connection) sendDeviceMemoryReadRequest(targetAddress driverModel.KnxAd
6,
0,
driverModel.NewKnxAddress(0, 0, 0),
- KnxAddressToInt8Array(targetAddress),
+ KnxAddressToByteArray(targetAddress),
driverModel.NewApduDataContainer(
driverModel.NewApduDataMemoryRead(numBytes, address),
true,
@@ -1084,7 +1084,7 @@ func (m *Connection) sendDeviceAck(targetAddress driverModel.KnxAddress, counter
false,
6,
uint8(0),
- driverModel.NewKnxAddress(0, 0, 0), KnxAddressToInt8Array(targetAddress),
+ driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress),
driverModel.NewApduControlContainer(driverModel.NewApduControlAck(), true, counter),
true,
true,
@@ -1115,7 +1115,7 @@ func (m *Connection) sendDeviceAck(targetAddress driverModel.KnxAddress, counter
if *dataFrameExt.SourceAddress != *m.ClientKnxAddress {
return false
}
- curTargetAddress := Int8ArrayToKnxAddress(dataFrameExt.DestinationAddress)
+ curTargetAddress := ByteArrayToKnxAddress(dataFrameExt.DestinationAddress)
if *curTargetAddress != targetAddress {
return false
}
diff --git a/plc4go/internal/plc4go/knxnetip/Discoverer.go b/plc4go/internal/plc4go/knxnetip/Discoverer.go
index e50d4aa..0462847 100644
--- a/plc4go/internal/plc4go/knxnetip/Discoverer.go
+++ b/plc4go/internal/plc4go/knxnetip/Discoverer.go
@@ -33,7 +33,6 @@ import (
internalModel "github.com/apache/plc4x/plc4go/internal/plc4go/spi/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports/udp"
- "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
apiModel "github.com/apache/plc4x/plc4go/pkg/plc4go/model"
)
@@ -133,7 +132,7 @@ func (d *Discoverer) Discover(callback func(event apiModel.PlcDiscoveryEvent), d
return errors.New("couldn't cast transport instance to UDP transport instance")
}
localAddress := udpTransportInstance.LocalAddress
- localAddr := driverModel.NewIPAddress(utils.ByteArrayToInt8Array(localAddress.IP))
+ localAddr := driverModel.NewIPAddress(localAddress.IP)
// Prepare the discovery packet data
discoveryEndpoint := driverModel.NewHPAIDiscoveryEndpoint(
@@ -162,8 +161,7 @@ func (d *Discoverer) Discover(callback func(event apiModel.PlcDiscoveryEvent), d
if err != nil {
continue
}
- deviceName := string(bytes.Trim(utils.Int8ArrayToByteArray(
- searchResponse.DibDeviceInfo.DeviceFriendlyName), "\x00"))
+ deviceName := string(bytes.Trim(searchResponse.DibDeviceInfo.DeviceFriendlyName, "\x00"))
discoveryEvent := &internalModel.DefaultPlcDiscoveryEvent{
ProtocolCode: "knxnet-ip",
TransportCode: "udp",
diff --git a/plc4go/internal/plc4go/knxnetip/Subscriber.go b/plc4go/internal/plc4go/knxnetip/Subscriber.go
index 830e893..14c32cc 100644
--- a/plc4go/internal/plc4go/knxnetip/Subscriber.go
+++ b/plc4go/internal/plc4go/knxnetip/Subscriber.go
@@ -77,10 +77,10 @@ func (m *Subscriber) Unsubscribe(unsubscriptionRequest apiModel.PlcUnsubscriptio
/*
* Callback for incoming value change events from the KNX bus
*/
-func (m *Subscriber) handleValueChange(destinationAddress []int8, payload []int8, changed bool) {
+func (m *Subscriber) handleValueChange(destinationAddress []byte, payload []byte, changed bool) {
// Decode the group-address according to the settings in the driver
// Group addresses can be 1, 2 or 3 levels (3 being the default)
- garb := utils.NewReadBufferByteBased(utils.Int8ArrayToUint8Array(destinationAddress))
+ garb := utils.NewReadBufferByteBased(destinationAddress)
groupAddress, err := driverModel.KnxGroupAddressParse(garb, m.connection.getGroupAddressNumLevels())
if err != nil {
return
@@ -92,7 +92,7 @@ func (m *Subscriber) handleValueChange(destinationAddress []int8, payload []int8
types := map[string]internalModel.SubscriptionType{}
intervals := map[string]time.Duration{}
responseCodes := map[string]apiModel.PlcResponseCode{}
- addresses := map[string][]int8{}
+ addresses := map[string][]byte{}
plcValues := map[string]values.PlcValue{}
// Check if this datagram matches any address in this subscription request
@@ -110,7 +110,7 @@ func (m *Subscriber) handleValueChange(destinationAddress []int8, payload []int8
if groupAddressField.matches(groupAddress) {
// If this is a CHANGE_OF_STATE field, filter out the events where the value actually hasn't changed.
if subscriptionType == internalModel.SubscriptionChangeOfState && changed {
- rb := utils.NewReadBufferByteBased(utils.Int8ArrayToByteArray(payload))
+ rb := utils.NewReadBufferByteBased(payload)
if groupAddressField.GetFieldType() == nil {
responseCodes[fieldName] = apiModel.PlcResponseCode_INVALID_DATATYPE
plcValues[fieldName] = nil
diff --git a/plc4go/internal/plc4go/knxnetip/SubscriptionEvent.go b/plc4go/internal/plc4go/knxnetip/SubscriptionEvent.go
index 902b5c4..36873ad 100644
--- a/plc4go/internal/plc4go/knxnetip/SubscriptionEvent.go
+++ b/plc4go/internal/plc4go/knxnetip/SubscriptionEvent.go
@@ -29,13 +29,13 @@ import (
)
type SubscriptionEvent struct {
- addresses map[string][]int8
+ addresses map[string][]byte
internalMode.DefaultPlcSubscriptionEvent
}
func NewSubscriptionEvent(fields map[string]apiModel.PlcField, types map[string]internalMode.SubscriptionType,
intervals map[string]time.Duration, responseCodes map[string]apiModel.PlcResponseCode,
- addresses map[string][]int8, values map[string]values.PlcValue) SubscriptionEvent {
+ addresses map[string][]byte, values map[string]values.PlcValue) SubscriptionEvent {
return SubscriptionEvent{
addresses: addresses,
DefaultPlcSubscriptionEvent: internalMode.NewDefaultPlcSubscriptionEvent(fields, types, intervals, responseCodes, values),
@@ -51,7 +51,7 @@ func (m SubscriptionEvent) GetRequest() apiModel.PlcSubscriptionRequest {
*/
func (m SubscriptionEvent) GetAddress(name string) string {
rawAddress := m.addresses[name]
- rawAddressReadBuffer := utils.NewReadBufferByteBased(utils.Int8ArrayToUint8Array(rawAddress))
+ rawAddressReadBuffer := utils.NewReadBufferByteBased(rawAddress)
field := m.DefaultPlcSubscriptionEvent.GetField(name)
var groupAddress *driverModel.KnxGroupAddress
var err error
diff --git a/plc4go/internal/plc4go/knxnetip/Utils.go b/plc4go/internal/plc4go/knxnetip/Utils.go
index f3a514b..2090d4d 100644
--- a/plc4go/internal/plc4go/knxnetip/Utils.go
+++ b/plc4go/internal/plc4go/knxnetip/Utils.go
@@ -61,8 +61,8 @@ func GroupAddressToString(groupAddress *driverModel.KnxGroupAddress) string {
return ""
}
-func Int8ArrayToKnxAddress(data []int8) *driverModel.KnxAddress {
- readBuffer := utils.NewReadBufferByteBased(utils.Int8ArrayToUint8Array(data))
+func ByteArrayToKnxAddress(data []byte) *driverModel.KnxAddress {
+ readBuffer := utils.NewReadBufferByteBased(data)
knxAddress, err := driverModel.KnxAddressParse(readBuffer)
if err != nil {
return nil
@@ -70,10 +70,10 @@ func Int8ArrayToKnxAddress(data []int8) *driverModel.KnxAddress {
return knxAddress
}
-func KnxAddressToInt8Array(knxAddress driverModel.KnxAddress) []int8 {
- targetAddress := make([]int8, 2)
- targetAddress[0] = int8((knxAddress.MainGroup&0xF)<<4 | (knxAddress.MiddleGroup & 0xF))
- targetAddress[1] = int8(knxAddress.SubGroup)
+func KnxAddressToByteArray(knxAddress driverModel.KnxAddress) []byte {
+ targetAddress := make([]byte, 2)
+ targetAddress[0] = (knxAddress.MainGroup&0xF)<<4 | (knxAddress.MiddleGroup & 0xF)
+ targetAddress[1] = knxAddress.SubGroup
return targetAddress
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go b/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go
index 3ff86ed..5f29a63 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go
@@ -61,7 +61,7 @@ func (m KnxnetipParserHelper) Parse(typeName string, arguments []string, io util
case "RelativeTimestamp":
return model.RelativeTimestampParse(io)
case "CEMI":
- size, err := utils.StrToUint8(arguments[0])
+ size, err := utils.StrToUint16(arguments[0])
if err != nil {
return nil, errors.Wrap(err, "Error parsing")
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go
index 06e76e4..b639181 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go
@@ -72,11 +72,11 @@ func (m KnxnetipXmlParserHelper) Parse(typeName string, xmlString string, parser
case "RelativeTimestamp":
return model.RelativeTimestampParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "CEMI":
- parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 8)
+ parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
if err != nil {
return nil, err
}
- size := uint8(parsedUint0)
+ size := uint16(parsedUint0)
return model.CEMIParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), size)
case "KnxNetIpMessage":
return model.KnxNetIpMessageParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
index 314a49c..ae5910d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type ApduDataDeviceDescriptorResponse struct {
DescriptorType uint8
- Data []int8
+ Data []byte
Parent *ApduData
}
@@ -50,7 +50,7 @@ func (m *ApduDataDeviceDescriptorResponse) ApciType() uint8 {
func (m *ApduDataDeviceDescriptorResponse) InitializeParent(parent *ApduData) {
}
-func NewApduDataDeviceDescriptorResponse(descriptorType uint8, data []int8) *ApduData {
+func NewApduDataDeviceDescriptorResponse(descriptorType uint8, data []byte) *ApduData {
child := &ApduDataDeviceDescriptorResponse{
DescriptorType: descriptorType,
Data: data,
@@ -115,22 +115,11 @@ func ApduDataDeviceDescriptorResponseParse(readBuffer utils.ReadBuffer, dataLeng
if _descriptorTypeErr != nil {
return nil, errors.Wrap(_descriptorTypeErr, "Error parsing 'descriptorType' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16))
- for curItem := uint16(0); curItem < uint16(utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataDeviceDescriptorResponse"); closeErr != nil {
@@ -162,17 +151,10 @@ func (m *ApduDataDeviceDescriptorResponse) Serialize(writeBuffer utils.WriteBuff
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
index e134e15..4ff1cd5 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type ApduDataExtAuthorizeRequest struct {
Level uint8
- Data []uint8
+ Data []byte
Parent *ApduDataExt
}
@@ -50,7 +50,7 @@ func (m *ApduDataExtAuthorizeRequest) ExtApciType() uint8 {
func (m *ApduDataExtAuthorizeRequest) InitializeParent(parent *ApduDataExt) {
}
-func NewApduDataExtAuthorizeRequest(level uint8, data []uint8) *ApduDataExt {
+func NewApduDataExtAuthorizeRequest(level uint8, data []byte) *ApduDataExt {
child := &ApduDataExtAuthorizeRequest{
Level: level,
Data: data,
@@ -115,22 +115,11 @@ func ApduDataExtAuthorizeRequestParse(readBuffer utils.ReadBuffer) (*ApduDataExt
if _levelErr != nil {
return nil, errors.Wrap(_levelErr, "Error parsing 'level' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]uint8, uint16(4))
- for curItem := uint16(0); curItem < uint16(uint16(4)); curItem++ {
- _item, _err := readBuffer.ReadUint8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(4))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataExtAuthorizeRequest"); closeErr != nil {
@@ -162,17 +151,10 @@ func (m *ApduDataExtAuthorizeRequest) Serialize(writeBuffer utils.WriteBuffer) e
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteUint8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
index 93c47e8..01c6a75 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
@@ -32,7 +32,7 @@ type ApduDataExtPropertyValueResponse struct {
PropertyId uint8
Count uint8
Index uint16
- Data []uint8
+ Data []byte
Parent *ApduDataExt
}
@@ -53,7 +53,7 @@ func (m *ApduDataExtPropertyValueResponse) ExtApciType() uint8 {
func (m *ApduDataExtPropertyValueResponse) InitializeParent(parent *ApduDataExt) {
}
-func NewApduDataExtPropertyValueResponse(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []uint8) *ApduDataExt {
+func NewApduDataExtPropertyValueResponse(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte) *ApduDataExt {
child := &ApduDataExtPropertyValueResponse{
ObjectIndex: objectIndex,
PropertyId: propertyId,
@@ -148,22 +148,11 @@ func ApduDataExtPropertyValueResponseParse(readBuffer utils.ReadBuffer, length u
if _indexErr != nil {
return nil, errors.Wrap(_indexErr, "Error parsing 'index' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]uint8, uint16(length)-uint16(uint16(5)))
- for curItem := uint16(0); curItem < uint16(uint16(length)-uint16(uint16(5))); curItem++ {
- _item, _err := readBuffer.ReadUint8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(length) - uint16(uint16(5)))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataExtPropertyValueResponse"); closeErr != nil {
@@ -219,17 +208,10 @@ func (m *ApduDataExtPropertyValueResponse) Serialize(writeBuffer utils.WriteBuff
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteUint8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
index c5d0e81..0d79e47 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
@@ -32,7 +32,7 @@ type ApduDataExtPropertyValueWrite struct {
PropertyId uint8
Count uint8
Index uint16
- Data []uint8
+ Data []byte
Parent *ApduDataExt
}
@@ -53,7 +53,7 @@ func (m *ApduDataExtPropertyValueWrite) ExtApciType() uint8 {
func (m *ApduDataExtPropertyValueWrite) InitializeParent(parent *ApduDataExt) {
}
-func NewApduDataExtPropertyValueWrite(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []uint8) *ApduDataExt {
+func NewApduDataExtPropertyValueWrite(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte) *ApduDataExt {
child := &ApduDataExtPropertyValueWrite{
ObjectIndex: objectIndex,
PropertyId: propertyId,
@@ -148,22 +148,11 @@ func ApduDataExtPropertyValueWriteParse(readBuffer utils.ReadBuffer, length uint
if _indexErr != nil {
return nil, errors.Wrap(_indexErr, "Error parsing 'index' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]uint8, uint16(length)-uint16(uint16(5)))
- for curItem := uint16(0); curItem < uint16(uint16(length)-uint16(uint16(5))); curItem++ {
- _item, _err := readBuffer.ReadUint8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(length) - uint16(uint16(5)))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataExtPropertyValueWrite"); closeErr != nil {
@@ -219,17 +208,10 @@ func (m *ApduDataExtPropertyValueWrite) Serialize(writeBuffer utils.WriteBuffer)
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteUint8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
index 8564cf3..9c38295 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type ApduDataGroupValueResponse struct {
DataFirstByte int8
- Data []int8
+ Data []byte
Parent *ApduData
}
@@ -50,7 +50,7 @@ func (m *ApduDataGroupValueResponse) ApciType() uint8 {
func (m *ApduDataGroupValueResponse) InitializeParent(parent *ApduData) {
}
-func NewApduDataGroupValueResponse(dataFirstByte int8, data []int8) *ApduData {
+func NewApduDataGroupValueResponse(dataFirstByte int8, data []byte) *ApduData {
child := &ApduDataGroupValueResponse{
DataFirstByte: dataFirstByte,
Data: data,
@@ -115,22 +115,11 @@ func ApduDataGroupValueResponseParse(readBuffer utils.ReadBuffer, dataLength uin
if _dataFirstByteErr != nil {
return nil, errors.Wrap(_dataFirstByteErr, "Error parsing 'dataFirstByte' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16))
- for curItem := uint16(0); curItem < uint16(utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataGroupValueResponse"); closeErr != nil {
@@ -162,17 +151,10 @@ func (m *ApduDataGroupValueResponse) Serialize(writeBuffer utils.WriteBuffer) er
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
index da6b224..0a6039e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type ApduDataGroupValueWrite struct {
DataFirstByte int8
- Data []int8
+ Data []byte
Parent *ApduData
}
@@ -50,7 +50,7 @@ func (m *ApduDataGroupValueWrite) ApciType() uint8 {
func (m *ApduDataGroupValueWrite) InitializeParent(parent *ApduData) {
}
-func NewApduDataGroupValueWrite(dataFirstByte int8, data []int8) *ApduData {
+func NewApduDataGroupValueWrite(dataFirstByte int8, data []byte) *ApduData {
child := &ApduDataGroupValueWrite{
DataFirstByte: dataFirstByte,
Data: data,
@@ -115,22 +115,11 @@ func ApduDataGroupValueWriteParse(readBuffer utils.ReadBuffer, dataLength uint8)
if _dataFirstByteErr != nil {
return nil, errors.Wrap(_dataFirstByteErr, "Error parsing 'dataFirstByte' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]int8, utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16))
- for curItem := uint16(0); curItem < uint16(utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(utils.InlineIf(bool(bool((dataLength) < (1))), func() interface{} { return uint16(uint16(0)) }, func() interface{} { return uint16(uint16(dataLength) - uint16(uint16(1))) }).(uint16))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataGroupValueWrite"); closeErr != nil {
@@ -162,17 +151,10 @@ func (m *ApduDataGroupValueWrite) Serialize(writeBuffer utils.WriteBuffer) error
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
index d6c7310..36ab222 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type ApduDataMemoryResponse struct {
Address uint16
- Data []uint8
+ Data []byte
Parent *ApduData
}
@@ -50,7 +50,7 @@ func (m *ApduDataMemoryResponse) ApciType() uint8 {
func (m *ApduDataMemoryResponse) InitializeParent(parent *ApduData) {
}
-func NewApduDataMemoryResponse(address uint16, data []uint8) *ApduData {
+func NewApduDataMemoryResponse(address uint16, data []byte) *ApduData {
child := &ApduDataMemoryResponse{
Address: address,
Data: data,
@@ -125,22 +125,11 @@ func ApduDataMemoryResponseParse(readBuffer utils.ReadBuffer) (*ApduData, error)
if _addressErr != nil {
return nil, errors.Wrap(_addressErr, "Error parsing 'address' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- data := make([]uint8, numBytes)
- for curItem := uint16(0); curItem < uint16(numBytes); curItem++ {
- _item, _err := readBuffer.ReadUint8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(numBytes)
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ApduDataMemoryResponse"); closeErr != nil {
@@ -179,17 +168,10 @@ func (m *ApduDataMemoryResponse) Serialize(writeBuffer utils.WriteBuffer) error
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteUint8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
index 3935642..75a51ac 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
@@ -92,7 +92,7 @@ func (m *CEMI) LengthInBytes() uint16 {
return m.LengthInBits() / 8
}
-func CEMIParse(readBuffer utils.ReadBuffer, size uint8) (*CEMI, error) {
+func CEMIParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) {
if pullErr := readBuffer.PullContext("CEMI"); pullErr != nil {
return nil, pullErr
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
index ede9c47..d686da2 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
@@ -33,10 +33,10 @@ type DIBDeviceInfo struct {
DeviceStatus *DeviceStatus
KnxAddress *KnxAddress
ProjectInstallationIdentifier *ProjectInstallationIdentifier
- KnxNetIpDeviceSerialNumber []int8
+ KnxNetIpDeviceSerialNumber []byte
KnxNetIpDeviceMulticastAddress *IPAddress
KnxNetIpDeviceMacAddress *MACAddress
- DeviceFriendlyName []int8
+ DeviceFriendlyName []byte
}
// The corresponding interface
@@ -46,7 +46,7 @@ type IDIBDeviceInfo interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewDIBDeviceInfo(descriptionType uint8, knxMedium KnxMedium, deviceStatus *DeviceStatus, knxAddress *KnxAddress, projectInstallationIdentifier *ProjectInstallationIdentifier, knxNetIpDeviceSerialNumber []int8, knxNetIpDeviceMulticastAddress *IPAddress, knxNetIpDeviceMacAddress *MACAddress, deviceFriendlyName []int8) *DIBDeviceInfo {
+func NewDIBDeviceInfo(descriptionType uint8, knxMedium KnxMedium, deviceStatus *DeviceStatus, knxAddress *KnxAddress, projectInstallationIdentifier *ProjectInstallationIdentifier, knxNetIpDeviceSerialNumber []byte, knxNetIpDeviceMulticastAddress *IPAddress, knxNetIpDeviceMacAddress *MACAddress, deviceFriendlyName []byte) *DIBDeviceInfo {
return &DIBDeviceInfo{DescriptionType: descriptionType, KnxMedium: knxMedium, DeviceStatus: deviceStatus, KnxAddress: knxAddress, ProjectInstallationIdentifier: projectInstallationIdentifier, KnxNetIpDeviceSerialNumber: knxNetIpDeviceSerialNumber, KnxNetIpDeviceMulticastAddress: knxNetIpDeviceMulticastAddress, KnxNetIpDeviceMacAddress: knxNetIpDeviceMacAddress, DeviceFriendlyName: deviceFriendlyName}
}
@@ -180,22 +180,11 @@ func DIBDeviceInfoParse(readBuffer utils.ReadBuffer) (*DIBDeviceInfo, error) {
if closeErr := readBuffer.CloseContext("projectInstallationIdentifier"); closeErr != nil {
return nil, closeErr
}
-
- // Array field (knxNetIpDeviceSerialNumber)
- if pullErr := readBuffer.PullContext("knxNetIpDeviceSerialNumber", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- knxNetIpDeviceSerialNumber := make([]int8, uint16(6))
- for curItem := uint16(0); curItem < uint16(uint16(6)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'knxNetIpDeviceSerialNumber' field")
- }
- knxNetIpDeviceSerialNumber[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("knxNetIpDeviceSerialNumber", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (knxNetIpDeviceSerialNumber)
+ numberOfBytes := int(uint16(6))
+ knxNetIpDeviceSerialNumber, _readArrayErr := readBuffer.ReadByteArray("knxNetIpDeviceSerialNumber", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'knxNetIpDeviceSerialNumber' field")
}
// Simple Field (knxNetIpDeviceMulticastAddress)
@@ -221,22 +210,11 @@ func DIBDeviceInfoParse(readBuffer utils.ReadBuffer) (*DIBDeviceInfo, error) {
if closeErr := readBuffer.CloseContext("knxNetIpDeviceMacAddress"); closeErr != nil {
return nil, closeErr
}
-
- // Array field (deviceFriendlyName)
- if pullErr := readBuffer.PullContext("deviceFriendlyName", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- deviceFriendlyName := make([]int8, uint16(30))
- for curItem := uint16(0); curItem < uint16(uint16(30)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'deviceFriendlyName' field")
- }
- deviceFriendlyName[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("deviceFriendlyName", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (deviceFriendlyName)
+ numberOfBytes := int(uint16(30))
+ deviceFriendlyName, _readArrayErr := readBuffer.ReadByteArray("deviceFriendlyName", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'deviceFriendlyName' field")
}
if closeErr := readBuffer.CloseContext("DIBDeviceInfo"); closeErr != nil {
@@ -316,17 +294,10 @@ func (m *DIBDeviceInfo) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (knxNetIpDeviceSerialNumber)
if m.KnxNetIpDeviceSerialNumber != nil {
- if pushErr := writeBuffer.PushContext("knxNetIpDeviceSerialNumber", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.KnxNetIpDeviceSerialNumber {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'knxNetIpDeviceSerialNumber' field")
- }
- }
- if popErr := writeBuffer.PopContext("knxNetIpDeviceSerialNumber", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (knxNetIpDeviceSerialNumber)
+ _writeArrayErr := writeBuffer.WriteByteArray("knxNetIpDeviceSerialNumber", m.KnxNetIpDeviceSerialNumber)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'knxNetIpDeviceSerialNumber' field")
}
}
@@ -356,17 +327,10 @@ func (m *DIBDeviceInfo) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (deviceFriendlyName)
if m.DeviceFriendlyName != nil {
- if pushErr := writeBuffer.PushContext("deviceFriendlyName", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.DeviceFriendlyName {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'deviceFriendlyName' field")
- }
- }
- if popErr := writeBuffer.PopContext("deviceFriendlyName", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (deviceFriendlyName)
+ _writeArrayErr := writeBuffer.WriteByteArray("deviceFriendlyName", m.DeviceFriendlyName)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'deviceFriendlyName' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index 9c94026..fdc8034 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -124,7 +124,7 @@ func DeviceConfigurationRequestParse(readBuffer utils.ReadBuffer, totalLength ui
if pullErr := readBuffer.PullContext("cemi"); pullErr != nil {
return nil, pullErr
}
- cemi, _cemiErr := CEMIParse(readBuffer, uint8(totalLength)-uint8(uint8(uint8(uint8(6))+uint8(deviceConfigurationRequestDataBlock.LengthInBytes()))))
+ cemi, _cemiErr := CEMIParse(readBuffer, uint16(totalLength)-uint16(uint16(uint16(uint16(6))+uint16(deviceConfigurationRequestDataBlock.LengthInBytes()))))
if _cemiErr != nil {
return nil, errors.Wrap(_cemiErr, "Error parsing 'cemi' field")
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go
index 39c3994..ed28f9b 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type IPAddress struct {
- Addr []int8
+ Addr []byte
}
// The corresponding interface
@@ -38,7 +38,7 @@ type IIPAddress interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewIPAddress(addr []int8) *IPAddress {
+func NewIPAddress(addr []byte) *IPAddress {
return &IPAddress{Addr: addr}
}
@@ -82,22 +82,11 @@ func IPAddressParse(readBuffer utils.ReadBuffer) (*IPAddress, error) {
if pullErr := readBuffer.PullContext("IPAddress"); pullErr != nil {
return nil, pullErr
}
-
- // Array field (addr)
- if pullErr := readBuffer.PullContext("addr", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- addr := make([]int8, uint16(4))
- for curItem := uint16(0); curItem < uint16(uint16(4)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'addr' field")
- }
- addr[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("addr", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (addr)
+ numberOfBytes := int(uint16(4))
+ addr, _readArrayErr := readBuffer.ReadByteArray("addr", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'addr' field")
}
if closeErr := readBuffer.CloseContext("IPAddress"); closeErr != nil {
@@ -115,17 +104,10 @@ func (m *IPAddress) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (addr)
if m.Addr != nil {
- if pushErr := writeBuffer.PushContext("addr", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Addr {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'addr' field")
- }
- }
- if popErr := writeBuffer.PopContext("addr", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (addr)
+ _writeArrayErr := writeBuffer.WriteByteArray("addr", m.Addr)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'addr' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go
index 4a3d229..294f9a5 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go
@@ -1000,7 +1000,7 @@ func KnxDatapointParse(readBuffer utils.ReadBuffer, datapointType KnxDatapointTy
case datapointType == KnxDatapointType_DPT_Char_ASCII: // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((8)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(8))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -1009,7 +1009,7 @@ func KnxDatapointParse(readBuffer utils.ReadBuffer, datapointType KnxDatapointTy
case datapointType == KnxDatapointType_DPT_Char_8859_1: // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((8)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(8))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -2604,7 +2604,7 @@ func KnxDatapointParse(readBuffer utils.ReadBuffer, datapointType KnxDatapointTy
case datapointType == KnxDatapointType_DPT_String_ASCII: // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((112)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(112))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -2613,7 +2613,7 @@ func KnxDatapointParse(readBuffer utils.ReadBuffer, datapointType KnxDatapointTy
case datapointType == KnxDatapointType_DPT_String_8859_1: // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((112)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(112))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -5239,7 +5239,7 @@ func KnxDatapointParse(readBuffer utils.ReadBuffer, datapointType KnxDatapointTy
case datapointType == KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII: // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((16)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(16))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -6899,13 +6899,13 @@ func KnxDatapointSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, da
case datapointType == KnxDatapointType_DPT_Char_ASCII: // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((8)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(8), "ASCII", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case datapointType == KnxDatapointType_DPT_Char_8859_1: // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((8)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(8), "ISO-8859-1", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case datapointType == KnxDatapointType_DPT_Scaling: // USINT
@@ -7978,13 +7978,13 @@ func KnxDatapointSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, da
case datapointType == KnxDatapointType_DPT_String_ASCII: // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((112)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(112), "ASCII", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case datapointType == KnxDatapointType_DPT_String_8859_1: // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((112)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(112), "ISO-8859-1", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case datapointType == KnxDatapointType_DPT_SceneNumber: // USINT
@@ -9808,7 +9808,7 @@ func KnxDatapointSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, da
case datapointType == KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII: // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((16)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(16), "ASCII", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case datapointType == KnxDatapointType_DPT_Tariff_ActiveEnergy: // Struct
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go
index b6cb5c2..a3b69de 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go
@@ -221,12 +221,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((10)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(10)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -235,12 +235,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (groupAddress)
var groupAddress []api.PlcValue
- for i := 0; i < int((2)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("groupAddress", 8)
+ for i := 0; i < int(byte(2)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("groupAddress")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- groupAddress = append(groupAddress, values.NewPlcUSINT(_item))
+ groupAddress = append(groupAddress, values.NewPlcUINT(_item))
}
// Simple Field (disable)
@@ -267,12 +267,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((5)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(5)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -421,12 +421,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((1)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(1)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -434,12 +434,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((2)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(2)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -447,12 +447,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((3)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(3)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -460,12 +460,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((4)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(4)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -473,12 +473,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((5)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(5)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -486,12 +486,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((6)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(6)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -499,12 +499,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((7)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(7)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -512,12 +512,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((8)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(8)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -525,12 +525,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((9)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(9)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -538,12 +538,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((10)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(10)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -551,12 +551,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((11)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(11)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -564,12 +564,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((12)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(12)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -577,12 +577,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((13)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(13)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -590,12 +590,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((14)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(14)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -603,12 +603,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((15)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(15)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -616,12 +616,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((16)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(16)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -629,12 +629,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((17)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(17)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -642,12 +642,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((18)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(18)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -655,12 +655,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((19)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(19)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -668,12 +668,12 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((20)); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ for i := 0; i < int(byte(20)); i++ {
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -811,7 +811,7 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((8)); i++ {
+ for i := 0; i < int(bool(8)); i++ {
_item, _itemErr := readBuffer.ReadBit("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
@@ -824,7 +824,7 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((16)); i++ {
+ for i := 0; i < int(bool(16)); i++ {
_item, _itemErr := readBuffer.ReadBit("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
@@ -856,11 +856,11 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT
// Array Field (value)
var value []api.PlcValue
for i := 0; i < int(dataLengthInBytes); i++ {
- _item, _itemErr := readBuffer.ReadUint8("value", 8)
+ _item, _itemErr := readBuffer.ReadByte("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
}
- value = append(value, values.NewPlcUSINT(_item))
+ value = append(value, values.NewPlcUINT(_item))
}
readBuffer.CloseContext("KnxProperty")
return values.NewPlcList(value), nil
@@ -1008,8 +1008,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_CHAR_BLOCK: // List
// Array Field (value)
- for i := uint32(0); i < uint32((10)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(10)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1017,9 +1017,9 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_POLL_GROUP_SETTINGS: // Struct
// Array Field (groupAddress)
- for i := uint32(0); i < uint32((2)); i++ {
+ for i := uint32(0); i < uint32(byte(2)); i++ {
groupAddress := value.GetValue("groupAddress")
- _itemErr := writeBuffer.WriteUint8("", 8, groupAddress.GetIndex(i).GetUint8())
+ _itemErr := writeBuffer.WriteByte("", groupAddress.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1042,8 +1042,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_SHORT_CHAR_BLOCK: // List
// Array Field (value)
- for i := uint32(0); i < uint32((5)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(5)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1157,8 +1157,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_01: // List
// Array Field (value)
- for i := uint32(0); i < uint32((1)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(1)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1166,8 +1166,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_02: // List
// Array Field (value)
- for i := uint32(0); i < uint32((2)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(2)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1175,8 +1175,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_03: // List
// Array Field (value)
- for i := uint32(0); i < uint32((3)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(3)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1184,8 +1184,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_04: // List
// Array Field (value)
- for i := uint32(0); i < uint32((4)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(4)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1193,8 +1193,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_05: // List
// Array Field (value)
- for i := uint32(0); i < uint32((5)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(5)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1202,8 +1202,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_06: // List
// Array Field (value)
- for i := uint32(0); i < uint32((6)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(6)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1211,8 +1211,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_07: // List
// Array Field (value)
- for i := uint32(0); i < uint32((7)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(7)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1220,8 +1220,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_08: // List
// Array Field (value)
- for i := uint32(0); i < uint32((8)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(8)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1229,8 +1229,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_09: // List
// Array Field (value)
- for i := uint32(0); i < uint32((9)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(9)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1238,8 +1238,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_10: // List
// Array Field (value)
- for i := uint32(0); i < uint32((10)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(10)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1247,8 +1247,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_11: // List
// Array Field (value)
- for i := uint32(0); i < uint32((11)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(11)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1256,8 +1256,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_12: // List
// Array Field (value)
- for i := uint32(0); i < uint32((12)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(12)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1265,8 +1265,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_13: // List
// Array Field (value)
- for i := uint32(0); i < uint32((13)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(13)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1274,8 +1274,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_14: // List
// Array Field (value)
- for i := uint32(0); i < uint32((14)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(14)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1283,8 +1283,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_15: // List
// Array Field (value)
- for i := uint32(0); i < uint32((15)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(15)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1292,8 +1292,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_16: // List
// Array Field (value)
- for i := uint32(0); i < uint32((16)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(16)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1301,8 +1301,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_17: // List
// Array Field (value)
- for i := uint32(0); i < uint32((17)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(17)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1310,8 +1310,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_18: // List
// Array Field (value)
- for i := uint32(0); i < uint32((18)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(18)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1319,8 +1319,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_19: // List
// Array Field (value)
- for i := uint32(0); i < uint32((19)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(19)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1328,8 +1328,8 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_GENERIC_20: // List
// Array Field (value)
- for i := uint32(0); i < uint32((20)); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ for i := uint32(0); i < uint32(byte(20)); i++ {
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
@@ -1430,7 +1430,7 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_BITSET8: // List
// Array Field (value)
- for i := uint32(0); i < uint32((8)); i++ {
+ for i := uint32(0); i < uint32(bool(8)); i++ {
_itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
@@ -1439,7 +1439,7 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
case propertyType == KnxPropertyDataType_PDT_BITSET16: // List
// Array Field (value)
- for i := uint32(0); i < uint32((16)); i++ {
+ for i := uint32(0); i < uint32(bool(16)); i++ {
_itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
@@ -1461,7 +1461,7 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro
// Array Field (value)
for i := uint32(0); i < uint32(dataLengthInBytes); i++ {
- _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8())
+ _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
index cbb5123..f66e426 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
@@ -32,7 +32,7 @@ type LDataExtended struct {
HopCount uint8
ExtendedFrameFormat uint8
SourceAddress *KnxAddress
- DestinationAddress []int8
+ DestinationAddress []byte
Apdu *Apdu
Parent *LDataFrame
}
@@ -63,7 +63,7 @@ func (m *LDataExtended) InitializeParent(parent *LDataFrame, frameType bool, not
m.Parent.ErrorFlag = errorFlag
}
-func NewLDataExtended(groupAddress bool, hopCount uint8, extendedFrameFormat uint8, sourceAddress *KnxAddress, destinationAddress []int8, apdu *Apdu, frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame {
+func NewLDataExtended(groupAddress bool, hopCount uint8, extendedFrameFormat uint8, sourceAddress *KnxAddress, destinationAddress []byte, apdu *Apdu, frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame {
child := &LDataExtended{
GroupAddress: groupAddress,
HopCount: hopCount,
@@ -171,22 +171,11 @@ func LDataExtendedParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) {
if closeErr := readBuffer.CloseContext("sourceAddress"); closeErr != nil {
return nil, closeErr
}
-
- // Array field (destinationAddress)
- if pullErr := readBuffer.PullContext("destinationAddress", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- destinationAddress := make([]int8, uint16(2))
- for curItem := uint16(0); curItem < uint16(uint16(2)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'destinationAddress' field")
- }
- destinationAddress[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("destinationAddress", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (destinationAddress)
+ numberOfBytes := int(uint16(2))
+ destinationAddress, _readArrayErr := readBuffer.ReadByteArray("destinationAddress", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'destinationAddress' field")
}
// Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
@@ -267,17 +256,10 @@ func (m *LDataExtended) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (destinationAddress)
if m.DestinationAddress != nil {
- if pushErr := writeBuffer.PushContext("destinationAddress", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.DestinationAddress {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'destinationAddress' field")
- }
- }
- if popErr := writeBuffer.PopContext("destinationAddress", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (destinationAddress)
+ _writeArrayErr := writeBuffer.WriteByteArray("destinationAddress", m.DestinationAddress)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'destinationAddress' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go
index f206dc0..cbeacdd 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go
@@ -99,7 +99,7 @@ func (m *LDataFrame) ParentLengthInBits() uint16 {
// Discriminator Field (notAckFrame)
lengthInBits += 1
- // Enum Field (priority)
+ // Simple field (priority)
lengthInBits += 2
// Simple field (acknowledgeRequested)
@@ -144,10 +144,10 @@ func LDataFrameParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) {
return nil, errors.Wrap(_notAckFrameErr, "Error parsing 'notAckFrame' field")
}
+ // Simple Field (priority)
if pullErr := readBuffer.PullContext("priority"); pullErr != nil {
return nil, pullErr
}
- // Enum field (priority)
priority, _priorityErr := CEMIPriorityParse(readBuffer)
if _priorityErr != nil {
return nil, errors.Wrap(_priorityErr, "Error parsing 'priority' field")
@@ -234,18 +234,17 @@ func (m *LDataFrame) SerializeParent(writeBuffer utils.WriteBuffer, child ILData
return errors.Wrap(_notAckFrameErr, "Error serializing 'notAckFrame' field")
}
+ // Simple Field (priority)
if pushErr := writeBuffer.PushContext("priority"); pushErr != nil {
return pushErr
}
- // Enum field (priority)
- priority := CastCEMIPriority(m.Priority)
- _priorityErr := priority.Serialize(writeBuffer)
- if _priorityErr != nil {
- return errors.Wrap(_priorityErr, "Error serializing 'priority' field")
- }
+ _priorityErr := m.Priority.Serialize(writeBuffer)
if popErr := writeBuffer.PopContext("priority"); popErr != nil {
return popErr
}
+ if _priorityErr != nil {
+ return errors.Wrap(_priorityErr, "Error serializing 'priority' field")
+ }
// Simple Field (acknowledgeRequested)
acknowledgeRequested := bool(m.AcknowledgeRequested)
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
index 8f144f6..a1fca16 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
@@ -30,7 +30,7 @@ import (
// The data-structure of this message
type LPollData struct {
SourceAddress *KnxAddress
- TargetAddress []int8
+ TargetAddress []byte
NumberExpectedPollData uint8
Parent *LDataFrame
}
@@ -61,7 +61,7 @@ func (m *LPollData) InitializeParent(parent *LDataFrame, frameType bool, notRepe
m.Parent.ErrorFlag = errorFlag
}
-func NewLPollData(sourceAddress *KnxAddress, targetAddress []int8, numberExpectedPollData uint8, frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame {
+func NewLPollData(sourceAddress *KnxAddress, targetAddress []byte, numberExpectedPollData uint8, frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame {
child := &LPollData{
SourceAddress: sourceAddress,
TargetAddress: targetAddress,
@@ -139,22 +139,11 @@ func LPollDataParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) {
if closeErr := readBuffer.CloseContext("sourceAddress"); closeErr != nil {
return nil, closeErr
}
-
- // Array field (targetAddress)
- if pullErr := readBuffer.PullContext("targetAddress", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- targetAddress := make([]int8, uint16(2))
- for curItem := uint16(0); curItem < uint16(uint16(2)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'targetAddress' field")
- }
- targetAddress[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("targetAddress", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (targetAddress)
+ numberOfBytes := int(uint16(2))
+ targetAddress, _readArrayErr := readBuffer.ReadByteArray("targetAddress", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'targetAddress' field")
}
// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
@@ -212,17 +201,10 @@ func (m *LPollData) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (targetAddress)
if m.TargetAddress != nil {
- if pushErr := writeBuffer.PushContext("targetAddress", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.TargetAddress {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'targetAddress' field")
- }
- }
- if popErr := writeBuffer.PopContext("targetAddress", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (targetAddress)
+ _writeArrayErr := writeBuffer.WriteByteArray("targetAddress", m.TargetAddress)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'targetAddress' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go
index b9f9785..5bc954f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type MACAddress struct {
- Addr []int8
+ Addr []byte
}
// The corresponding interface
@@ -38,7 +38,7 @@ type IMACAddress interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewMACAddress(addr []int8) *MACAddress {
+func NewMACAddress(addr []byte) *MACAddress {
return &MACAddress{Addr: addr}
}
@@ -82,22 +82,11 @@ func MACAddressParse(readBuffer utils.ReadBuffer) (*MACAddress, error) {
if pullErr := readBuffer.PullContext("MACAddress"); pullErr != nil {
return nil, pullErr
}
-
- // Array field (addr)
- if pullErr := readBuffer.PullContext("addr", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- addr := make([]int8, uint16(6))
- for curItem := uint16(0); curItem < uint16(uint16(6)); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'addr' field")
- }
- addr[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("addr", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (addr)
+ numberOfBytes := int(uint16(6))
+ addr, _readArrayErr := readBuffer.ReadByteArray("addr", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'addr' field")
}
if closeErr := readBuffer.CloseContext("MACAddress"); closeErr != nil {
@@ -115,17 +104,10 @@ func (m *MACAddress) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (addr)
if m.Addr != nil {
- if pushErr := writeBuffer.PushContext("addr", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Addr {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'addr' field")
- }
- }
- if popErr := writeBuffer.PopContext("addr", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (addr)
+ _writeArrayErr := writeBuffer.WriteByteArray("addr", m.Addr)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'addr' field")
}
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
index a5efcff..9d37fca 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
@@ -124,7 +124,7 @@ func TunnelingRequestParse(readBuffer utils.ReadBuffer, totalLength uint16) (*Kn
if pullErr := readBuffer.PullContext("cemi"); pullErr != nil {
return nil, pullErr
}
- cemi, _cemiErr := CEMIParse(readBuffer, uint8(totalLength)-uint8(uint8(uint8(uint8(6))+uint8(tunnelingRequestDataBlock.LengthInBytes()))))
+ cemi, _cemiErr := CEMIParse(readBuffer, uint16(totalLength)-uint16(uint16(uint16(uint16(6))+uint16(tunnelingRequestDataBlock.LengthInBytes()))))
if _cemiErr != nil {
return nil, errors.Wrap(_cemiErr, "Error parsing 'cemi' field")
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
index 66f7216..4ca7bec 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type UnknownMessage struct {
- UnknownData []int8
+ UnknownData []byte
Parent *KnxNetIpMessage
}
@@ -49,7 +49,7 @@ func (m *UnknownMessage) MsgType() uint16 {
func (m *UnknownMessage) InitializeParent(parent *KnxNetIpMessage) {
}
-func NewUnknownMessage(unknownData []int8) *KnxNetIpMessage {
+func NewUnknownMessage(unknownData []byte) *KnxNetIpMessage {
child := &UnknownMessage{
UnknownData: unknownData,
Parent: NewKnxNetIpMessage(),
@@ -104,22 +104,11 @@ func UnknownMessageParse(readBuffer utils.ReadBuffer, totalLength uint16) (*KnxN
if pullErr := readBuffer.PullContext("UnknownMessage"); pullErr != nil {
return nil, pullErr
}
-
- // Array field (unknownData)
- if pullErr := readBuffer.PullContext("unknownData", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- unknownData := make([]int8, uint16(totalLength)-uint16(uint16(6)))
- for curItem := uint16(0); curItem < uint16(uint16(totalLength)-uint16(uint16(6))); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'unknownData' field")
- }
- unknownData[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("unknownData", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (unknownData)
+ numberOfBytes := int(uint16(totalLength) - uint16(uint16(6)))
+ unknownData, _readArrayErr := readBuffer.ReadByteArray("unknownData", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'unknownData' field")
}
if closeErr := readBuffer.CloseContext("UnknownMessage"); closeErr != nil {
@@ -143,17 +132,10 @@ func (m *UnknownMessage) Serialize(writeBuffer utils.WriteBuffer) error {
// Array Field (unknownData)
if m.UnknownData != nil {
- if pushErr := writeBuffer.PushContext("unknownData", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.UnknownData {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'unknownData' field")
- }
- }
- if popErr := writeBuffer.PopContext("unknownData", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (unknownData)
+ _writeArrayErr := writeBuffer.WriteByteArray("unknownData", m.UnknownData)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'unknownData' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/Reader.go b/plc4go/internal/plc4go/modbus/Reader.go
index eb9d594..15e2e83 100644
--- a/plc4go/internal/plc4go/modbus/Reader.go
+++ b/plc4go/internal/plc4go/modbus/Reader.go
@@ -172,19 +172,19 @@ func (m *Reader) ToPlc4xReadResponse(responseAdu readWriteModel.ModbusTcpADU, re
switch responseAdu.Pdu.Child.(type) {
case *readWriteModel.ModbusPDUReadDiscreteInputsResponse:
pdu := readWriteModel.CastModbusPDUReadDiscreteInputsResponse(responseAdu.Pdu)
- data = utils.Int8ArrayToUint8Array(pdu.Value)
+ data = pdu.Value
// Pure Boolean ...
case *readWriteModel.ModbusPDUReadCoilsResponse:
pdu := readWriteModel.CastModbusPDUReadCoilsResponse(responseAdu.Pdu)
- data = utils.Int8ArrayToUint8Array(pdu.Value)
+ data = pdu.Value
// Pure Boolean ...
case *readWriteModel.ModbusPDUReadInputRegistersResponse:
pdu := readWriteModel.CastModbusPDUReadInputRegistersResponse(responseAdu.Pdu)
- data = utils.Int8ArrayToUint8Array(pdu.Value)
+ data = pdu.Value
// DataIo ...
case *readWriteModel.ModbusPDUReadHoldingRegistersResponse:
pdu := readWriteModel.CastModbusPDUReadHoldingRegistersResponse(responseAdu.Pdu)
- data = utils.Int8ArrayToUint8Array(pdu.Value)
+ data = pdu.Value
case *readWriteModel.ModbusPDUError:
return nil, errors.Errorf("got an error from remote. Errorcode %x", responseAdu.Pdu.Child.(*readWriteModel.ModbusPDUError).ExceptionCode)
default:
diff --git a/plc4go/internal/plc4go/modbus/Writer.go b/plc4go/internal/plc4go/modbus/Writer.go
index 00e9900..78c5e54 100644
--- a/plc4go/internal/plc4go/modbus/Writer.go
+++ b/plc4go/internal/plc4go/modbus/Writer.go
@@ -83,7 +83,7 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR
}
return
}
- data := utils.Uint8ArrayToInt8Array(io.GetBytes())
+ data := io.GetBytes()
// Calculate the number of words needed to send the data
numWords := uint16(math.Ceil(float64(len(data)) / 2))
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
index 58912cc..a6cd047 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
@@ -96,7 +96,7 @@ func (m *ModbusPDUError) LengthInBits() uint16 {
func (m *ModbusPDUError) LengthInBitsConditional(lastItem bool) uint16 {
lengthInBits := uint16(m.Parent.ParentLengthInBits())
- // Enum Field (exceptionCode)
+ // Simple field (exceptionCode)
lengthInBits += 8
return lengthInBits
@@ -111,10 +111,10 @@ func ModbusPDUErrorParse(readBuffer utils.ReadBuffer) (*ModbusPDU, error) {
return nil, pullErr
}
+ // Simple Field (exceptionCode)
if pullErr := readBuffer.PullContext("exceptionCode"); pullErr != nil {
return nil, pullErr
}
- // Enum field (exceptionCode)
exceptionCode, _exceptionCodeErr := ModbusErrorCodeParse(readBuffer)
if _exceptionCodeErr != nil {
return nil, errors.Wrap(_exceptionCodeErr, "Error parsing 'exceptionCode' field")
@@ -142,18 +142,17 @@ func (m *ModbusPDUError) Serialize(writeBuffer utils.WriteBuffer) error {
return pushErr
}
+ // Simple Field (exceptionCode)
if pushErr := writeBuffer.PushContext("exceptionCode"); pushErr != nil {
return pushErr
}
- // Enum field (exceptionCode)
- exceptionCode := CastModbusErrorCode(m.ExceptionCode)
- _exceptionCodeErr := exceptionCode.Serialize(writeBuffer)
- if _exceptionCodeErr != nil {
- return errors.Wrap(_exceptionCodeErr, "Error serializing 'exceptionCode' field")
- }
+ _exceptionCodeErr := m.ExceptionCode.Serialize(writeBuffer)
if popErr := writeBuffer.PopContext("exceptionCode"); popErr != nil {
return popErr
}
+ if _exceptionCodeErr != nil {
+ return errors.Wrap(_exceptionCodeErr, "Error serializing 'exceptionCode' field")
+ }
if popErr := writeBuffer.PopContext("ModbusPDUError"); popErr != nil {
return popErr
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
index e5fceed..e36fcb5 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
@@ -31,7 +31,7 @@ type ModbusPDUGetComEventLogResponse struct {
Status uint16
EventCount uint16
MessageCount uint16
- Events []int8
+ Events []byte
Parent *ModbusPDU
}
@@ -60,7 +60,7 @@ func (m *ModbusPDUGetComEventLogResponse) Response() bool {
func (m *ModbusPDUGetComEventLogResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUGetComEventLogResponse(status uint16, eventCount uint16, messageCount uint16, events []int8) *ModbusPDU {
+func NewModbusPDUGetComEventLogResponse(status uint16, eventCount uint16, messageCount uint16, events []byte) *ModbusPDU {
child := &ModbusPDUGetComEventLogResponse{
Status: status,
EventCount: eventCount,
@@ -155,22 +155,11 @@ func ModbusPDUGetComEventLogResponseParse(readBuffer utils.ReadBuffer) (*ModbusP
if _messageCountErr != nil {
return nil, errors.Wrap(_messageCountErr, "Error parsing 'messageCount' field")
}
-
- // Array field (events)
- if pullErr := readBuffer.PullContext("events", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- events := make([]int8, uint16(byteCount)-uint16(uint16(6)))
- for curItem := uint16(0); curItem < uint16(uint16(byteCount)-uint16(uint16(6))); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'events' field")
- }
- events[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("events", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (events)
+ numberOfBytes := int(uint16(byteCount) - uint16(uint16(6)))
+ events, _readArrayErr := readBuffer.ReadByteArray("events", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'events' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUGetComEventLogResponse"); closeErr != nil {
@@ -225,17 +214,10 @@ func (m *ModbusPDUGetComEventLogResponse) Serialize(writeBuffer utils.WriteBuffe
// Array Field (events)
if m.Events != nil {
- if pushErr := writeBuffer.PushContext("events", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Events {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'events' field")
- }
- }
- if popErr := writeBuffer.PopContext("events", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (events)
+ _writeArrayErr := writeBuffer.WriteByteArray("events", m.Events)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'events' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
index 42f3b55..002df38 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type ModbusPDUReadCoilsResponse struct {
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -57,7 +57,7 @@ func (m *ModbusPDUReadCoilsResponse) Response() bool {
func (m *ModbusPDUReadCoilsResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReadCoilsResponse(value []int8) *ModbusPDU {
+func NewModbusPDUReadCoilsResponse(value []byte) *ModbusPDU {
child := &ModbusPDUReadCoilsResponse{
Value: value,
Parent: NewModbusPDU(),
@@ -122,22 +122,11 @@ func ModbusPDUReadCoilsResponseParse(readBuffer utils.ReadBuffer) (*ModbusPDU, e
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadCoilsResponse"); closeErr != nil {
@@ -168,17 +157,10 @@ func (m *ModbusPDUReadCoilsResponse) Serialize(writeBuffer utils.WriteBuffer) er
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
index e18c22d..4b9c34d 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type ModbusPDUReadDiscreteInputsResponse struct {
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -57,7 +57,7 @@ func (m *ModbusPDUReadDiscreteInputsResponse) Response() bool {
func (m *ModbusPDUReadDiscreteInputsResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReadDiscreteInputsResponse(value []int8) *ModbusPDU {
+func NewModbusPDUReadDiscreteInputsResponse(value []byte) *ModbusPDU {
child := &ModbusPDUReadDiscreteInputsResponse{
Value: value,
Parent: NewModbusPDU(),
@@ -122,22 +122,11 @@ func ModbusPDUReadDiscreteInputsResponseParse(readBuffer utils.ReadBuffer) (*Mod
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadDiscreteInputsResponse"); closeErr != nil {
@@ -168,17 +157,10 @@ func (m *ModbusPDUReadDiscreteInputsResponse) Serialize(writeBuffer utils.WriteB
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
index 1fa92ad..9aca5ac 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
@@ -29,7 +29,7 @@ import (
// The data-structure of this message
type ModbusPDUReadFileRecordResponseItem struct {
ReferenceType uint8
- Data []int8
+ Data []byte
}
// The corresponding interface
@@ -39,7 +39,7 @@ type IModbusPDUReadFileRecordResponseItem interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewModbusPDUReadFileRecordResponseItem(referenceType uint8, data []int8) *ModbusPDUReadFileRecordResponseItem {
+func NewModbusPDUReadFileRecordResponseItem(referenceType uint8, data []byte) *ModbusPDUReadFileRecordResponseItem {
return &ModbusPDUReadFileRecordResponseItem{ReferenceType: referenceType, Data: data}
}
@@ -102,24 +102,11 @@ func ModbusPDUReadFileRecordResponseItemParse(readBuffer utils.ReadBuffer) (*Mod
if _referenceTypeErr != nil {
return nil, errors.Wrap(_referenceTypeErr, "Error parsing 'referenceType' field")
}
-
- // Array field (data)
- if pullErr := readBuffer.PullContext("data", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Length array
- data := make([]int8, 0)
- _dataLength := uint16(dataLength) - uint16(uint16(1))
- _dataEndPos := readBuffer.GetPos() + uint16(_dataLength)
- for readBuffer.GetPos() < _dataEndPos {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'data' field")
- }
- data = append(data, _item)
- }
- if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (data)
+ numberOfBytes := int(uint16(dataLength) - uint16(uint16(1)))
+ data, _readArrayErr := readBuffer.ReadByteArray("data", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'data' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadFileRecordResponseItem"); closeErr != nil {
@@ -151,17 +138,10 @@ func (m *ModbusPDUReadFileRecordResponseItem) Serialize(writeBuffer utils.WriteB
// Array Field (data)
if m.Data != nil {
- if pushErr := writeBuffer.PushContext("data", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Data {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'data' field")
- }
- }
- if popErr := writeBuffer.PopContext("data", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (data)
+ _writeArrayErr := writeBuffer.WriteByteArray("data", m.Data)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'data' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
index 6704773..4b7d7ce 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type ModbusPDUReadHoldingRegistersResponse struct {
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -57,7 +57,7 @@ func (m *ModbusPDUReadHoldingRegistersResponse) Response() bool {
func (m *ModbusPDUReadHoldingRegistersResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReadHoldingRegistersResponse(value []int8) *ModbusPDU {
+func NewModbusPDUReadHoldingRegistersResponse(value []byte) *ModbusPDU {
child := &ModbusPDUReadHoldingRegistersResponse{
Value: value,
Parent: NewModbusPDU(),
@@ -122,22 +122,11 @@ func ModbusPDUReadHoldingRegistersResponseParse(readBuffer utils.ReadBuffer) (*M
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadHoldingRegistersResponse"); closeErr != nil {
@@ -168,17 +157,10 @@ func (m *ModbusPDUReadHoldingRegistersResponse) Serialize(writeBuffer utils.Writ
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
index faa10e3..fb77ab7 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type ModbusPDUReadInputRegistersResponse struct {
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -57,7 +57,7 @@ func (m *ModbusPDUReadInputRegistersResponse) Response() bool {
func (m *ModbusPDUReadInputRegistersResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReadInputRegistersResponse(value []int8) *ModbusPDU {
+func NewModbusPDUReadInputRegistersResponse(value []byte) *ModbusPDU {
child := &ModbusPDUReadInputRegistersResponse{
Value: value,
Parent: NewModbusPDU(),
@@ -122,22 +122,11 @@ func ModbusPDUReadInputRegistersResponseParse(readBuffer utils.ReadBuffer) (*Mod
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadInputRegistersResponse"); closeErr != nil {
@@ -168,17 +157,10 @@ func (m *ModbusPDUReadInputRegistersResponse) Serialize(writeBuffer utils.WriteB
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
index 0c4ce0c..ff824a6 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
@@ -32,7 +32,7 @@ type ModbusPDUReadWriteMultipleHoldingRegistersRequest struct {
ReadQuantity uint16
WriteStartingAddress uint16
WriteQuantity uint16
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -61,7 +61,7 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) Response() bool {
func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReadWriteMultipleHoldingRegistersRequest(readStartingAddress uint16, readQuantity uint16, writeStartingAddress uint16, writeQuantity uint16, value []int8) *ModbusPDU {
+func NewModbusPDUReadWriteMultipleHoldingRegistersRequest(readStartingAddress uint16, readQuantity uint16, writeStartingAddress uint16, writeQuantity uint16, value []byte) *ModbusPDU {
child := &ModbusPDUReadWriteMultipleHoldingRegistersRequest{
ReadStartingAddress: readStartingAddress,
ReadQuantity: readQuantity,
@@ -166,22 +166,11 @@ func ModbusPDUReadWriteMultipleHoldingRegistersRequestParse(readBuffer utils.Rea
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadWriteMultipleHoldingRegistersRequest"); closeErr != nil {
@@ -244,17 +233,10 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) Serialize(writeBuffe
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
index b5170de..60c169e 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type ModbusPDUReadWriteMultipleHoldingRegistersResponse struct {
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -57,7 +57,7 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) Response() bool {
func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReadWriteMultipleHoldingRegistersResponse(value []int8) *ModbusPDU {
+func NewModbusPDUReadWriteMultipleHoldingRegistersResponse(value []byte) *ModbusPDU {
child := &ModbusPDUReadWriteMultipleHoldingRegistersResponse{
Value: value,
Parent: NewModbusPDU(),
@@ -122,22 +122,11 @@ func ModbusPDUReadWriteMultipleHoldingRegistersResponseParse(readBuffer utils.Re
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReadWriteMultipleHoldingRegistersResponse"); closeErr != nil {
@@ -168,17 +157,10 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) Serialize(writeBuff
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
index b856e35..28a9980 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
@@ -28,7 +28,7 @@ import (
// The data-structure of this message
type ModbusPDUReportServerIdResponse struct {
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -57,7 +57,7 @@ func (m *ModbusPDUReportServerIdResponse) Response() bool {
func (m *ModbusPDUReportServerIdResponse) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUReportServerIdResponse(value []int8) *ModbusPDU {
+func NewModbusPDUReportServerIdResponse(value []byte) *ModbusPDU {
child := &ModbusPDUReportServerIdResponse{
Value: value,
Parent: NewModbusPDU(),
@@ -122,22 +122,11 @@ func ModbusPDUReportServerIdResponseParse(readBuffer utils.ReadBuffer) (*ModbusP
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUReportServerIdResponse"); closeErr != nil {
@@ -168,17 +157,10 @@ func (m *ModbusPDUReportServerIdResponse) Serialize(writeBuffer utils.WriteBuffe
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
index 7269ae3..5b2a325 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
@@ -31,7 +31,7 @@ type ModbusPDUWriteFileRecordRequestItem struct {
ReferenceType uint8
FileNumber uint16
RecordNumber uint16
- RecordData []int8
+ RecordData []byte
}
// The corresponding interface
@@ -41,7 +41,7 @@ type IModbusPDUWriteFileRecordRequestItem interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewModbusPDUWriteFileRecordRequestItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordData []int8) *ModbusPDUWriteFileRecordRequestItem {
+func NewModbusPDUWriteFileRecordRequestItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordData []byte) *ModbusPDUWriteFileRecordRequestItem {
return &ModbusPDUWriteFileRecordRequestItem{ReferenceType: referenceType, FileNumber: fileNumber, RecordNumber: recordNumber, RecordData: recordData}
}
@@ -122,24 +122,11 @@ func ModbusPDUWriteFileRecordRequestItemParse(readBuffer utils.ReadBuffer) (*Mod
if _recordLengthErr != nil {
return nil, errors.Wrap(_recordLengthErr, "Error parsing 'recordLength' field")
}
-
- // Array field (recordData)
- if pullErr := readBuffer.PullContext("recordData", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Length array
- recordData := make([]int8, 0)
- _recordDataLength := uint16(recordLength) * uint16(uint16(2))
- _recordDataEndPos := readBuffer.GetPos() + uint16(_recordDataLength)
- for readBuffer.GetPos() < _recordDataEndPos {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'recordData' field")
- }
- recordData = append(recordData, _item)
- }
- if closeErr := readBuffer.CloseContext("recordData", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (recordData)
+ numberOfBytes := int(uint16(recordLength) * uint16(uint16(2)))
+ recordData, _readArrayErr := readBuffer.ReadByteArray("recordData", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'recordData' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUWriteFileRecordRequestItem"); closeErr != nil {
@@ -185,17 +172,10 @@ func (m *ModbusPDUWriteFileRecordRequestItem) Serialize(writeBuffer utils.WriteB
// Array Field (recordData)
if m.RecordData != nil {
- if pushErr := writeBuffer.PushContext("recordData", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.RecordData {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'recordData' field")
- }
- }
- if popErr := writeBuffer.PopContext("recordData", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (recordData)
+ _writeArrayErr := writeBuffer.WriteByteArray("recordData", m.RecordData)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'recordData' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
index ef1012f..6935d50 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
@@ -31,7 +31,7 @@ type ModbusPDUWriteFileRecordResponseItem struct {
ReferenceType uint8
FileNumber uint16
RecordNumber uint16
- RecordData []int8
+ RecordData []byte
}
// The corresponding interface
@@ -41,7 +41,7 @@ type IModbusPDUWriteFileRecordResponseItem interface {
Serialize(writeBuffer utils.WriteBuffer) error
}
-func NewModbusPDUWriteFileRecordResponseItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordData []int8) *ModbusPDUWriteFileRecordResponseItem {
+func NewModbusPDUWriteFileRecordResponseItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordData []byte) *ModbusPDUWriteFileRecordResponseItem {
return &ModbusPDUWriteFileRecordResponseItem{ReferenceType: referenceType, FileNumber: fileNumber, RecordNumber: recordNumber, RecordData: recordData}
}
@@ -122,24 +122,11 @@ func ModbusPDUWriteFileRecordResponseItemParse(readBuffer utils.ReadBuffer) (*Mo
if _recordLengthErr != nil {
return nil, errors.Wrap(_recordLengthErr, "Error parsing 'recordLength' field")
}
-
- // Array field (recordData)
- if pullErr := readBuffer.PullContext("recordData", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Length array
- recordData := make([]int8, 0)
- _recordDataLength := recordLength
- _recordDataEndPos := readBuffer.GetPos() + uint16(_recordDataLength)
- for readBuffer.GetPos() < _recordDataEndPos {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'recordData' field")
- }
- recordData = append(recordData, _item)
- }
- if closeErr := readBuffer.CloseContext("recordData", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (recordData)
+ numberOfBytes := int(recordLength)
+ recordData, _readArrayErr := readBuffer.ReadByteArray("recordData", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'recordData' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUWriteFileRecordResponseItem"); closeErr != nil {
@@ -185,17 +172,10 @@ func (m *ModbusPDUWriteFileRecordResponseItem) Serialize(writeBuffer utils.Write
// Array Field (recordData)
if m.RecordData != nil {
- if pushErr := writeBuffer.PushContext("recordData", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.RecordData {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'recordData' field")
- }
- }
- if popErr := writeBuffer.PopContext("recordData", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (recordData)
+ _writeArrayErr := writeBuffer.WriteByteArray("recordData", m.RecordData)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'recordData' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
index d918dff..9bc72e9 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
@@ -30,7 +30,7 @@ import (
type ModbusPDUWriteMultipleCoilsRequest struct {
StartingAddress uint16
Quantity uint16
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -59,7 +59,7 @@ func (m *ModbusPDUWriteMultipleCoilsRequest) Response() bool {
func (m *ModbusPDUWriteMultipleCoilsRequest) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUWriteMultipleCoilsRequest(startingAddress uint16, quantity uint16, value []int8) *ModbusPDU {
+func NewModbusPDUWriteMultipleCoilsRequest(startingAddress uint16, quantity uint16, value []byte) *ModbusPDU {
child := &ModbusPDUWriteMultipleCoilsRequest{
StartingAddress: startingAddress,
Quantity: quantity,
@@ -144,22 +144,11 @@ func ModbusPDUWriteMultipleCoilsRequestParse(readBuffer utils.ReadBuffer) (*Modb
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUWriteMultipleCoilsRequest"); closeErr != nil {
@@ -206,17 +195,10 @@ func (m *ModbusPDUWriteMultipleCoilsRequest) Serialize(writeBuffer utils.WriteBu
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
index 616519a..0742918 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
@@ -30,7 +30,7 @@ import (
type ModbusPDUWriteMultipleHoldingRegistersRequest struct {
StartingAddress uint16
Quantity uint16
- Value []int8
+ Value []byte
Parent *ModbusPDU
}
@@ -59,7 +59,7 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) Response() bool {
func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) InitializeParent(parent *ModbusPDU) {
}
-func NewModbusPDUWriteMultipleHoldingRegistersRequest(startingAddress uint16, quantity uint16, value []int8) *ModbusPDU {
+func NewModbusPDUWriteMultipleHoldingRegistersRequest(startingAddress uint16, quantity uint16, value []byte) *ModbusPDU {
child := &ModbusPDUWriteMultipleHoldingRegistersRequest{
StartingAddress: startingAddress,
Quantity: quantity,
@@ -144,22 +144,11 @@ func ModbusPDUWriteMultipleHoldingRegistersRequestParse(readBuffer utils.ReadBuf
if _byteCountErr != nil {
return nil, errors.Wrap(_byteCountErr, "Error parsing 'byteCount' field")
}
-
- // Array field (value)
- if pullErr := readBuffer.PullContext("value", utils.WithRenderAsList(true)); pullErr != nil {
- return nil, pullErr
- }
- // Count array
- value := make([]int8, byteCount)
- for curItem := uint16(0); curItem < uint16(byteCount); curItem++ {
- _item, _err := readBuffer.ReadInt8("", 8)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'value' field")
- }
- value[curItem] = _item
- }
- if closeErr := readBuffer.CloseContext("value", utils.WithRenderAsList(true)); closeErr != nil {
- return nil, closeErr
+ // Byte Array field (value)
+ numberOfBytes := int(byteCount)
+ value, _readArrayErr := readBuffer.ReadByteArray("value", numberOfBytes)
+ if _readArrayErr != nil {
+ return nil, errors.Wrap(_readArrayErr, "Error parsing 'value' field")
}
if closeErr := readBuffer.CloseContext("ModbusPDUWriteMultipleHoldingRegistersRequest"); closeErr != nil {
@@ -206,17 +195,10 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) Serialize(writeBuffer ut
// Array Field (value)
if m.Value != nil {
- if pushErr := writeBuffer.PushContext("value", utils.WithRenderAsList(true)); pushErr != nil {
- return pushErr
- }
- for _, _element := range m.Value {
- _elementErr := writeBuffer.WriteInt8("", 8, _element)
- if _elementErr != nil {
- return errors.Wrap(_elementErr, "Error serializing 'value' field")
- }
- }
- if popErr := writeBuffer.PopContext("value", utils.WithRenderAsList(true)); popErr != nil {
- return popErr
+ // Byte Array field (value)
+ _writeArrayErr := writeBuffer.WriteByteArray("value", m.Value)
+ if _writeArrayErr != nil {
+ return errors.Wrap(_writeArrayErr, "Error serializing 'value' field")
}
}
diff --git a/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go b/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go
index 150b86f..37e0cb8 100644
--- a/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go
@@ -106,11 +106,7 @@ func (m S7ParserHelper) Parse(typeName string, arguments []string, io utils.Read
case "S7VarRequestParameterItem":
return model.S7VarRequestParameterItemParse(io)
case "S7VarPayloadDataItem":
- lastItem, err := utils.StrToBool(arguments[0])
- if err != nil {
- return nil, errors.Wrap(err, "Error parsing")
- }
- return model.S7VarPayloadDataItemParse(io, lastItem)
+ return model.S7VarPayloadDataItemParse(io)
case "AlarmMessageQueryType":
return model.AlarmMessageQueryTypeParse(io)
case "AlarmMessageAckResponseType":
diff --git a/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go
index 6466ba1..8effdcf 100644
--- a/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go
@@ -124,8 +124,7 @@ func (m S7XmlParserHelper) Parse(typeName string, xmlString string, parserArgume
case "S7VarRequestParameterItem":
return model.S7VarRequestParameterItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "S7VarPayloadDataItem":
- lastItem := parserArguments[0] == "true"
- return model.S7VarPayloadDataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), lastItem)
+ return model.S7VarPayloadDataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AlarmMessageQueryType":
return model.AlarmMessageQueryTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AlarmMessageAckResponseType":
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
index f7495c0..2c52fcc 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
@@ -126,7 +126,7 @@ func COTPParameterParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter
case parameterType == 0xC3: // COTPParameterChecksum
_parent, typeSwitchError = COTPParameterChecksumParse(readBuffer)
case parameterType == 0xE0: // COTPParameterDisconnectAdditionalInformation
- _parent, typeSwitchError = COTPParameterDisconnectAdditionalInformationParse(readBuffer, rest)
+ _parent, typeSwitchError = COTPParameterDisconnectAdditionalInformationParse(readBuffer)
default:
// TODO: return actual type
typeSwitchError = errors.New("Unmapped type")
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
index 9bcfee2..b67f823 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
@@ -100,7 +100,7 @@ func (m *COTPParameterDisconnectAdditionalInformation) LengthInBytes() uint16 {
return m.LengthInBits() / 8
}
-func COTPParameterDisconnectAdditionalInformationParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) {
+func COTPParameterDisconnectAdditionalInformationParse(readBuffer utils.ReadBuffer) (*COTPParameter, error) {
if pullErr := readBuffer.PullContext("COTPParameterDisconnectAdditionalInformation"); pullErr != nil {
return nil, pullErr
}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go
index 2940e0e..47f71e4 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go
@@ -50,7 +50,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((8)); i++ {
+ for i := 0; i < int(bool(8)); i++ {
_item, _itemErr := readBuffer.ReadBit("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
@@ -63,7 +63,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((16)); i++ {
+ for i := 0; i < int(bool(16)); i++ {
_item, _itemErr := readBuffer.ReadBit("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
@@ -76,7 +76,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((32)); i++ {
+ for i := 0; i < int(bool(32)); i++ {
_item, _itemErr := readBuffer.ReadBit("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
@@ -89,7 +89,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
// Array Field (value)
var value []api.PlcValue
- for i := 0; i < int((64)); i++ {
+ for i := 0; i < int(bool(64)); i++ {
_item, _itemErr := readBuffer.ReadBit("value")
if _itemErr != nil {
return nil, errors.Wrap(_itemErr, "Error parsing 'value' field")
@@ -191,7 +191,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
case dataProtocolId == "IEC61131_CHAR": // CHAR
// Manual Field (value)
- value, _valueErr := StaticHelperParseS7Char(readBuffer, "TF-")
+ value, _valueErr := StaticHelperParseS7Char(readBuffer, "UTF-8")
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -200,7 +200,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
case dataProtocolId == "IEC61131_WCHAR": // CHAR
// Manual Field (value)
- value, _valueErr := StaticHelperParseS7Char(readBuffer, "TF-")
+ value, _valueErr := StaticHelperParseS7Char(readBuffer, "UTF-16")
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -209,7 +209,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
case dataProtocolId == "IEC61131_STRING": // STRING
// Manual Field (value)
- value, _valueErr := StaticHelperParseS7String(readBuffer, stringLength, "TF-")
+ value, _valueErr := StaticHelperParseS7String(readBuffer, stringLength, "UTF-8")
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -218,7 +218,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen
case dataProtocolId == "IEC61131_WSTRING": // STRING
// Manual Field (value)
- value, _valueErr := StaticHelperParseS7String(readBuffer, stringLength, "TF-")
+ value, _valueErr := StaticHelperParseS7String(readBuffer, stringLength, "UTF-16")
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -334,7 +334,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataPr
case dataProtocolId == "IEC61131_BYTE": // List
// Array Field (value)
- for i := uint32(0); i < uint32((8)); i++ {
+ for i := uint32(0); i < uint32(bool(8)); i++ {
_itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
@@ -343,7 +343,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataPr
case dataProtocolId == "IEC61131_WORD": // List
// Array Field (value)
- for i := uint32(0); i < uint32((16)); i++ {
+ for i := uint32(0); i < uint32(bool(16)); i++ {
_itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
@@ -352,7 +352,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataPr
case dataProtocolId == "IEC61131_DWORD": // List
// Array Field (value)
- for i := uint32(0); i < uint32((32)); i++ {
+ for i := uint32(0); i < uint32(bool(32)); i++ {
_itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
@@ -361,7 +361,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataPr
case dataProtocolId == "IEC61131_LWORD": // List
// Array Field (value)
- for i := uint32(0); i < uint32((64)); i++ {
+ for i := uint32(0); i < uint32(bool(64)); i++ {
_itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool())
if _itemErr != nil {
return errors.Wrap(_itemErr, "Error serializing 'value' field")
@@ -430,28 +430,28 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataPr
case dataProtocolId == "IEC61131_CHAR": // CHAR
// Manual Field (value)
- _valueErr := StaticHelperSerializeS7Char(writeBuffer, value, "TF-")
+ _valueErr := StaticHelperSerializeS7Char(writeBuffer, value, "UTF-8")
if _valueErr != nil {
return errors.Wrap(_valueErr, "Error serializing 'value' field")
}
case dataProtocolId == "IEC61131_WCHAR": // CHAR
// Manual Field (value)
- _valueErr := StaticHelperSerializeS7Char(writeBuffer, value, "TF-")
+ _valueErr := StaticHelperSerializeS7Char(writeBuffer, value, "UTF-16")
if _valueErr != nil {
return errors.Wrap(_valueErr, "Error serializing 'value' field")
}
case dataProtocolId == "IEC61131_STRING": // STRING
// Manual Field (value)
- _valueErr := StaticHelperSerializeS7String(writeBuffer, value, stringLength, "TF-")
+ _valueErr := StaticHelperSerializeS7String(writeBuffer, value, stringLength, "UTF-8")
if _valueErr != nil {
return errors.Wrap(_valueErr, "Error serializing 'value' field")
}
case dataProtocolId == "IEC61131_WSTRING": // STRING
// Manual Field (value)
- _valueErr := StaticHelperSerializeS7String(writeBuffer, value, stringLength, "TF-")
+ _valueErr := StaticHelperSerializeS7String(writeBuffer, value, stringLength, "UTF-16")
if _valueErr != nil {
return errors.Wrap(_valueErr, "Error serializing 'value' field")
}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
index 658cf0b..7bd77c6 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
@@ -119,8 +119,7 @@ func S7PayloadReadVarResponseParse(readBuffer utils.ReadBuffer, parameter *S7Par
// Count array
items := make([]*S7VarPayloadDataItem, CastS7ParameterReadVarResponse(parameter).NumItems)
for curItem := uint16(0); curItem < uint16(CastS7ParameterReadVarResponse(parameter).NumItems); curItem++ {
- lastItem := curItem == uint16(CastS7ParameterReadVarResponse(parameter).NumItems-1)
- _item, _err := S7VarPayloadDataItemParse(readBuffer, lastItem)
+ _item, _err := S7VarPayloadDataItemParse(readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'items' field")
}
@@ -154,15 +153,11 @@ func (m *S7PayloadReadVarResponse) Serialize(writeBuffer utils.WriteBuffer) erro
if pushErr := writeBuffer.PushContext("items", utils.WithRenderAsList(true)); pushErr != nil {
return pushErr
}
- itemCount := uint16(len(m.Items))
- var curItem uint16 = 0
for _, _element := range m.Items {
- var lastItem bool = curItem == (itemCount - 1)
- _elementErr := _element.Serialize(writeBuffer, lastItem)
+ _elementErr := _element.Serialize(writeBuffer)
if _elementErr != nil {
return errors.Wrap(_elementErr, "Error serializing 'items' field")
}
- curItem++
}
if popErr := writeBuffer.PopContext("items", utils.WithRenderAsList(true)); popErr != nil {
return popErr
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
index 7321c5d..823b7ae 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
@@ -112,7 +112,7 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) LengthInBitsConditiona
lengthInBits += 8
// Simple field (magicKey)
- lengthInBits += uint16((64))
+ lengthInBits += 64
// Optional Field (Alarmtype)
if m.Alarmtype != nil {
@@ -157,7 +157,7 @@ func S7PayloadUserDataItemCpuFunctionMsgSubscriptionParse(readBuffer utils.ReadB
}
// Simple Field (magicKey)
- magicKey, _magicKeyErr := readBuffer.ReadString("magicKey", uint32((64)))
+ magicKey, _magicKeyErr := readBuffer.ReadString("magicKey", uint32(64))
if _magicKeyErr != nil {
return nil, errors.Wrap(_magicKeyErr, "Error parsing 'magicKey' field")
}
@@ -221,7 +221,7 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) Serialize(writeBuffer
// Simple Field (magicKey)
magicKey := string(m.MagicKey)
- _magicKeyErr := writeBuffer.WriteString("magicKey", uint8((64)), "TF-", (magicKey))
+ _magicKeyErr := writeBuffer.WriteString("magicKey", uint8(64), "UTF-8", (magicKey))
if _magicKeyErr != nil {
return errors.Wrap(_magicKeyErr, "Error serializing 'magicKey' field")
}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
index a17600f..35afb10 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
@@ -119,8 +119,7 @@ func S7PayloadWriteVarRequestParse(readBuffer utils.ReadBuffer, parameter *S7Par
// Count array
items := make([]*S7VarPayloadDataItem, uint16(len(CastS7ParameterWriteVarRequest(parameter).Items)))
for curItem := uint16(0); curItem < uint16(uint16(len(CastS7ParameterWriteVarRequest(parameter).Items))); curItem++ {
- lastItem := curItem == uint16((len(CastS7ParameterWriteVarRequest(parameter).Items))-1)
- _item, _err := S7VarPayloadDataItemParse(readBuffer, lastItem)
+ _item, _err := S7VarPayloadDataItemParse(readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'items' field")
}
@@ -154,15 +153,11 @@ func (m *S7PayloadWriteVarRequest) Serialize(writeBuffer utils.WriteBuffer) erro
if pushErr := writeBuffer.PushContext("items", utils.WithRenderAsList(true)); pushErr != nil {
return pushErr
}
- itemCount := uint16(len(m.Items))
- var curItem uint16 = 0
for _, _element := range m.Items {
- var lastItem bool = curItem == (itemCount - 1)
- _elementErr := _element.Serialize(writeBuffer, lastItem)
+ _elementErr := _element.Serialize(writeBuffer)
if _elementErr != nil {
return errors.Wrap(_elementErr, "Error serializing 'items' field")
}
- curItem++
}
if popErr := writeBuffer.PopContext("items", utils.WithRenderAsList(true)); popErr != nil {
return popErr
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go
index 7bf9956..62c1185 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go
@@ -84,7 +84,7 @@ func (m *S7VarPayloadDataItem) LengthInBitsConditional(lastItem bool) uint16 {
}
// Padding Field (padding)
- _timesPadding := uint8(utils.InlineIf(lastItem, func() interface{} { return uint8(uint8(0)) }, func() interface{} { return uint8(uint8(uint8(len(m.Data))) % uint8(uint8(2))) }).(uint8))
+ _timesPadding := uint8(uint8(uint8(len(m.Data))) % uint8(uint8(2)))
for ; _timesPadding > 0; _timesPadding-- {
lengthInBits += 8
}
@@ -96,7 +96,7 @@ func (m *S7VarPayloadDataItem) LengthInBytes() uint16 {
return m.LengthInBits() / 8
}
-func S7VarPayloadDataItemParse(readBuffer utils.ReadBuffer, lastItem bool) (*S7VarPayloadDataItem, error) {
+func S7VarPayloadDataItemParse(readBuffer utils.ReadBuffer) (*S7VarPayloadDataItem, error) {
if pullErr := readBuffer.PullContext("S7VarPayloadDataItem"); pullErr != nil {
return nil, pullErr
}
@@ -143,7 +143,7 @@ func S7VarPayloadDataItemParse(readBuffer utils.ReadBuffer, lastItem bool) (*S7V
if pullErr := readBuffer.PullContext("padding", utils.WithRenderAsList(true)); pullErr != nil {
return nil, pullErr
}
- _timesPadding := (utils.InlineIf(lastItem, func() interface{} { return uint8(uint8(0)) }, func() interface{} { return uint8(uint8(uint8(len(data))) % uint8(uint8(2))) }).(uint8))
+ _timesPadding := (uint8(uint8(len(data))) % uint8(uint8(2)))
for ; (readBuffer.HasMore(8)) && (_timesPadding > 0); _timesPadding-- {
// Just read the padding data and ignore it
_, _err := readBuffer.ReadUint8("", 8)
@@ -164,7 +164,7 @@ func S7VarPayloadDataItemParse(readBuffer utils.ReadBuffer, lastItem bool) (*S7V
return NewS7VarPayloadDataItem(returnCode, transportSize, data), nil
}
-func (m *S7VarPayloadDataItem) Serialize(writeBuffer utils.WriteBuffer, lastItem bool) error {
+func (m *S7VarPayloadDataItem) Serialize(writeBuffer utils.WriteBuffer) error {
if pushErr := writeBuffer.PushContext("S7VarPayloadDataItem"); pushErr != nil {
return pushErr
}
@@ -216,7 +216,7 @@ func (m *S7VarPayloadDataItem) Serialize(writeBuffer utils.WriteBuffer, lastItem
if pushErr := writeBuffer.PushContext("padding", utils.WithRenderAsList(true)); pushErr != nil {
return pushErr
}
- _timesPadding := uint8(utils.InlineIf(lastItem, func() interface{} { return uint8(uint8(0)) }, func() interface{} { return uint8(uint8(uint8(len(m.Data))) % uint8(uint8(2))) }).(uint8))
+ _timesPadding := uint8(uint8(uint8(len(m.Data))) % uint8(uint8(2)))
for ; _timesPadding > 0; _timesPadding-- {
_paddingValue := uint8(uint8(0))
_paddingErr := writeBuffer.WriteUint8("", 8, (_paddingValue))
@@ -234,3 +234,12 @@ func (m *S7VarPayloadDataItem) Serialize(writeBuffer utils.WriteBuffer, lastItem
}
return nil
}
+
+func (m *S7VarPayloadDataItem) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go b/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go
index 4772e87..2341b70 100644
--- a/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go
+++ b/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go
@@ -408,7 +408,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataType string, numberOfValues
case dataType == "STRING": // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((255)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(255))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -417,7 +417,7 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataType string, numberOfValues
case dataType == "WSTRING": // STRING
// Simple Field (value)
- value, _valueErr := readBuffer.ReadString("value", uint32((255)))
+ value, _valueErr := readBuffer.ReadString("value", uint32(255))
if _valueErr != nil {
return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
}
@@ -689,13 +689,13 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy
case dataType == "STRING": // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((255)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(255), "UTF-8", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
case dataType == "WSTRING": // STRING
// Simple Field (value)
- if _err := writeBuffer.WriteString("value", uint8((255)), "TF-", value.GetString()); _err != nil {
+ if _err := writeBuffer.WriteString("value", uint8(255), "UTF-8", value.GetString()); _err != nil {
return errors.Wrap(_err, "Error serializing 'value' field")
}
default:
diff --git a/plc4go/internal/plc4go/spi/utils/CastUtils.go b/plc4go/internal/plc4go/spi/utils/CastUtils.go
index 4b4c3f3..c144642 100644
--- a/plc4go/internal/plc4go/spi/utils/CastUtils.go
+++ b/plc4go/internal/plc4go/spi/utils/CastUtils.go
@@ -35,6 +35,19 @@ func Int8ArrayToUint8Array(input []int8) []uint8 {
return output
}
+func ByteArrayToString(data []byte, separator string) string {
+ var sb strings.Builder
+ if data != nil {
+ for i, element := range data {
+ sb.WriteString(strconv.Itoa(int(element)))
+ if i < (len(data) - 1) {
+ sb.WriteString(separator)
+ }
+ }
+ }
+ return sb.String()
+}
+
func Int8ArrayToString(data []int8, separator string) string {
var sb strings.Builder
if data != nil {