You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/02/24 16:18:13 UTC
[plc4x] branch feature/cleaned-up-type-references updated: feat(plc4go): fixes on golang
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch feature/cleaned-up-type-references
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/cleaned-up-type-references by this push:
new c216cbe feat(plc4go): fixes on golang
c216cbe is described below
commit c216cbe3da782226476083b7e2c158130a6555b3
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 24 17:13:52 2022 +0100
feat(plc4go): fixes on golang
---
.../language/go/GoLanguageTemplateHelper.java | 32 +-
.../resources/templates/go/enum-template.go.ftlh | 18 +-
.../resources/templates/go/model-template.go.ftlh | 10 +-
plc4go/go.mod | 2 -
plc4go/go.sum | 41 -
.../internal/plc4go/ads/readwrite/ParserHelper.go | 26 +-
.../plc4go/ads/readwrite/XmlParserHelper.go | 25 +-
.../plc4go/ads/readwrite/model/AmsPacket.go | 2 +-
.../bacnetip/readwrite/model/ApplicationTag.go | 200 -----
.../readwrite/model/BACnetActionCommand.go | 8 +-
...edServiceRequestAtomicReadFileStreamOrRecord.go | 4 +-
...firmedServiceRequestConfirmedCOVNotification.go | 10 +-
...rmedServiceRequestConfirmedEventNotification.go | 16 +-
.../BACnetConfirmedServiceRequestReadProperty.go | 4 +-
...netConfirmedServiceRequestReinitializeDevice.go | 2 +-
.../BACnetConfirmedServiceRequestSubscribeCOV.go | 8 +-
.../BACnetConfirmedServiceRequestWriteProperty.go | 6 +-
.../readwrite/model/BACnetConstructedData.go | 4 +-
.../model/BACnetConstructedDataCommand.go | 4 +-
.../model/BACnetConstructedDataEventTimestamps.go | 4 +-
.../bacnetip/readwrite/model/BACnetDateTime.go | 4 +-
.../model/BACnetDeviceObjectPropertyReference.go | 8 +-
.../model/BACnetNotificationParameters.go | 4 +-
.../BACnetNotificationParametersBufferReady.go | 8 +-
...ACnetNotificationParametersChangeOfBitString.go | 6 +-
.../BACnetNotificationParametersChangeOfState.go | 4 +-
.../BACnetNotificationParametersChangeOfValue.go | 4 +-
...tNotificationParametersChangeOfValueNewValue.go | 4 +-
...onParametersChangeOfValueNewValueChangedBits.go | 2 +-
...nParametersChangeOfValueNewValueChangedValue.go | 2 +-
...BACnetNotificationParametersComplexEventType.go | 2 +-
.../model/BACnetNotificationParametersExtended.go | 8 +-
...CnetNotificationParametersExtendedParameters.go | 4 +-
.../BACnetNotificationParametersFloatingLimit.go | 10 +-
.../BACnetNotificationParametersOutOfRange.go | 10 +-
.../BACnetNotificationParametersUnsignedRange.go | 8 +-
.../readwrite/model/BACnetPropertyReference.go | 2 +-
.../readwrite/model/BACnetPropertyStates.go | 4 +-
.../readwrite/model/BACnetPropertyValue.go | 2 +-
.../readwrite/model/BACnetPropertyValues.go | 4 +-
.../model/BACnetReadAccessSpecification.go | 6 +-
...BACnetServiceAckAtomicReadFileStreamOrRecord.go | 4 +-
.../model/BACnetServiceAckAtomicWriteFile.go | 2 +-
.../model/BACnetServiceAckReadProperty.go | 4 +-
.../bacnetip/readwrite/model/BACnetStatusFlags.go | 2 +-
.../bacnetip/readwrite/model/BACnetTimeStamp.go | 4 +-
.../readwrite/model/BACnetTimeStampSequence.go | 2 +-
.../readwrite/model/BACnetTimeStampTime.go | 2 +-
...rmedServiceRequestUnconfirmedCOVNotification.go | 10 +-
...rmedServiceRequestUnconfirmedPrivateTransfer.go | 4 +-
.../readwrite/model/DF1UnprotectedReadResponse.go | 5 +-
.../model/SysexCommandReportFirmwareResponse.go | 5 +-
.../plc4go/knxnetip/readwrite/ParserHelper.go | 10 +
.../knxnetip/readwrite/PropertyDataTypeIO.go | 157 ----
.../plc4go/knxnetip/readwrite/XmlParserHelper.go | 11 +
.../readwrite/model/KnxInterfaceObjectProperty.go | 883 ---------------------
.../knxnetip/readwrite/model/KnxManufacturer.go | 26 +-
.../plc4go/modbus/readwrite/ParserHelper.go | 7 +
.../plc4go/modbus/readwrite/XmlParserHelper.go | 8 +
.../internal/plc4go/s7/readwrite/ParserHelper.go | 68 +-
.../plc4go/s7/readwrite/XmlParserHelper.go | 73 +-
.../plc4go/s7/readwrite/model/TransportSize.go | 123 ---
.../plc4go/simulated/readwrite/ParserHelper.go | 10 +
.../plc4go/simulated/readwrite/XmlParserHelper.go | 9 +
plc4go/internal/plc4go/spi/utils/CastUtils.go | 12 +
.../s7/src/main/resources/protocols/s7/s7.mspec | 6 +-
66 files changed, 345 insertions(+), 1634 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 1c7e2dc..7ee6e34 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
@@ -74,7 +74,7 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
PropertyField propertyField = (PropertyField) field;
if (propertyField.getType() instanceof ComplexTypeReference) {
ComplexTypeReference complexTypeReference = (ComplexTypeReference) propertyField.getType();
- final TypeDefinition typeDefinition = getTypeDefinitions().get(complexTypeReference.getName());
+ final TypeDefinition typeDefinition = complexTypeReference.getTypeDefinition();
if (typeDefinition instanceof DataIoTypeDefinition) {
return "PlcValue";
}
@@ -170,8 +170,8 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
// TODO: shouldn't this be an error case
return "";
}
- if (!(typeReference instanceof SimpleTypeReference)) {
- return ((ComplexTypeReference) typeReference).getName();
+ if (typeReference.isNonSimpleTypeReference()) {
+ return ((NonSimpleTypeReference) typeReference).getName();
}
SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
switch (simpleTypeReference.getBaseType()) {
@@ -763,12 +763,12 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
// If the variable has a child element and we're able to find a type for this ... get the type.
else if ((variableLiteral.getChild().isPresent()) && ((ComplexTypeDefinition) thisType).getTypeReferenceForProperty(variableLiteralName).isPresent()) {
tracer = tracer.dive("child element");
- final Optional<ComplexTypeReference> typeReferenceForProperty = ((ComplexTypeDefinition) thisType).getTypeReferenceForProperty(variableLiteralName)
- .flatMap(TypeReferenceConversions::asComplexTypeReference);
+ final Optional<NonSimpleTypeReference> typeReferenceForProperty = ((ComplexTypeDefinition) thisType).getTypeReferenceForProperty(variableLiteralName)
+ .flatMap(TypeReferenceConversions::asNonSimpleTypeReference);
if (typeReferenceForProperty.isPresent()) {
tracer = tracer.dive("complex");
- final TypeReference complexTypeReference = typeReferenceForProperty.get();
- TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(complexTypeReference);
+ final TypeReference nonSimpleTypeReference = typeReferenceForProperty.get();
+ TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(nonSimpleTypeReference);
if (typeDefinition instanceof ComplexTypeDefinition) {
tracer = tracer.dive("complex");
ComplexTypeDefinition complexTypeDefinition = (ComplexTypeDefinition) typeDefinition;
@@ -779,7 +779,7 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
.filter(curField -> (curField instanceof DiscriminatorField) && ((DiscriminatorField) curField).getName().equals(childProperty))
.findFirst();
if (matchingDiscriminatorField.isPresent()) {
- return tracer + "Cast" + getLanguageTypeNameForTypeReference(complexTypeReference) + "(" + variableLiteralName + ").Child." + capitalize(childProperty) + "()";
+ return tracer + "Cast" + getLanguageTypeNameForTypeReference(nonSimpleTypeReference) + "(" + variableLiteralName + ").Child." + capitalize(childProperty) + "()";
}
// TODO: is this really meant to fall through?
tracer = tracer.dive("we fell through the complex complex");
@@ -1116,9 +1116,9 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
public String escapeEnumValue(TypeReference typeReference, String valueString) {
// Currently the only case in which here complex type references are used are when referencing enum constants.
- if (typeReference instanceof ComplexTypeReference) {
+ if (typeReference != null && typeReference.isNonSimpleTypeReference()) {
// C doesn't like NULL values for enums, so we have to return something else (we'll treat -1 as NULL)
- if ("null".equals(valueString)) {
+ if ("null".equals(valueString) || valueString == null) {
return "0";
}
if (valueString.contains(".")) {
@@ -1257,8 +1257,8 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
}
}
List<Term> params = field.asTypedField()
- .map(typedField -> typedField.getType().asComplexTypeReference()
- .map(ComplexTypeReference::getParams)
+ .map(typedField -> typedField.getType().asNonSimpleTypeReference()
+ .map(NonSimpleTypeReference::getParams)
.map(terms -> terms.orElse(Collections.emptyList()))
.orElse(Collections.emptyList())
)
@@ -1281,8 +1281,8 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
}
}
return field.asTypedField()
- .map(typedField -> typedField.getType().asComplexTypeReference()
- .map(complexTypeReference -> complexTypeReference.getParams()
+ .map(typedField -> typedField.getType().asNonSimpleTypeReference()
+ .map(nonSimpleTypeReference -> nonSimpleTypeReference.getParams()
.map(params -> params.stream()
.anyMatch(param -> param.contains(variableName))
)
@@ -1351,8 +1351,8 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
}
}
return curField.asTypedField()
- .map(typedField -> typedField.getType().asComplexTypeReference()
- .map(complexTypeReference -> complexTypeReference.getParams()
+ .map(typedField -> typedField.getType().asNonSimpleTypeReference()
+ .map(nonSimpleTypeReference -> nonSimpleTypeReference.getParams()
.map(params -> params.stream()
.anyMatch(param -> param.contains(variable))
)
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 7240639..af345c3 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
@@ -91,29 +91,31 @@ returning the constant for a given enum value.
-->
<#if type.constantNames?has_content>
<#list type.constantNames as constantName>
+ <#assign constantType=type.getConstantType(constantName)>
-func (e ${type.name}) ${constantName?cap_first}() ${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName))} {
+func (e ${type.name}) ${constantName?cap_first}() ${helper.getLanguageTypeNameForTypeReference(constantType)} {
switch e {
<#list helper.getUniqueEnumValues(type.enumValues) as enumValue>
+ <#assign constantValue=enumValue.getConstant(constantName).orElseThrow()>
case ${helper.escapeValue(type.type.orElseThrow(), enumValue.value)}: { /* '${enumValue.value}' */
- <#if type.getConstantType(constantName).isNonSimpleTypeReference()>
- <#if helper.isEnumTypeReference(type.getConstantType(constantName))>
- return <#if helper.escapeEnumValue(type.getConstantType(constantName), enumValue.getConstant(constantName).orElseThrow()) = "0">${helper.escapeEnumValue(type.getConstantType(constantName), enumValue.getConstant(constantName).orElseThrow())}<#else>${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName))}_${helper.escapeEnumValue(type.getConstantType(constantName), enumValue.getConstant(constantName).orElseThrow())}</#if>
+ <#if constantType.isNonSimpleTypeReference()>
+ <#if constantType.isEnumTypeReference()>
+ return <#if helper.escapeEnumValue(constantType, constantValue) = "0">${helper.escapeEnumValue(constantType, constantValue)}<#else>${helper.getLanguageTypeNameForTypeReference(constantType)}_${helper.escapeEnumValue(constantType, constantValue)}</#if>
<#else>
- return ${helper.escapeEnumValue(type.getConstantType(constantName), enumValue.getConstant(constantName).orElseThrow())}
+ return ${helper.escapeEnumValue(constantType, constantValue)}
</#if>
<#else>
- return ${helper.escapeEnumValue(type.getConstantType(constantName), enumValue.getConstant(constantName).orElseThrow())}
+ return ${helper.escapeEnumValue(constantType, constantValue)}
</#if>
}
</#list>
default: {
- return ${helper.getNullValueForTypeReference(type.getConstantType(constantName))}
+ return ${helper.getNullValueForTypeReference(constantType)}
}
}
}
-func ${type.name}FirstEnumForField${constantName?cap_first}(value ${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName))}) (${type.name}, error) {
+func ${type.name}FirstEnumForField${constantName?cap_first}(value ${helper.getLanguageTypeNameForTypeReference(constantType)}) (${type.name}, error) {
for _, sizeValue := range ${type.name}Values {
if sizeValue.${constantName?cap_first}() == value {
return sizeValue, 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 698200b..e5c1757 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
@@ -835,10 +835,10 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#assign complexTypeReference=arrayElementType.asComplexTypeReference().orElseThrow()>
<#assign typeName=complexTypeReference.name>
<#assign typeDefinition=helper.getTypeDefinitionForTypeReference(complexTypeReference)>
- <#if typeDefinition.isDiscriminatedChildTypeDefinition()>
+ <#if typeDefinition.isComplexTypeDefinition() && typeDefinition.asComplexTypeDefinition().orElseThrow().isDiscriminatedChildTypeDefinition()>
<#-- Usually you don't use child directly unless they are parameterized #-->
- <#assign typeName=typeDefinition.parentType.orElseThrow().name>
- <#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
+ <#assign typeName=typeDefinition.asComplexTypeDefinition().orElseThrow().parentType.orElseThrow().name>
+ <#assign typeDefinition=typeDefinition.asComplexTypeDefinition().orElseThrow().parentType.orElseThrow()>
</#if>
<#assign hasRefParams=complexTypeReference.params.isPresent()>
<#assign refParams>
@@ -1014,7 +1014,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
_values := &_${manualArrayField.name}List
_ = _values
for ;!((bool) (${helper.toParseExpression(manualArrayField, helper.boolTypeReference, manualArrayField.loopExpression, parserArguments, true)})); {
- _${manualArrayField.name}List = append(_${manualArrayField.name}List, ((<#if helper.needsPointerAccess(manualArrayField)>*</#if>${helper.getLanguageTypeNameForField(field)}) (${helper.toParseExpression(manualArrayField, arrayElementType, manualArrayField.parseExpression, parserArguments)})))
+ _${manualArrayField.name}List = append(_${manualArrayField.name}List, ((${helper.getLanguageTypeNameForTypeReference(arrayElementType)}) (${helper.toParseExpression(manualArrayField, arrayElementType, manualArrayField.parseExpression, parserArguments)})))
<#-- After parsing, update the current position, but only if it's needed -->
<#if manualArrayField.loopExpression.contains("curPos")>
@@ -1028,7 +1028,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
type we have to iterate over it's elements and explicitly cast them.
Otherwise a simple toArray call is fine.
-->
- <#if field.type.isSimpleTypeReference()>
+ <#if manualArrayField.type.isSimpleTypeReference()>
${manualArrayField.name} := make(${helper.getLanguageTypeNameForField(field)}, len(_${manualArrayField.name}List))
for i := 0; i < len(_${manualArrayField.name}List); i++ {
${manualArrayField.name}[i] = ${helper.getLanguageTypeNameForField(field)}(_${manualArrayField.name}List[i])
diff --git a/plc4go/go.mod b/plc4go/go.mod
index c0f8fac..e7bdc7f 100644
--- a/plc4go/go.mod
+++ b/plc4go/go.mod
@@ -32,11 +32,9 @@ require (
github.com/snksoft/crc v1.1.0
github.com/stretchr/testify v1.5.1
github.com/subchen/go-xmldom v1.1.2
- github.com/tebeka/go2xunit v1.4.10 // indirect
github.com/viney-shih/go-lock v1.1.1
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211102192858-4dd72447c267 // indirect
golang.org/x/tools v0.1.9 // indirect
- gotest.tools/gotestsum v1.7.0 // indirect
)
diff --git a/plc4go/go.sum b/plc4go/go.sum
index 39a7b6e..a710676 100644
--- a/plc4go/go.sum
+++ b/plc4go/go.sum
@@ -5,32 +5,16 @@ github.com/antchfx/xpath v0.0.0-20170515025933-1f3266e77307/go.mod h1:Yee4kTMuNi
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
-github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/elastic/go-licenser v0.4.0 h1:jLq6A5SilDS/Iz1ABRkO6BHy91B9jBora8FwGRsDqUI=
github.com/elastic/go-licenser v0.4.0/go.mod h1:V56wHMpmdURfibNBggaSBfqgPxyT1Tldns1i87iTEvU=
-github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
-github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/icza/bitio v1.0.0 h1:squ/m1SHyFeCA6+6Gyol1AxV9nmPPlJFT8c2vKdj3U8=
github.com/icza/bitio v1.0.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
github.com/jacobsa/go-serial v0.0.0-20180131005756-15cf729a72d4 h1:G2ztCwXov8mRvP0ZfjE6nAlaCX2XbykaeHdbT6KwDz0=
github.com/jacobsa/go-serial v0.0.0-20180131005756-15cf729a72d4/go.mod h1:2RvX5ZjVtsznNZPEt4xwJXNJrM3VTZoQf7V6gk0ysvs=
-github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
-github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -41,81 +25,56 @@ github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs=
github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
github.com/snksoft/crc v1.1.0 h1:HkLdI4taFlgGGG1KvsWMpz78PkOC9TkPVpTV/cuWn48=
github.com/snksoft/crc v1.1.0/go.mod h1:5/gUOsgAm7OmIhb6WJzw7w5g2zfJi4FrHYgGPdshE+A=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/subchen/go-xmldom v1.1.2 h1:7evI2YqfYYOnuj+PBwyaOZZYjl3iWq35P6KfBUw9jeU=
github.com/subchen/go-xmldom v1.1.2/go.mod h1:6Pg/HuX5/T4Jlj0IPJF1sRxKVoI/rrKP6LIMge9d5/8=
-github.com/tebeka/go2xunit v1.4.10 h1:0UO+9YoLpXTZ0DL9XbTmIIibgmKBGiwroo8uhFMSyR0=
-github.com/tebeka/go2xunit v1.4.10/go.mod h1:wmc9jKT7KlU4QLU6DNTaIXNnYNOjKKNlp6mjOS0UrqY=
github.com/viney-shih/go-lock v1.1.1 h1:SwzDPPAiHpcwGCr5k8xD15d2gQSo8d4roRYd7TDV2eI=
github.com/viney-shih/go-lock v1.1.1/go.mod h1:Yijm78Ljteb3kRiJrbLAxVntkUukGu5uzSxq/xV7OO8=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211102192858-4dd72447c267 h1:7zYaz3tjChtpayGDzu6H0hDAUM5zIGA2XW7kRNgQ0jc=
golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gotest.tools/gotestsum v1.7.0 h1:RwpqwwFKBAa2h+F6pMEGpE707Edld0etUD3GhqqhDNc=
-gotest.tools/gotestsum v1.7.0/go.mod h1:V1m4Jw3eBerhI/A6qCxUE07RnCg7ACkKj9BYcAm09V8=
-gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
diff --git a/plc4go/internal/plc4go/ads/readwrite/ParserHelper.go b/plc4go/internal/plc4go/ads/readwrite/ParserHelper.go
index c11a5e1..1544c3c 100644
--- a/plc4go/internal/plc4go/ads/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/ads/readwrite/ParserHelper.go
@@ -32,20 +32,24 @@ type AdsParserHelper struct {
func (m AdsParserHelper) Parse(typeName string, arguments []string, io utils.ReadBuffer) (interface{}, error) {
switch typeName {
+ case "AmsSerialFrame":
+ return model.AmsSerialFrameParse(io)
+ case "DataItem":
+ dataFormatName, err := utils.StrToString(arguments[0])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ stringLength, err := utils.StrToInt32(arguments[1])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ return model.DataItemParse(io, dataFormatName, stringLength)
case "AdsMultiRequestItem":
indexGroup, err := utils.StrToUint32(arguments[0])
if err != nil {
return nil, errors.Wrap(err, "Error parsing")
}
return model.AdsMultiRequestItemParse(io, indexGroup)
- case "AmsTCPPacket":
- return model.AmsTCPPacketParse(io)
- case "State":
- return model.StateParse(io)
- case "AmsPacket":
- return model.AmsPacketParse(io)
- case "AmsSerialFrame":
- return model.AmsSerialFrameParse(io)
case "AmsSerialAcknowledgeFrame":
return model.AmsSerialAcknowledgeFrameParse(io)
case "AdsData":
@@ -63,6 +67,12 @@ func (m AdsParserHelper) Parse(typeName string, arguments []string, io utils.Rea
return model.AmsSerialResetFrameParse(io)
case "AdsNotificationSample":
return model.AdsNotificationSampleParse(io)
+ case "AmsTCPPacket":
+ return model.AmsTCPPacketParse(io)
+ case "State":
+ return model.StateParse(io)
+ case "AmsPacket":
+ return model.AmsPacketParse(io)
}
return nil, errors.Errorf("Unsupported type %s", typeName)
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/ads/readwrite/XmlParserHelper.go
index 616c149..94098cc 100644
--- a/plc4go/internal/plc4go/ads/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/ads/readwrite/XmlParserHelper.go
@@ -42,6 +42,17 @@ func init() {
func (m AdsXmlParserHelper) Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error) {
switch typeName {
+ case "AmsSerialFrame":
+ return model.AmsSerialFrameParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "DataItem":
+ // TODO: find a way to parse the sub types
+ var dataFormatName string
+ parsedInt1, err := strconv.ParseInt(parserArguments[1], 10, 32)
+ if err != nil {
+ return nil, err
+ }
+ stringLength := int32(parsedInt1)
+ return model.DataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), dataFormatName, stringLength)
case "AdsMultiRequestItem":
parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 32)
if err != nil {
@@ -49,14 +60,6 @@ func (m AdsXmlParserHelper) Parse(typeName string, xmlString string, parserArgum
}
indexGroup := uint32(parsedUint0)
return model.AdsMultiRequestItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), indexGroup)
- case "AmsTCPPacket":
- return model.AmsTCPPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "State":
- return model.StateParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "AmsPacket":
- return model.AmsPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "AmsSerialFrame":
- return model.AmsSerialFrameParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AmsSerialAcknowledgeFrame":
return model.AmsSerialAcknowledgeFrameParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AdsData":
@@ -71,6 +74,12 @@ func (m AdsXmlParserHelper) Parse(typeName string, xmlString string, parserArgum
return model.AmsSerialResetFrameParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AdsNotificationSample":
return model.AdsNotificationSampleParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "AmsTCPPacket":
+ return model.AmsTCPPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "State":
+ return model.StateParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "AmsPacket":
+ return model.AmsPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
}
return nil, errors.Errorf("Unsupported type %s", typeName)
}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go
index e73753e..2240a4f 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go
@@ -272,7 +272,7 @@ func AmsPacketParse(readBuffer utils.ReadBuffer) (*AmsPacket, error) {
if pullErr := readBuffer.PullContext("data"); pullErr != nil {
return nil, pullErr
}
- _data, _dataErr := AdsDataParse(readBuffer, commandId, bool(state.GetResponse()))
+ _data, _dataErr := AdsDataParse(readBuffer, CommandId(commandId), bool(state.GetResponse()))
if _dataErr != nil {
return nil, errors.Wrap(_dataErr, "Error parsing 'data' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/ApplicationTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/ApplicationTag.go
deleted file mode 100644
index 7fc0220..0000000
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/ApplicationTag.go
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package model
-
-import (
- "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
- "github.com/pkg/errors"
-)
-
-// Code generated by code-generation. DO NOT EDIT.
-
-type ApplicationTag int8
-
-type IApplicationTag interface {
- Serialize(writeBuffer utils.WriteBuffer) error
-}
-
-const (
- ApplicationTag_NULL ApplicationTag = 0x0
- ApplicationTag_BOOLEAN ApplicationTag = 0x1
- ApplicationTag_UNSIGNED_INTEGER ApplicationTag = 0x2
- ApplicationTag_SIGNED_INTEGER ApplicationTag = 0x3
- ApplicationTag_REAL ApplicationTag = 0x4
- ApplicationTag_DOUBLE ApplicationTag = 0x5
- ApplicationTag_OCTET_STRING ApplicationTag = 0x6
- ApplicationTag_CHARACTER_STRING ApplicationTag = 0x7
- ApplicationTag_BIT_STRING ApplicationTag = 0x8
- ApplicationTag_ENUMERATED ApplicationTag = 0x9
- ApplicationTag_DATE ApplicationTag = 0xA
- ApplicationTag_TIME ApplicationTag = 0xB
- ApplicationTag_BACNET_OBJECT_IDENTIFIER ApplicationTag = 0xC
-)
-
-var ApplicationTagValues []ApplicationTag
-
-func init() {
- _ = errors.New
- ApplicationTagValues = []ApplicationTag{
- ApplicationTag_NULL,
- ApplicationTag_BOOLEAN,
- ApplicationTag_UNSIGNED_INTEGER,
- ApplicationTag_SIGNED_INTEGER,
- ApplicationTag_REAL,
- ApplicationTag_DOUBLE,
- ApplicationTag_OCTET_STRING,
- ApplicationTag_CHARACTER_STRING,
- ApplicationTag_BIT_STRING,
- ApplicationTag_ENUMERATED,
- ApplicationTag_DATE,
- ApplicationTag_TIME,
- ApplicationTag_BACNET_OBJECT_IDENTIFIER,
- }
-}
-
-func ApplicationTagByValue(value int8) ApplicationTag {
- switch value {
- case 0x0:
- return ApplicationTag_NULL
- case 0x1:
- return ApplicationTag_BOOLEAN
- case 0x2:
- return ApplicationTag_UNSIGNED_INTEGER
- case 0x3:
- return ApplicationTag_SIGNED_INTEGER
- case 0x4:
- return ApplicationTag_REAL
- case 0x5:
- return ApplicationTag_DOUBLE
- case 0x6:
- return ApplicationTag_OCTET_STRING
- case 0x7:
- return ApplicationTag_CHARACTER_STRING
- case 0x8:
- return ApplicationTag_BIT_STRING
- case 0x9:
- return ApplicationTag_ENUMERATED
- case 0xA:
- return ApplicationTag_DATE
- case 0xB:
- return ApplicationTag_TIME
- case 0xC:
- return ApplicationTag_BACNET_OBJECT_IDENTIFIER
- }
- return 0
-}
-
-func ApplicationTagByName(value string) ApplicationTag {
- switch value {
- case "NULL":
- return ApplicationTag_NULL
- case "BOOLEAN":
- return ApplicationTag_BOOLEAN
- case "UNSIGNED_INTEGER":
- return ApplicationTag_UNSIGNED_INTEGER
- case "SIGNED_INTEGER":
- return ApplicationTag_SIGNED_INTEGER
- case "REAL":
- return ApplicationTag_REAL
- case "DOUBLE":
- return ApplicationTag_DOUBLE
- case "OCTET_STRING":
- return ApplicationTag_OCTET_STRING
- case "CHARACTER_STRING":
- return ApplicationTag_CHARACTER_STRING
- case "BIT_STRING":
- return ApplicationTag_BIT_STRING
- case "ENUMERATED":
- return ApplicationTag_ENUMERATED
- case "DATE":
- return ApplicationTag_DATE
- case "TIME":
- return ApplicationTag_TIME
- case "BACNET_OBJECT_IDENTIFIER":
- return ApplicationTag_BACNET_OBJECT_IDENTIFIER
- }
- return 0
-}
-
-func CastApplicationTag(structType interface{}) ApplicationTag {
- castFunc := func(typ interface{}) ApplicationTag {
- if sApplicationTag, ok := typ.(ApplicationTag); ok {
- return sApplicationTag
- }
- return 0
- }
- return castFunc(structType)
-}
-
-func (m ApplicationTag) LengthInBits() uint16 {
- return 4
-}
-
-func (m ApplicationTag) LengthInBytes() uint16 {
- return m.LengthInBits() / 8
-}
-
-func ApplicationTagParse(readBuffer utils.ReadBuffer) (ApplicationTag, error) {
- val, err := readBuffer.ReadInt8("ApplicationTag", 4)
- if err != nil {
- return 0, nil
- }
- return ApplicationTagByValue(val), nil
-}
-
-func (e ApplicationTag) Serialize(writeBuffer utils.WriteBuffer) error {
- return writeBuffer.WriteInt8("ApplicationTag", 4, int8(e), utils.WithAdditionalStringRepresentation(e.name()))
-}
-
-func (e ApplicationTag) name() string {
- switch e {
- case ApplicationTag_NULL:
- return "NULL"
- case ApplicationTag_BOOLEAN:
- return "BOOLEAN"
- case ApplicationTag_UNSIGNED_INTEGER:
- return "UNSIGNED_INTEGER"
- case ApplicationTag_SIGNED_INTEGER:
- return "SIGNED_INTEGER"
- case ApplicationTag_REAL:
- return "REAL"
- case ApplicationTag_DOUBLE:
- return "DOUBLE"
- case ApplicationTag_OCTET_STRING:
- return "OCTET_STRING"
- case ApplicationTag_CHARACTER_STRING:
- return "CHARACTER_STRING"
- case ApplicationTag_BIT_STRING:
- return "BIT_STRING"
- case ApplicationTag_ENUMERATED:
- return "ENUMERATED"
- case ApplicationTag_DATE:
- return "DATE"
- case ApplicationTag_TIME:
- return "TIME"
- case ApplicationTag_BACNET_OBJECT_IDENTIFIER:
- return "BACNET_OBJECT_IDENTIFIER"
- }
- return ""
-}
-
-func (e ApplicationTag) String() string {
- return e.name()
-}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go
index e2794d8..ffe59de 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go
@@ -214,7 +214,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (*BACnetActionCommand
if pullErr := readBuffer.PullContext("objectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _objectIdentifierErr != nil {
return nil, errors.Wrap(_objectIdentifierErr, "Error parsing 'objectIdentifier' field")
}
@@ -227,7 +227,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (*BACnetActionCommand
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
@@ -324,7 +324,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (*BACnetActionCommand
if pullErr := readBuffer.PullContext("quitOnFailure"); pullErr != nil {
return nil, pullErr
}
- _quitOnFailure, _quitOnFailureErr := BACnetContextTagParse(readBuffer, uint8(uint8(7)), BACnetDataType_BOOLEAN)
+ _quitOnFailure, _quitOnFailureErr := BACnetContextTagParse(readBuffer, uint8(uint8(7)), BACnetDataType(BACnetDataType_BOOLEAN))
if _quitOnFailureErr != nil {
return nil, errors.Wrap(_quitOnFailureErr, "Error parsing 'quitOnFailure' field")
}
@@ -337,7 +337,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (*BACnetActionCommand
if pullErr := readBuffer.PullContext("writeSuccessful"); pullErr != nil {
return nil, pullErr
}
- _writeSuccessful, _writeSuccessfulErr := BACnetContextTagParse(readBuffer, uint8(uint8(8)), BACnetDataType_BOOLEAN)
+ _writeSuccessful, _writeSuccessfulErr := BACnetContextTagParse(readBuffer, uint8(uint8(8)), BACnetDataType(BACnetDataType_BOOLEAN))
if _writeSuccessfulErr != nil {
return nil, errors.Wrap(_writeSuccessfulErr, "Error parsing 'writeSuccessful' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
index a689dd8..192ab5d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
@@ -153,7 +153,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer u
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -187,7 +187,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer u
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index 6608199..6c3ca95 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -175,7 +175,7 @@ func BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer utils
if pullErr := readBuffer.PullContext("subscriberProcessIdentifier"); pullErr != nil {
return nil, pullErr
}
- _subscriberProcessIdentifier, _subscriberProcessIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_UNSIGNED_INTEGER)
+ _subscriberProcessIdentifier, _subscriberProcessIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _subscriberProcessIdentifierErr != nil {
return nil, errors.Wrap(_subscriberProcessIdentifierErr, "Error parsing 'subscriberProcessIdentifier' field")
}
@@ -188,7 +188,7 @@ func BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer utils
if pullErr := readBuffer.PullContext("initiatingDeviceIdentifier"); pullErr != nil {
return nil, pullErr
}
- _initiatingDeviceIdentifier, _initiatingDeviceIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _initiatingDeviceIdentifier, _initiatingDeviceIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _initiatingDeviceIdentifierErr != nil {
return nil, errors.Wrap(_initiatingDeviceIdentifierErr, "Error parsing 'initiatingDeviceIdentifier' field")
}
@@ -201,7 +201,7 @@ func BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer utils
if pullErr := readBuffer.PullContext("monitoredObjectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _monitoredObjectIdentifier, _monitoredObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _monitoredObjectIdentifier, _monitoredObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _monitoredObjectIdentifierErr != nil {
return nil, errors.Wrap(_monitoredObjectIdentifierErr, "Error parsing 'monitoredObjectIdentifier' field")
}
@@ -214,7 +214,7 @@ func BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer utils
if pullErr := readBuffer.PullContext("lifetimeInSeconds"); pullErr != nil {
return nil, pullErr
}
- _lifetimeInSeconds, _lifetimeInSecondsErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType_UNSIGNED_INTEGER)
+ _lifetimeInSeconds, _lifetimeInSecondsErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _lifetimeInSecondsErr != nil {
return nil, errors.Wrap(_lifetimeInSecondsErr, "Error parsing 'lifetimeInSeconds' field")
}
@@ -227,7 +227,7 @@ func BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer utils
if pullErr := readBuffer.PullContext("listOfValues"); pullErr != nil {
return nil, pullErr
}
- _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(uint8(4)), monitoredObjectIdentifier.GetObjectType())
+ _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(uint8(4)), BACnetObjectType(monitoredObjectIdentifier.GetObjectType()))
if _listOfValuesErr != nil {
return nil, errors.Wrap(_listOfValuesErr, "Error parsing 'listOfValues' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index 4b6653b..a6bddd1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -272,7 +272,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("processIdentifier"); pullErr != nil {
return nil, pullErr
}
- _processIdentifier, _processIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_UNSIGNED_INTEGER)
+ _processIdentifier, _processIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _processIdentifierErr != nil {
return nil, errors.Wrap(_processIdentifierErr, "Error parsing 'processIdentifier' field")
}
@@ -285,7 +285,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("initiatingDeviceIdentifier"); pullErr != nil {
return nil, pullErr
}
- _initiatingDeviceIdentifier, _initiatingDeviceIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _initiatingDeviceIdentifier, _initiatingDeviceIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _initiatingDeviceIdentifierErr != nil {
return nil, errors.Wrap(_initiatingDeviceIdentifierErr, "Error parsing 'initiatingDeviceIdentifier' field")
}
@@ -298,7 +298,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("eventObjectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _eventObjectIdentifier, _eventObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _eventObjectIdentifier, _eventObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _eventObjectIdentifierErr != nil {
return nil, errors.Wrap(_eventObjectIdentifierErr, "Error parsing 'eventObjectIdentifier' field")
}
@@ -324,7 +324,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("notificationClass"); pullErr != nil {
return nil, pullErr
}
- _notificationClass, _notificationClassErr := BACnetContextTagParse(readBuffer, uint8(uint8(4)), BACnetDataType_UNSIGNED_INTEGER)
+ _notificationClass, _notificationClassErr := BACnetContextTagParse(readBuffer, uint8(uint8(4)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _notificationClassErr != nil {
return nil, errors.Wrap(_notificationClassErr, "Error parsing 'notificationClass' field")
}
@@ -337,7 +337,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("priority"); pullErr != nil {
return nil, pullErr
}
- _priority, _priorityErr := BACnetContextTagParse(readBuffer, uint8(uint8(5)), BACnetDataType_UNSIGNED_INTEGER)
+ _priority, _priorityErr := BACnetContextTagParse(readBuffer, uint8(uint8(5)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _priorityErr != nil {
return nil, errors.Wrap(_priorityErr, "Error parsing 'priority' field")
}
@@ -350,7 +350,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("eventType"); pullErr != nil {
return nil, pullErr
}
- _eventType, _eventTypeErr := BACnetContextTagParse(readBuffer, uint8(uint8(6)), BACnetDataType_EVENT_TYPE)
+ _eventType, _eventTypeErr := BACnetContextTagParse(readBuffer, uint8(uint8(6)), BACnetDataType(BACnetDataType_EVENT_TYPE))
if _eventTypeErr != nil {
return nil, errors.Wrap(_eventTypeErr, "Error parsing 'eventType' field")
}
@@ -384,7 +384,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("notifyType"); pullErr != nil {
return nil, pullErr
}
- _notifyType, _notifyTypeErr := BACnetContextTagParse(readBuffer, uint8(uint8(8)), BACnetDataType_NOTIFY_TYPE)
+ _notifyType, _notifyTypeErr := BACnetContextTagParse(readBuffer, uint8(uint8(8)), BACnetDataType(BACnetDataType_NOTIFY_TYPE))
if _notifyTypeErr != nil {
return nil, errors.Wrap(_notifyTypeErr, "Error parsing 'notifyType' field")
}
@@ -439,7 +439,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti
if pullErr := readBuffer.PullContext("toState"); pullErr != nil {
return nil, pullErr
}
- _toState, _toStateErr := BACnetContextTagParse(readBuffer, uint8(uint8(11)), BACnetDataType_EVENT_STATE)
+ _toState, _toStateErr := BACnetContextTagParse(readBuffer, uint8(uint8(11)), BACnetDataType(BACnetDataType_EVENT_STATE))
if _toStateErr != nil {
return nil, errors.Wrap(_toStateErr, "Error parsing 'toState' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index 9f02db3..1947755 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -156,7 +156,7 @@ func BACnetConfirmedServiceRequestReadPropertyParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("objectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _objectIdentifierErr != nil {
return nil, errors.Wrap(_objectIdentifierErr, "Error parsing 'objectIdentifier' field")
}
@@ -169,7 +169,7 @@ func BACnetConfirmedServiceRequestReadPropertyParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index bded0c1..e720572 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -145,7 +145,7 @@ func BACnetConfirmedServiceRequestReinitializeDeviceParse(readBuffer utils.ReadB
if pullErr := readBuffer.PullContext("reinitializedStateOfDevice"); pullErr != nil {
return nil, pullErr
}
- _reinitializedStateOfDevice, _reinitializedStateOfDeviceErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_DEVICE_STATE)
+ _reinitializedStateOfDevice, _reinitializedStateOfDeviceErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_DEVICE_STATE))
if _reinitializedStateOfDeviceErr != nil {
return nil, errors.Wrap(_reinitializedStateOfDeviceErr, "Error parsing 'reinitializedStateOfDevice' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index e1fbbce..89f357a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -164,7 +164,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("subscriberProcessIdentifier"); pullErr != nil {
return nil, pullErr
}
- _subscriberProcessIdentifier, _subscriberProcessIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_UNSIGNED_INTEGER)
+ _subscriberProcessIdentifier, _subscriberProcessIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _subscriberProcessIdentifierErr != nil {
return nil, errors.Wrap(_subscriberProcessIdentifierErr, "Error parsing 'subscriberProcessIdentifier' field")
}
@@ -177,7 +177,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("monitoredObjectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _monitoredObjectIdentifier, _monitoredObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _monitoredObjectIdentifier, _monitoredObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _monitoredObjectIdentifierErr != nil {
return nil, errors.Wrap(_monitoredObjectIdentifierErr, "Error parsing 'monitoredObjectIdentifier' field")
}
@@ -190,7 +190,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("issueConfirmed"); pullErr != nil {
return nil, pullErr
}
- _issueConfirmed, _issueConfirmedErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_BOOLEAN)
+ _issueConfirmed, _issueConfirmedErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_BOOLEAN))
if _issueConfirmedErr != nil {
return nil, errors.Wrap(_issueConfirmedErr, "Error parsing 'issueConfirmed' field")
}
@@ -203,7 +203,7 @@ func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("lifetimeInSeconds"); pullErr != nil {
return nil, pullErr
}
- _lifetimeInSeconds, _lifetimeInSecondsErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType_UNSIGNED_INTEGER)
+ _lifetimeInSeconds, _lifetimeInSecondsErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _lifetimeInSecondsErr != nil {
return nil, errors.Wrap(_lifetimeInSecondsErr, "Error parsing 'lifetimeInSeconds' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 0e26aa5..553b6d3 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -180,7 +180,7 @@ func BACnetConfirmedServiceRequestWritePropertyParse(readBuffer utils.ReadBuffer
if pullErr := readBuffer.PullContext("objectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _objectIdentifierErr != nil {
return nil, errors.Wrap(_objectIdentifierErr, "Error parsing 'objectIdentifier' field")
}
@@ -193,7 +193,7 @@ func BACnetConfirmedServiceRequestWritePropertyParse(readBuffer utils.ReadBuffer
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
@@ -227,7 +227,7 @@ func BACnetConfirmedServiceRequestWritePropertyParse(readBuffer utils.ReadBuffer
if pullErr := readBuffer.PullContext("propertyValue"); pullErr != nil {
return nil, pullErr
}
- _propertyValue, _propertyValueErr := BACnetConstructedDataParse(readBuffer, uint8(uint8(3)), objectIdentifier.GetObjectType(), propertyIdentifier)
+ _propertyValue, _propertyValueErr := BACnetConstructedDataParse(readBuffer, uint8(uint8(3)), BACnetObjectType(objectIdentifier.GetObjectType()), propertyIdentifier)
if _propertyValueErr != nil {
return nil, errors.Wrap(_propertyValueErr, "Error parsing 'propertyValue' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go
index df8ca03..dd0cfd7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go
@@ -144,7 +144,7 @@ func BACnetConstructedDataParse(readBuffer utils.ReadBuffer, tagNumber uint8, ob
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -182,7 +182,7 @@ func BACnetConstructedDataParse(readBuffer utils.ReadBuffer, tagNumber uint8, ob
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
index 307ebb9..42620e6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
@@ -168,7 +168,7 @@ func BACnetConstructedDataCommandParse(readBuffer utils.ReadBuffer, tagNumber ui
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -201,7 +201,7 @@ func BACnetConstructedDataCommandParse(readBuffer utils.ReadBuffer, tagNumber ui
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
index 49ddf56..68f153f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
@@ -164,7 +164,7 @@ func BACnetConstructedDataEventTimestampsParse(readBuffer utils.ReadBuffer, tagN
if pullErr := readBuffer.PullContext("toOffnormal"); pullErr != nil {
return nil, pullErr
}
- _toOffnormal, _toOffnormalErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_TIME)
+ _toOffnormal, _toOffnormalErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_TIME))
if _toOffnormalErr != nil {
return nil, errors.Wrap(_toOffnormalErr, "Error parsing 'toOffnormal' field")
}
@@ -177,7 +177,7 @@ func BACnetConstructedDataEventTimestampsParse(readBuffer utils.ReadBuffer, tagN
if pullErr := readBuffer.PullContext("toFault"); pullErr != nil {
return nil, pullErr
}
- _toFault, _toFaultErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_UNSIGNED_INTEGER)
+ _toFault, _toFaultErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _toFaultErr != nil {
return nil, errors.Wrap(_toFaultErr, "Error parsing 'toFault' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go
index e3a6e5c..d5da5ad 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go
@@ -135,7 +135,7 @@ func BACnetDateTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetD
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -174,7 +174,7 @@ func BACnetDateTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetD
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
index 67ebffb..42c0c34 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
@@ -160,7 +160,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer, tagNu
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -173,7 +173,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer, tagNu
if pullErr := readBuffer.PullContext("objectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _objectIdentifierErr != nil {
return nil, errors.Wrap(_objectIdentifierErr, "Error parsing 'objectIdentifier' field")
}
@@ -186,7 +186,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer, tagNu
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
@@ -241,7 +241,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer, tagNu
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go
index d7df4fb..cfb3833 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go
@@ -149,7 +149,7 @@ func BACnetNotificationParametersParse(readBuffer utils.ReadBuffer, tagNumber ui
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -205,7 +205,7 @@ func BACnetNotificationParametersParse(readBuffer utils.ReadBuffer, tagNumber ui
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
index 880fe58..766a3ab 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
@@ -179,7 +179,7 @@ func BACnetNotificationParametersBufferReadyParse(readBuffer utils.ReadBuffer, t
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -205,7 +205,7 @@ func BACnetNotificationParametersBufferReadyParse(readBuffer utils.ReadBuffer, t
if pullErr := readBuffer.PullContext("previousNotification"); pullErr != nil {
return nil, pullErr
}
- _previousNotification, _previousNotificationErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_UNSIGNED_INTEGER)
+ _previousNotification, _previousNotificationErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _previousNotificationErr != nil {
return nil, errors.Wrap(_previousNotificationErr, "Error parsing 'previousNotification' field")
}
@@ -218,7 +218,7 @@ func BACnetNotificationParametersBufferReadyParse(readBuffer utils.ReadBuffer, t
if pullErr := readBuffer.PullContext("currentNotification"); pullErr != nil {
return nil, pullErr
}
- _currentNotification, _currentNotificationErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_UNSIGNED_INTEGER)
+ _currentNotification, _currentNotificationErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _currentNotificationErr != nil {
return nil, errors.Wrap(_currentNotificationErr, "Error parsing 'currentNotification' field")
}
@@ -231,7 +231,7 @@ func BACnetNotificationParametersBufferReadyParse(readBuffer utils.ReadBuffer, t
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
index d1e1ae1..a257d64 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
@@ -168,7 +168,7 @@ func BACnetNotificationParametersChangeOfBitStringParse(readBuffer utils.ReadBuf
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -181,7 +181,7 @@ func BACnetNotificationParametersChangeOfBitStringParse(readBuffer utils.ReadBuf
if pullErr := readBuffer.PullContext("changeOfBitString"); pullErr != nil {
return nil, pullErr
}
- _changeOfBitString, _changeOfBitStringErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BIT_STRING)
+ _changeOfBitString, _changeOfBitStringErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BIT_STRING))
if _changeOfBitStringErr != nil {
return nil, errors.Wrap(_changeOfBitStringErr, "Error parsing 'changeOfBitString' field")
}
@@ -207,7 +207,7 @@ func BACnetNotificationParametersChangeOfBitStringParse(readBuffer utils.ReadBuf
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
index 439a066..5ec308c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
@@ -168,7 +168,7 @@ func BACnetNotificationParametersChangeOfStateParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -207,7 +207,7 @@ func BACnetNotificationParametersChangeOfStateParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
index 32e76fc..ff45c0a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
@@ -168,7 +168,7 @@ func BACnetNotificationParametersChangeOfValueParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -207,7 +207,7 @@ func BACnetNotificationParametersChangeOfValueParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
index e81d459..29b24c5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
@@ -148,7 +148,7 @@ func BACnetNotificationParametersChangeOfValueNewValueParse(readBuffer utils.Rea
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -190,7 +190,7 @@ func BACnetNotificationParametersChangeOfValueNewValueParse(readBuffer utils.Rea
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
index 56e59c6..951e630 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
@@ -134,7 +134,7 @@ func BACnetNotificationParametersChangeOfValueNewValueChangedBitsParse(readBuffe
if pullErr := readBuffer.PullContext("changedBits"); pullErr != nil {
return nil, pullErr
}
- _changedBits, _changedBitsErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BIT_STRING)
+ _changedBits, _changedBitsErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BIT_STRING))
if _changedBitsErr != nil {
return nil, errors.Wrap(_changedBitsErr, "Error parsing 'changedBits' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
index f4ed481..006acd1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
@@ -134,7 +134,7 @@ func BACnetNotificationParametersChangeOfValueNewValueChangedValueParse(readBuff
if pullErr := readBuffer.PullContext("changedValue"); pullErr != nil {
return nil, pullErr
}
- _changedValue, _changedValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_REAL)
+ _changedValue, _changedValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_REAL))
if _changedValueErr != nil {
return nil, errors.Wrap(_changedValueErr, "Error parsing 'changedValue' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
index 2bc9aa4..062aef1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
@@ -135,7 +135,7 @@ func BACnetNotificationParametersComplexEventTypeParse(readBuffer utils.ReadBuff
if pullErr := readBuffer.PullContext("listOfValues"); pullErr != nil {
return nil, pullErr
}
- _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(peekedTagNumber), objectType)
+ _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(peekedTagNumber), BACnetObjectType(objectType))
if _listOfValuesErr != nil {
return nil, errors.Wrap(_listOfValuesErr, "Error parsing 'listOfValues' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
index ed8942d..fea54d3 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
@@ -179,7 +179,7 @@ func BACnetNotificationParametersExtendedParse(readBuffer utils.ReadBuffer, tagN
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -192,7 +192,7 @@ func BACnetNotificationParametersExtendedParse(readBuffer utils.ReadBuffer, tagN
if pullErr := readBuffer.PullContext("vendorId"); pullErr != nil {
return nil, pullErr
}
- _vendorId, _vendorIdErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_UNSIGNED_INTEGER)
+ _vendorId, _vendorIdErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _vendorIdErr != nil {
return nil, errors.Wrap(_vendorIdErr, "Error parsing 'vendorId' field")
}
@@ -205,7 +205,7 @@ func BACnetNotificationParametersExtendedParse(readBuffer utils.ReadBuffer, tagN
if pullErr := readBuffer.PullContext("extendedEventType"); pullErr != nil {
return nil, pullErr
}
- _extendedEventType, _extendedEventTypeErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_UNSIGNED_INTEGER)
+ _extendedEventType, _extendedEventTypeErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _extendedEventTypeErr != nil {
return nil, errors.Wrap(_extendedEventTypeErr, "Error parsing 'extendedEventType' field")
}
@@ -231,7 +231,7 @@ func BACnetNotificationParametersExtendedParse(readBuffer utils.ReadBuffer, tagN
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
index cad8226..c2d5d9f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
@@ -284,7 +284,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -591,7 +591,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
index a9fb1ff..598a937 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
@@ -190,7 +190,7 @@ func BACnetNotificationParametersFloatingLimitParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -203,7 +203,7 @@ func BACnetNotificationParametersFloatingLimitParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("referenceValue"); pullErr != nil {
return nil, pullErr
}
- _referenceValue, _referenceValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_REAL)
+ _referenceValue, _referenceValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_REAL))
if _referenceValueErr != nil {
return nil, errors.Wrap(_referenceValueErr, "Error parsing 'referenceValue' field")
}
@@ -229,7 +229,7 @@ func BACnetNotificationParametersFloatingLimitParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("setPointValue"); pullErr != nil {
return nil, pullErr
}
- _setPointValue, _setPointValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_REAL)
+ _setPointValue, _setPointValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_REAL))
if _setPointValueErr != nil {
return nil, errors.Wrap(_setPointValueErr, "Error parsing 'setPointValue' field")
}
@@ -242,7 +242,7 @@ func BACnetNotificationParametersFloatingLimitParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("errorLimit"); pullErr != nil {
return nil, pullErr
}
- _errorLimit, _errorLimitErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType_REAL)
+ _errorLimit, _errorLimitErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType(BACnetDataType_REAL))
if _errorLimitErr != nil {
return nil, errors.Wrap(_errorLimitErr, "Error parsing 'errorLimit' field")
}
@@ -255,7 +255,7 @@ func BACnetNotificationParametersFloatingLimitParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
index 46f0654..0f3cc3d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
@@ -190,7 +190,7 @@ func BACnetNotificationParametersOutOfRangeParse(readBuffer utils.ReadBuffer, ta
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -203,7 +203,7 @@ func BACnetNotificationParametersOutOfRangeParse(readBuffer utils.ReadBuffer, ta
if pullErr := readBuffer.PullContext("exceedingValue"); pullErr != nil {
return nil, pullErr
}
- _exceedingValue, _exceedingValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_REAL)
+ _exceedingValue, _exceedingValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_REAL))
if _exceedingValueErr != nil {
return nil, errors.Wrap(_exceedingValueErr, "Error parsing 'exceedingValue' field")
}
@@ -229,7 +229,7 @@ func BACnetNotificationParametersOutOfRangeParse(readBuffer utils.ReadBuffer, ta
if pullErr := readBuffer.PullContext("deadband"); pullErr != nil {
return nil, pullErr
}
- _deadband, _deadbandErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_REAL)
+ _deadband, _deadbandErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_REAL))
if _deadbandErr != nil {
return nil, errors.Wrap(_deadbandErr, "Error parsing 'deadband' field")
}
@@ -242,7 +242,7 @@ func BACnetNotificationParametersOutOfRangeParse(readBuffer utils.ReadBuffer, ta
if pullErr := readBuffer.PullContext("exceededLimit"); pullErr != nil {
return nil, pullErr
}
- _exceededLimit, _exceededLimitErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType_REAL)
+ _exceededLimit, _exceededLimitErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType(BACnetDataType_REAL))
if _exceededLimitErr != nil {
return nil, errors.Wrap(_exceededLimitErr, "Error parsing 'exceededLimit' field")
}
@@ -255,7 +255,7 @@ func BACnetNotificationParametersOutOfRangeParse(readBuffer utils.ReadBuffer, ta
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
index bc53f5f..0680b3a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
@@ -179,7 +179,7 @@ func BACnetNotificationParametersUnsignedRangeParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -192,7 +192,7 @@ func BACnetNotificationParametersUnsignedRangeParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("sequenceNumber"); pullErr != nil {
return nil, pullErr
}
- _sequenceNumber, _sequenceNumberErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_UNSIGNED_INTEGER)
+ _sequenceNumber, _sequenceNumberErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _sequenceNumberErr != nil {
return nil, errors.Wrap(_sequenceNumberErr, "Error parsing 'sequenceNumber' field")
}
@@ -218,7 +218,7 @@ func BACnetNotificationParametersUnsignedRangeParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("exceededLimit"); pullErr != nil {
return nil, pullErr
}
- _exceededLimit, _exceededLimitErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_UNSIGNED_INTEGER)
+ _exceededLimit, _exceededLimitErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _exceededLimitErr != nil {
return nil, errors.Wrap(_exceededLimitErr, "Error parsing 'exceededLimit' field")
}
@@ -231,7 +231,7 @@ func BACnetNotificationParametersUnsignedRangeParse(readBuffer utils.ReadBuffer,
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go
index e510931..53ee3d0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go
@@ -115,7 +115,7 @@ func BACnetPropertyReferenceParse(readBuffer utils.ReadBuffer) (*BACnetPropertyR
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go
index 598dfed..5f1e9d5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go
@@ -148,7 +148,7 @@ func BACnetPropertyStatesParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*B
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -192,7 +192,7 @@ func BACnetPropertyStatesParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*B
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go
index 582ce2a..367e355 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go
@@ -142,7 +142,7 @@ func BACnetPropertyValueParse(readBuffer utils.ReadBuffer, objectType BACnetObje
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go
index ac14537..d3e236f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go
@@ -130,7 +130,7 @@ func BACnetPropertyValuesParse(readBuffer utils.ReadBuffer, tagNumber uint8, obj
if pullErr := readBuffer.PullContext("innerOpeningTag"); pullErr != nil {
return nil, pullErr
}
- _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _innerOpeningTag, _innerOpeningTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _innerOpeningTagErr != nil {
return nil, errors.Wrap(_innerOpeningTagErr, "Error parsing 'innerOpeningTag' field")
}
@@ -163,7 +163,7 @@ func BACnetPropertyValuesParse(readBuffer utils.ReadBuffer, tagNumber uint8, obj
if pullErr := readBuffer.PullContext("innerClosingTag"); pullErr != nil {
return nil, pullErr
}
- _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _innerClosingTag, _innerClosingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _innerClosingTagErr != nil {
return nil, errors.Wrap(_innerClosingTagErr, "Error parsing 'innerClosingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
index 9cd2532..7c710f0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
@@ -136,7 +136,7 @@ func BACnetReadAccessSpecificationParse(readBuffer utils.ReadBuffer) (*BACnetRea
if pullErr := readBuffer.PullContext("objectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _objectIdentifierErr != nil {
return nil, errors.Wrap(_objectIdentifierErr, "Error parsing 'objectIdentifier' field")
}
@@ -149,7 +149,7 @@ func BACnetReadAccessSpecificationParse(readBuffer utils.ReadBuffer) (*BACnetRea
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -182,7 +182,7 @@ func BACnetReadAccessSpecificationParse(readBuffer utils.ReadBuffer) (*BACnetRea
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
index 8544a05..0916431 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
@@ -153,7 +153,7 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuff
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -187,7 +187,7 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuff
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
index 9f3ba7c..7c4ad80 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
@@ -127,7 +127,7 @@ func BACnetServiceAckAtomicWriteFileParse(readBuffer utils.ReadBuffer) (*BACnetS
if pullErr := readBuffer.PullContext("fileStartPosition"); pullErr != nil {
return nil, pullErr
}
- _fileStartPosition, _fileStartPositionErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_SIGNED_INTEGER)
+ _fileStartPosition, _fileStartPositionErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_SIGNED_INTEGER))
if _fileStartPositionErr != nil {
return nil, errors.Wrap(_fileStartPositionErr, "Error parsing 'fileStartPosition' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index 3258317..b718585 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -165,7 +165,7 @@ func BACnetServiceAckReadPropertyParse(readBuffer utils.ReadBuffer) (*BACnetServ
if pullErr := readBuffer.PullContext("objectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _objectIdentifier, _objectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _objectIdentifierErr != nil {
return nil, errors.Wrap(_objectIdentifierErr, "Error parsing 'objectIdentifier' field")
}
@@ -178,7 +178,7 @@ func BACnetServiceAckReadPropertyParse(readBuffer utils.ReadBuffer) (*BACnetServ
if pullErr := readBuffer.PullContext("propertyIdentifier"); pullErr != nil {
return nil, pullErr
}
- _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_PROPERTY_IDENTIFIER)
+ _propertyIdentifier, _propertyIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_PROPERTY_IDENTIFIER))
if _propertyIdentifierErr != nil {
return nil, errors.Wrap(_propertyIdentifierErr, "Error parsing 'propertyIdentifier' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go
index 506de39..ef4d0b2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go
@@ -136,7 +136,7 @@ func BACnetStatusFlagsParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACn
if pullErr := readBuffer.PullContext("rawBits"); pullErr != nil {
return nil, pullErr
}
- _rawBits, _rawBitsErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_BIT_STRING)
+ _rawBits, _rawBitsErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_BIT_STRING))
if _rawBitsErr != nil {
return nil, errors.Wrap(_rawBitsErr, "Error parsing 'rawBits' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go
index a2ca793..686bd31 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go
@@ -148,7 +148,7 @@ func BACnetTimeStampParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnet
if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil {
return nil, pullErr
}
- _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_OPENING_TAG)
+ _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_OPENING_TAG))
if _openingTagErr != nil {
return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field")
}
@@ -192,7 +192,7 @@ func BACnetTimeStampParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnet
if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil {
return nil, pullErr
}
- _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType_CLOSING_TAG)
+ _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(tagNumber), BACnetDataType(BACnetDataType_CLOSING_TAG))
if _closingTagErr != nil {
return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go
index c5d2ea9..253b1a5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go
@@ -134,7 +134,7 @@ func BACnetTimeStampSequenceParse(readBuffer utils.ReadBuffer, tagNumber uint8)
if pullErr := readBuffer.PullContext("sequenceNumber"); pullErr != nil {
return nil, pullErr
}
- _sequenceNumber, _sequenceNumberErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_UNSIGNED_INTEGER)
+ _sequenceNumber, _sequenceNumberErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _sequenceNumberErr != nil {
return nil, errors.Wrap(_sequenceNumberErr, "Error parsing 'sequenceNumber' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go
index 322a0e0..09c5856 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go
@@ -134,7 +134,7 @@ func BACnetTimeStampTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BA
if pullErr := readBuffer.PullContext("timeValue"); pullErr != nil {
return nil, pullErr
}
- _timeValue, _timeValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_TIME)
+ _timeValue, _timeValueErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_TIME))
if _timeValueErr != nil {
return nil, errors.Wrap(_timeValueErr, "Error parsing 'timeValue' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
index 865fa46..fb5bc8e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
@@ -175,7 +175,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationParse(readBuffer u
if pullErr := readBuffer.PullContext("subscriberProcessIdentifier"); pullErr != nil {
return nil, pullErr
}
- _subscriberProcessIdentifier, _subscriberProcessIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType_UNSIGNED_INTEGER)
+ _subscriberProcessIdentifier, _subscriberProcessIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(0)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _subscriberProcessIdentifierErr != nil {
return nil, errors.Wrap(_subscriberProcessIdentifierErr, "Error parsing 'subscriberProcessIdentifier' field")
}
@@ -188,7 +188,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationParse(readBuffer u
if pullErr := readBuffer.PullContext("initiatingDeviceIdentifier"); pullErr != nil {
return nil, pullErr
}
- _initiatingDeviceIdentifier, _initiatingDeviceIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _initiatingDeviceIdentifier, _initiatingDeviceIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _initiatingDeviceIdentifierErr != nil {
return nil, errors.Wrap(_initiatingDeviceIdentifierErr, "Error parsing 'initiatingDeviceIdentifier' field")
}
@@ -201,7 +201,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationParse(readBuffer u
if pullErr := readBuffer.PullContext("monitoredObjectIdentifier"); pullErr != nil {
return nil, pullErr
}
- _monitoredObjectIdentifier, _monitoredObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_BACNET_OBJECT_IDENTIFIER)
+ _monitoredObjectIdentifier, _monitoredObjectIdentifierErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_BACNET_OBJECT_IDENTIFIER))
if _monitoredObjectIdentifierErr != nil {
return nil, errors.Wrap(_monitoredObjectIdentifierErr, "Error parsing 'monitoredObjectIdentifier' field")
}
@@ -214,7 +214,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationParse(readBuffer u
if pullErr := readBuffer.PullContext("lifetimeInSeconds"); pullErr != nil {
return nil, pullErr
}
- _lifetimeInSeconds, _lifetimeInSecondsErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType_UNSIGNED_INTEGER)
+ _lifetimeInSeconds, _lifetimeInSecondsErr := BACnetContextTagParse(readBuffer, uint8(uint8(3)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _lifetimeInSecondsErr != nil {
return nil, errors.Wrap(_lifetimeInSecondsErr, "Error parsing 'lifetimeInSeconds' field")
}
@@ -227,7 +227,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationParse(readBuffer u
if pullErr := readBuffer.PullContext("listOfValues"); pullErr != nil {
return nil, pullErr
}
- _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(uint8(4)), monitoredObjectIdentifier.GetObjectType())
+ _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(uint8(4)), BACnetObjectType(monitoredObjectIdentifier.GetObjectType()))
if _listOfValuesErr != nil {
return nil, errors.Wrap(_listOfValuesErr, "Error parsing 'listOfValues' field")
}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index b5229ff..47717bc 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -156,7 +156,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferParse(readBuffer u
if pullErr := readBuffer.PullContext("vendorId"); pullErr != nil {
return nil, pullErr
}
- _vendorId, _vendorIdErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType_UNSIGNED_INTEGER)
+ _vendorId, _vendorIdErr := BACnetContextTagParse(readBuffer, uint8(uint8(1)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _vendorIdErr != nil {
return nil, errors.Wrap(_vendorIdErr, "Error parsing 'vendorId' field")
}
@@ -169,7 +169,7 @@ func BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferParse(readBuffer u
if pullErr := readBuffer.PullContext("serviceNumber"); pullErr != nil {
return nil, pullErr
}
- _serviceNumber, _serviceNumberErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType_UNSIGNED_INTEGER)
+ _serviceNumber, _serviceNumberErr := BACnetContextTagParse(readBuffer, uint8(uint8(2)), BACnetDataType(BACnetDataType_UNSIGNED_INTEGER))
if _serviceNumberErr != nil {
return nil, errors.Wrap(_serviceNumberErr, "Error parsing 'serviceNumber' field")
}
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
index cedf146..184ae5a 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
@@ -139,10 +139,7 @@ func DF1UnprotectedReadResponseParse(readBuffer utils.ReadBuffer) (*DF1Command,
}
}
- data := make([]byte, len(_dataList))
- for i := 0; i < len(_dataList); i++ {
- data[i] = byte(_dataList[i])
- }
+ data := _dataList
if closeErr := readBuffer.CloseContext("data", utils.WithRenderAsList(true)); closeErr != nil {
return nil, closeErr
}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
index eddd796..4736019 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
@@ -181,10 +181,7 @@ func SysexCommandReportFirmwareResponseParse(readBuffer utils.ReadBuffer, respon
}
}
- fileName := make([]byte, len(_fileNameList))
- for i := 0; i < len(_fileNameList); i++ {
- fileName[i] = byte(_fileNameList[i])
- }
+ fileName := _fileNameList
if closeErr := readBuffer.CloseContext("fileName", utils.WithRenderAsList(true)); closeErr != nil {
return nil, closeErr
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go b/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go
index 5f29a63..526f5c6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go
@@ -32,6 +32,13 @@ type KnxnetipParserHelper struct {
func (m KnxnetipParserHelper) Parse(typeName string, arguments []string, io utils.ReadBuffer) (interface{}, error) {
switch typeName {
+ case "KnxProperty":
+ var propertyType model.KnxPropertyDataType
+ dataLengthInBytes, err := utils.StrToUint8(arguments[1])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ return model.KnxPropertyParse(io, propertyType, dataLengthInBytes)
case "HPAIControlEndpoint":
return model.HPAIControlEndpointParse(io)
case "TunnelingResponseDataBlock":
@@ -123,6 +130,9 @@ func (m KnxnetipParserHelper) Parse(typeName string, arguments []string, io util
return model.ApduDataParse(io, dataLength)
case "GroupObjectDescriptorRealisationType1":
return model.GroupObjectDescriptorRealisationType1Parse(io)
+ case "KnxDatapoint":
+ var datapointType model.KnxDatapointType
+ return model.KnxDatapointParse(io, datapointType)
}
return nil, errors.Errorf("Unsupported type %s", typeName)
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/PropertyDataTypeIO.go b/plc4go/internal/plc4go/knxnetip/readwrite/PropertyDataTypeIO.go
deleted file mode 100644
index 6ac0662..0000000
--- a/plc4go/internal/plc4go/knxnetip/readwrite/PropertyDataTypeIO.go
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package readwrite
-
-import (
- "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model"
- "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
- values2 "github.com/apache/plc4x/plc4go/internal/plc4go/spi/values"
- "github.com/apache/plc4x/plc4go/pkg/plc4go/values"
-)
-
-func ParsePropertyDataType(io utils.ReadBuffer, dataType model.KnxPropertyDataType, numBytes uint8) values.PlcValue {
- // Helper for parsing arrays.
- parseArray := func(num uint8) values2.PlcByteArray {
- var data []byte
- for i := uint8(0); i < num; i++ {
- b, _ := io.ReadUint8("", 8)
- data = append(data, b)
- }
- return values2.NewPlcByteArray(data)
- }
-
- switch dataType {
- case model.KnxPropertyDataType_PDT_UNKNOWN: // Var Number of Bytes
- return parseArray(numBytes)
- case model.KnxPropertyDataType_PDT_CONTROL: // 10 Bytes
- return parseArray(10)
- case model.KnxPropertyDataType_PDT_CHAR: // 1 Byte
- val, _ := io.ReadUint8("", 8)
- return values2.NewPlcCHAR(val)
- case model.KnxPropertyDataType_PDT_UNSIGNED_CHAR: // 1 Byte
- val, _ := io.ReadUint8("", 8)
- return values2.NewPlcCHAR(val)
- case model.KnxPropertyDataType_PDT_INT: // 2 Bytes
- val, _ := io.ReadInt16("", 16)
- return values2.NewPlcINT(val)
- case model.KnxPropertyDataType_PDT_UNSIGNED_INT: // 2 Bytes
- val, _ := io.ReadUint16("", 16)
- return values2.NewPlcUINT(val)
- case model.KnxPropertyDataType_PDT_KNX_FLOAT: // 2 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_DATE: // 3 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_TIME: // 3 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_LONG: // 4 Bytes
- val, _ := io.ReadInt64("", 64)
- return values2.NewPlcLINT(val)
- case model.KnxPropertyDataType_PDT_UNSIGNED_LONG: // 4 Bytes
- val, _ := io.ReadUint64("", 64)
- return values2.NewPlcULINT(val)
- case model.KnxPropertyDataType_PDT_FLOAT: // 4 Bytes
- val, _ := io.ReadFloat32("", 32)
- return values2.NewPlcREAL(val)
- case model.KnxPropertyDataType_PDT_DOUBLE: // 8 Bytes
- val, _ := io.ReadFloat64("", 64)
- return values2.NewPlcLREAL(val)
- case model.KnxPropertyDataType_PDT_CHAR_BLOCK: // 10 Bytes
- return parseArray(10)
- case model.KnxPropertyDataType_PDT_POLL_GROUP_SETTINGS: // 3 Bytes
- return parseArray(3)
- case model.KnxPropertyDataType_PDT_SHORT_CHAR_BLOCK: // 5 Bytes
- return parseArray(5)
- case model.KnxPropertyDataType_PDT_DATE_TIME: // 8 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_VARIABLE_LENGTH: // Var Number of Bytes
- return parseArray(numBytes)
- case model.KnxPropertyDataType_PDT_GENERIC_01: // 1 Bytes
- return parseArray(1)
- case model.KnxPropertyDataType_PDT_GENERIC_02: // 2 Bytes
- return parseArray(2)
- case model.KnxPropertyDataType_PDT_GENERIC_03: // 3 Bytes
- return parseArray(3)
- case model.KnxPropertyDataType_PDT_GENERIC_04: // 4 Bytes
- return parseArray(4)
- case model.KnxPropertyDataType_PDT_GENERIC_05: // 5 Bytes
- return parseArray(5)
- case model.KnxPropertyDataType_PDT_GENERIC_06: // 6 Bytes
- return parseArray(6)
- case model.KnxPropertyDataType_PDT_GENERIC_07: // 7 Bytes
- return parseArray(7)
- case model.KnxPropertyDataType_PDT_GENERIC_08: // 8 Bytes
- return parseArray(8)
- case model.KnxPropertyDataType_PDT_GENERIC_09: // 9 Bytes
- return parseArray(9)
- case model.KnxPropertyDataType_PDT_GENERIC_10: // 10 Bytes
- return parseArray(10)
- case model.KnxPropertyDataType_PDT_GENERIC_11: // 11 Bytes
- return parseArray(11)
- case model.KnxPropertyDataType_PDT_GENERIC_12: // 12 Bytes
- return parseArray(12)
- case model.KnxPropertyDataType_PDT_GENERIC_13: // 13 Bytes
- return parseArray(13)
- case model.KnxPropertyDataType_PDT_GENERIC_14: // 14 Bytes
- return parseArray(14)
- case model.KnxPropertyDataType_PDT_GENERIC_15: // 15 Bytes
- return parseArray(15)
- case model.KnxPropertyDataType_PDT_GENERIC_16: // 16 Bytes
- return parseArray(16)
- case model.KnxPropertyDataType_PDT_GENERIC_17: // 17 Bytes
- return parseArray(17)
- case model.KnxPropertyDataType_PDT_GENERIC_18: // 18 Bytes
- return parseArray(18)
- case model.KnxPropertyDataType_PDT_GENERIC_19: // 19 Bytes
- return parseArray(19)
- case model.KnxPropertyDataType_PDT_GENERIC_20: // 20 Bytes
- return parseArray(20)
- case model.KnxPropertyDataType_PDT_UTF_8: // Var Number of Bytes
- return parseArray(numBytes)
- case model.KnxPropertyDataType_PDT_VERSION: // 2 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_ALARM_INFO: // 6 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_BINARY_INFORMATION: // 1 Bytes
- // TODO: Implement this ...
- case model.KnxPropertyDataType_PDT_BITSET8: // 1 Bytes
- val, _ := io.ReadUint8("", 8)
- return values2.NewPlcBitString(val)
- case model.KnxPropertyDataType_PDT_BITSET16: // 2 Bytes
- val, _ := io.ReadUint16("", 16)
- return values2.NewPlcBitString(val)
- case model.KnxPropertyDataType_PDT_ENUM8: // 1 Bytes
- val, _ := io.ReadUint8("", 8)
- return values2.NewPlcCHAR(val)
- case model.KnxPropertyDataType_PDT_SCALING: // 1 Bytes
- val, _ := io.ReadUint8("", 8)
- return values2.NewPlcCHAR(val)
- case model.KnxPropertyDataType_PDT_NE_VL: // Var Number of Bytes
- return parseArray(numBytes)
- case model.KnxPropertyDataType_PDT_NE_FL: // Var Number of Bytes
- return parseArray(numBytes)
- case model.KnxPropertyDataType_PDT_FUNCTION: // Var Number of Bytes
- return parseArray(numBytes)
- case model.KnxPropertyDataType_PDT_ESCAPE: // Var Number of Bytes
- return parseArray(numBytes)
- default:
- return parseArray(numBytes)
- }
- return nil
-}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go
index b639181..fac2b36 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go
@@ -42,6 +42,14 @@ func init() {
func (m KnxnetipXmlParserHelper) Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error) {
switch typeName {
+ case "KnxProperty":
+ propertyType := model.KnxPropertyDataTypeByName(parserArguments[0])
+ parsedUint1, err := strconv.ParseUint(parserArguments[1], 10, 8)
+ if err != nil {
+ return nil, err
+ }
+ dataLengthInBytes := uint8(parsedUint1)
+ return model.KnxPropertyParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), propertyType, dataLengthInBytes)
case "HPAIControlEndpoint":
return model.HPAIControlEndpointParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "TunnelingResponseDataBlock":
@@ -138,6 +146,9 @@ func (m KnxnetipXmlParserHelper) Parse(typeName string, xmlString string, parser
return model.ApduDataParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), dataLength)
case "GroupObjectDescriptorRealisationType1":
return model.GroupObjectDescriptorRealisationType1Parse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "KnxDatapoint":
+ datapointType := model.KnxDatapointTypeByName(parserArguments[0])
+ return model.KnxDatapointParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), datapointType)
}
return nil, errors.Errorf("Unsupported type %s", typeName)
}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
index b17e400..d24dd57 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
@@ -29,7 +29,6 @@ import (
type KnxInterfaceObjectProperty uint32
type IKnxInterfaceObjectProperty interface {
- PropertyDataType() KnxPropertyDataType
Name() string
PropertyId() uint8
ObjectType() KnxInterfaceObjectType
@@ -479,888 +478,6 @@ func init() {
}
}
-func (e KnxInterfaceObjectProperty) PropertyDataType() KnxPropertyDataType {
- switch e {
- case 0:
- { /* '0' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 1:
- { /* '1' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 10:
- { /* '10' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 100:
- { /* '100' */
- return KnxPropertyDataType_PDT_BINARY_INFORMATION
- }
- case 101:
- { /* '101' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 102:
- { /* '102' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 103:
- { /* '103' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 104:
- { /* '104' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 105:
- { /* '105' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 106:
- { /* '106' */
- return KnxPropertyDataType_PDT_GENERIC_16
- }
- case 107:
- { /* '107' */
- return KnxPropertyDataType_PDT_GENERIC_16
- }
- case 108:
- { /* '108' */
- return KnxPropertyDataType_PDT_GENERIC_16
- }
- case 109:
- { /* '109' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 11:
- { /* '11' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 110:
- { /* '110' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 111:
- { /* '111' */
- return KnxPropertyDataType_PDT_SCALING
- }
- case 112:
- { /* '112' */
- return KnxPropertyDataType_PDT_GENERIC_02
- }
- case 113:
- { /* '113' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 114:
- { /* '114' */
- return KnxPropertyDataType_PDT_GENERIC_18
- }
- case 115:
- { /* '115' */
- return KnxPropertyDataType_PDT_GENERIC_18
- }
- case 116:
- { /* '116' */
- return KnxPropertyDataType_PDT_GENERIC_08
- }
- case 117:
- { /* '117' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 118:
- { /* '118' */
- return KnxPropertyDataType_PDT_GENERIC_16
- }
- case 119:
- { /* '119' */
- return KnxPropertyDataType_PDT_BITSET8
- }
- case 12:
- { /* '12' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 120:
- { /* '120' */
- return KnxPropertyDataType_PDT_BINARY_INFORMATION
- }
- case 121:
- { /* '121' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 122:
- { /* '122' */
- return KnxPropertyDataType_PDT_GENERIC_19
- }
- case 123:
- { /* '123' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 124:
- { /* '124' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 125:
- { /* '125' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 126:
- { /* '126' */
- return KnxPropertyDataType_PDT_BINARY_INFORMATION
- }
- case 127:
- { /* '127' */
- return KnxPropertyDataType_PDT_BINARY_INFORMATION
- }
- case 128:
- { /* '128' */
- return KnxPropertyDataType_PDT_BITSET8
- }
- case 129:
- { /* '129' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 13:
- { /* '13' */
- return KnxPropertyDataType_PDT_GENERIC_05
- }
- case 130:
- { /* '130' */
- return KnxPropertyDataType_PDT_GENERIC_03
- }
- case 131:
- { /* '131' */
- return KnxPropertyDataType_PDT_GENERIC_04
- }
- case 132:
- { /* '132' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 133:
- { /* '133' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 134:
- { /* '134' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 135:
- { /* '135' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 136:
- { /* '136' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 137:
- { /* '137' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 138:
- { /* '138' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 139:
- { /* '139' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 14:
- { /* '14' */
- return KnxPropertyDataType_PDT_BITSET8
- }
- case 140:
- { /* '140' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 141:
- { /* '141' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 142:
- { /* '142' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 143:
- { /* '143' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 144:
- { /* '144' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 145:
- { /* '145' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 146:
- { /* '146' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 147:
- { /* '147' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 148:
- { /* '148' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 149:
- { /* '149' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 15:
- { /* '15' */
- return KnxPropertyDataType_PDT_GENERIC_10
- }
- case 150:
- { /* '150' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 151:
- { /* '151' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 152:
- { /* '152' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 153:
- { /* '153' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 154:
- { /* '154' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 155:
- { /* '155' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 156:
- { /* '156' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 157:
- { /* '157' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 158:
- { /* '158' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 159:
- { /* '159' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 16:
- { /* '16' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 160:
- { /* '160' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 161:
- { /* '161' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 162:
- { /* '162' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 163:
- { /* '163' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 164:
- { /* '164' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 165:
- { /* '165' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 166:
- { /* '166' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 167:
- { /* '167' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 168:
- { /* '168' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 169:
- { /* '169' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 17:
- { /* '17' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 170:
- { /* '170' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 171:
- { /* '171' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 172:
- { /* '172' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 173:
- { /* '173' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 174:
- { /* '174' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 175:
- { /* '175' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 176:
- { /* '176' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 177:
- { /* '177' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 178:
- { /* '178' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 179:
- { /* '179' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 18:
- { /* '18' */
- return KnxPropertyDataType_PDT_POLL_GROUP_SETTINGS
- }
- case 180:
- { /* '180' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 181:
- { /* '181' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 182:
- { /* '182' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 183:
- { /* '183' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 184:
- { /* '184' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 185:
- { /* '185' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 186:
- { /* '186' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 187:
- { /* '187' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 188:
- { /* '188' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 189:
- { /* '189' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 19:
- { /* '19' */
- return KnxPropertyDataType_PDT_GENERIC_04
- }
- case 190:
- { /* '190' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 191:
- { /* '191' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 192:
- { /* '192' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 193:
- { /* '193' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 194:
- { /* '194' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 195:
- { /* '195' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 196:
- { /* '196' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 197:
- { /* '197' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 198:
- { /* '198' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 199:
- { /* '199' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 2:
- { /* '2' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 20:
- { /* '20' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 200:
- { /* '200' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 201:
- { /* '201' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 202:
- { /* '202' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 203:
- { /* '203' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 204:
- { /* '204' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 205:
- { /* '205' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 206:
- { /* '206' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 207:
- { /* '207' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 208:
- { /* '208' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 209:
- { /* '209' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 21:
- { /* '21' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 210:
- { /* '210' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 211:
- { /* '211' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 212:
- { /* '212' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 213:
- { /* '213' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 214:
- { /* '214' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 215:
- { /* '215' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 22:
- { /* '22' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 23:
- { /* '23' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 24:
- { /* '24' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 25:
- { /* '25' */
- return KnxPropertyDataType_PDT_VERSION
- }
- case 26:
- { /* '26' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 27:
- { /* '27' */
- return KnxPropertyDataType_PDT_GENERIC_08
- }
- case 28:
- { /* '28' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 29:
- { /* '29' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 3:
- { /* '3' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 30:
- { /* '30' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 31:
- { /* '31' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 32:
- { /* '32' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 33:
- { /* '33' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 34:
- { /* '34' */
- return KnxPropertyDataType_PDT_BITSET8
- }
- case 35:
- { /* '35' */
- return KnxPropertyDataType_PDT_GENERIC_10
- }
- case 36:
- { /* '36' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 37:
- { /* '37' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 38:
- { /* '38' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 39:
- { /* '39' */
- return KnxPropertyDataType_PDT_GENERIC_04
- }
- case 4:
- { /* '4' */
- return KnxPropertyDataType_PDT_UNKNOWN
- }
- case 40:
- { /* '40' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 41:
- { /* '41' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 42:
- { /* '42' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 43:
- { /* '43' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 44:
- { /* '44' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 45:
- { /* '45' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 46:
- { /* '46' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 47:
- { /* '47' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 48:
- { /* '48' */
- return KnxPropertyDataType_PDT_BINARY_INFORMATION
- }
- case 49:
- { /* '49' */
- return KnxPropertyDataType_PDT_ENUM8
- }
- case 5:
- { /* '5' */
- return KnxPropertyDataType_PDT_CONTROL
- }
- case 50:
- { /* '50' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 51:
- { /* '51' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 52:
- { /* '52' */
- return KnxPropertyDataType_PDT_GENERIC_10
- }
- case 53:
- { /* '53' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 54:
- { /* '54' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 55:
- { /* '55' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 56:
- { /* '56' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 57:
- { /* '57' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 58:
- { /* '58' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 59:
- { /* '59' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 6:
- { /* '6' */
- return KnxPropertyDataType_PDT_CONTROL
- }
- case 60:
- { /* '60' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 61:
- { /* '61' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 62:
- { /* '62' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 63:
- { /* '63' */
- return KnxPropertyDataType_PDT_GENERIC_02
- }
- case 64:
- { /* '64' */
- return KnxPropertyDataType_PDT_GENERIC_08
- }
- case 65:
- { /* '65' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 66:
- { /* '66' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 67:
- { /* '67' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 68:
- { /* '68' */
- return KnxPropertyDataType_PDT_GENERIC_08
- }
- case 69:
- { /* '69' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 7:
- { /* '7' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 70:
- { /* '70' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 71:
- { /* '71' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 72:
- { /* '72' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 73:
- { /* '73' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 74:
- { /* '74' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 75:
- { /* '75' */
- return KnxPropertyDataType_PDT_GENERIC_01
- }
- case 76:
- { /* '76' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 77:
- { /* '77' */
- return KnxPropertyDataType_PDT_ENUM8
- }
- case 78:
- { /* '78' */
- return KnxPropertyDataType_PDT_BINARY_INFORMATION
- }
- case 79:
- { /* '79' */
- return KnxPropertyDataType_PDT_FUNCTION
- }
- case 8:
- { /* '8' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 80:
- { /* '80' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 81:
- { /* '81' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 82:
- { /* '82' */
- return KnxPropertyDataType_PDT_UNSIGNED_INT
- }
- case 83:
- { /* '83' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 84:
- { /* '84' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 85:
- { /* '85' */
- return KnxPropertyDataType_PDT_BITSET8
- }
- case 86:
- { /* '86' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 87:
- { /* '87' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 88:
- { /* '88' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 89:
- { /* '89' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 9:
- { /* '9' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 90:
- { /* '90' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 91:
- { /* '91' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 92:
- { /* '92' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 93:
- { /* '93' */
- return KnxPropertyDataType_PDT_GENERIC_06
- }
- case 94:
- { /* '94' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 95:
- { /* '95' */
- return KnxPropertyDataType_PDT_UNSIGNED_LONG
- }
- case 96:
- { /* '96' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 97:
- { /* '97' */
- return KnxPropertyDataType_PDT_BITSET16
- }
- case 98:
- { /* '98' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- case 99:
- { /* '99' */
- return KnxPropertyDataType_PDT_UNSIGNED_CHAR
- }
- default:
- {
- return 0
- }
- }
-}
-
-func KnxInterfaceObjectPropertyFirstEnumForFieldPropertyDataType(value KnxPropertyDataType) (KnxInterfaceObjectProperty, error) {
- for _, sizeValue := range KnxInterfaceObjectPropertyValues {
- if sizeValue.PropertyDataType() == value {
- return sizeValue, nil
- }
- }
- return 0, errors.Errorf("enum for %v describing PropertyDataType not found", value)
-}
-
func (e KnxInterfaceObjectProperty) Name() string {
switch e {
case 0:
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
index 416fb0b..fc25e3a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
@@ -616,8 +616,9 @@ const (
KnxManufacturer_M_XEROPOINT KnxManufacturer = 578
KnxManufacturer_M_HONEYWELL_BUILDING_TECHNOLOGIES KnxManufacturer = 579
KnxManufacturer_M_COMFORTCLICK KnxManufacturer = 580
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 581
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 582
+ KnxManufacturer_M_DORBAS_ELECTRIC KnxManufacturer = 581
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 582
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 583
)
var KnxManufacturerValues []KnxManufacturer
@@ -1206,6 +1207,7 @@ func init() {
KnxManufacturer_M_XEROPOINT,
KnxManufacturer_M_HONEYWELL_BUILDING_TECHNOLOGIES,
KnxManufacturer_M_COMFORTCLICK,
+ KnxManufacturer_M_DORBAS_ELECTRIC,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3359,10 +3361,14 @@ func (e KnxManufacturer) Number() uint16 {
}
case 581:
{ /* '581' */
- return 43954
+ return 639
}
case 582:
{ /* '582' */
+ return 43954
+ }
+ case 583:
+ { /* '583' */
return 43959
}
case 59:
@@ -5709,10 +5715,14 @@ func (e KnxManufacturer) Name() string {
}
case 581:
{ /* '581' */
- return "ABB - reserved"
+ return "DORBAS ELECTRIC"
}
case 582:
{ /* '582' */
+ return "ABB - reserved"
+ }
+ case 583:
+ { /* '583' */
return "Busch-Jaeger Elektro - reserved"
}
case 59:
@@ -6985,8 +6995,10 @@ func KnxManufacturerByValue(value uint16) KnxManufacturer {
case 580:
return KnxManufacturer_M_COMFORTCLICK
case 581:
- return KnxManufacturer_M_ABB___RESERVED
+ return KnxManufacturer_M_DORBAS_ELECTRIC
case 582:
+ return KnxManufacturer_M_ABB___RESERVED
+ case 583:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
case 59:
return KnxManufacturer_M_ELECTRAK
@@ -8156,6 +8168,8 @@ func KnxManufacturerByName(value string) KnxManufacturer {
return KnxManufacturer_M_DAETWYLER
case "M_COMFORTCLICK":
return KnxManufacturer_M_COMFORTCLICK
+ case "M_DORBAS_ELECTRIC":
+ return KnxManufacturer_M_DORBAS_ELECTRIC
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -9367,6 +9381,8 @@ func (e KnxManufacturer) name() string {
return "M_DAETWYLER"
case KnxManufacturer_M_COMFORTCLICK:
return "M_COMFORTCLICK"
+ case KnxManufacturer_M_DORBAS_ELECTRIC:
+ return "M_DORBAS_ELECTRIC"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
diff --git a/plc4go/internal/plc4go/modbus/readwrite/ParserHelper.go b/plc4go/internal/plc4go/modbus/readwrite/ParserHelper.go
index 0732302..a99f977 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/ParserHelper.go
@@ -34,6 +34,13 @@ func (m ModbusParserHelper) Parse(typeName string, arguments []string, io utils.
switch typeName {
case "ModbusPDUWriteFileRecordRequestItem":
return model.ModbusPDUWriteFileRecordRequestItemParse(io)
+ case "DataItem":
+ var dataType model.ModbusDataType
+ numberOfValues, err := utils.StrToUint16(arguments[1])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ return model.DataItemParse(io, dataType, numberOfValues)
case "ModbusPDUReadFileRecordResponseItem":
return model.ModbusPDUReadFileRecordResponseItemParse(io)
case "ModbusDeviceInformationObject":
diff --git a/plc4go/internal/plc4go/modbus/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/modbus/readwrite/XmlParserHelper.go
index 00e036b..a8a6781 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/XmlParserHelper.go
@@ -44,6 +44,14 @@ func (m ModbusXmlParserHelper) Parse(typeName string, xmlString string, parserAr
switch typeName {
case "ModbusPDUWriteFileRecordRequestItem":
return model.ModbusPDUWriteFileRecordRequestItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "DataItem":
+ dataType := model.ModbusDataTypeByName(parserArguments[0])
+ parsedUint1, err := strconv.ParseUint(parserArguments[1], 10, 16)
+ if err != nil {
+ return nil, err
+ }
+ numberOfValues := uint16(parsedUint1)
+ return model.DataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), dataType, numberOfValues)
case "ModbusPDUReadFileRecordResponseItem":
return model.ModbusPDUReadFileRecordResponseItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "ModbusDeviceInformationObject":
diff --git a/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go b/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go
index 37e0cb8..ae6f7d6 100644
--- a/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/s7/readwrite/ParserHelper.go
@@ -32,10 +32,26 @@ type S7ParserHelper struct {
func (m S7ParserHelper) Parse(typeName string, arguments []string, io utils.ReadBuffer) (interface{}, error) {
switch typeName {
+ case "DataItem":
+ dataProtocolId, err := utils.StrToString(arguments[0])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ stringLength, err := utils.StrToInt32(arguments[1])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ return model.DataItemParse(io, dataProtocolId, stringLength)
case "SzlId":
return model.SzlIdParse(io)
case "AlarmMessageObjectAckType":
return model.AlarmMessageObjectAckTypeParse(io)
+ case "AlarmMessageAckPushType":
+ return model.AlarmMessageAckPushTypeParse(io)
+ case "S7Message":
+ return model.S7MessageParse(io)
+ case "S7VarPayloadStatusItem":
+ return model.S7VarPayloadStatusItemParse(io)
case "S7Parameter":
messageType, err := utils.StrToUint8(arguments[0])
if err != nil {
@@ -48,6 +64,14 @@ func (m S7ParserHelper) Parse(typeName string, arguments []string, io utils.Read
return nil, errors.Wrap(err, "Error parsing")
}
return model.S7DataAlarmMessageParse(io, cpuFunctionType)
+ case "SzlDataTreeItem":
+ return model.SzlDataTreeItemParse(io)
+ case "COTPPacket":
+ cotpLen, err := utils.StrToUint16(arguments[0])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ return model.COTPPacketParse(io, cotpLen)
case "S7PayloadUserDataItem":
cpuFunctionType, err := utils.StrToUint8(arguments[0])
if err != nil {
@@ -58,35 +82,6 @@ func (m S7ParserHelper) Parse(typeName string, arguments []string, io utils.Read
return nil, errors.Wrap(err, "Error parsing")
}
return model.S7PayloadUserDataItemParse(io, cpuFunctionType, cpuSubfunction)
- case "AlarmMessageObjectPushType":
- return model.AlarmMessageObjectPushTypeParse(io)
- case "AlarmMessagePushType":
- return model.AlarmMessagePushTypeParse(io)
- case "AlarmMessageAckObjectPushType":
- return model.AlarmMessageAckObjectPushTypeParse(io)
- case "S7Payload":
- messageType, err := utils.StrToUint8(arguments[0])
- if err != nil {
- return nil, errors.Wrap(err, "Error parsing")
- }
- var parameter model.S7Parameter
- return model.S7PayloadParse(io, messageType, ¶meter)
- case "S7Address":
- return model.S7AddressParse(io)
- case "AlarmMessageAckPushType":
- return model.AlarmMessageAckPushTypeParse(io)
- case "S7Message":
- return model.S7MessageParse(io)
- case "S7VarPayloadStatusItem":
- return model.S7VarPayloadStatusItemParse(io)
- case "SzlDataTreeItem":
- return model.SzlDataTreeItemParse(io)
- case "COTPPacket":
- cotpLen, err := utils.StrToUint16(arguments[0])
- if err != nil {
- return nil, errors.Wrap(err, "Error parsing")
- }
- return model.COTPPacketParse(io, cotpLen)
case "DateAndTime":
return model.DateAndTimeParse(io)
case "COTPParameter":
@@ -95,14 +90,27 @@ func (m S7ParserHelper) Parse(typeName string, arguments []string, io utils.Read
return nil, errors.Wrap(err, "Error parsing")
}
return model.COTPParameterParse(io, rest)
+ case "AlarmMessageObjectPushType":
+ return model.AlarmMessageObjectPushTypeParse(io)
case "State":
return model.StateParse(io)
+ case "AlarmMessagePushType":
+ return model.AlarmMessagePushTypeParse(io)
case "TPKTPacket":
return model.TPKTPacketParse(io)
case "AlarmMessageAckType":
return model.AlarmMessageAckTypeParse(io)
case "AssociatedValueType":
return model.AssociatedValueTypeParse(io)
+ case "AlarmMessageAckObjectPushType":
+ return model.AlarmMessageAckObjectPushTypeParse(io)
+ case "S7Payload":
+ messageType, err := utils.StrToUint8(arguments[0])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ var parameter model.S7Parameter
+ return model.S7PayloadParse(io, messageType, ¶meter)
case "S7VarRequestParameterItem":
return model.S7VarRequestParameterItemParse(io)
case "S7VarPayloadDataItem":
@@ -113,6 +121,8 @@ func (m S7ParserHelper) Parse(typeName string, arguments []string, io utils.Read
return model.AlarmMessageAckResponseTypeParse(io)
case "AlarmMessageObjectQueryType":
return model.AlarmMessageObjectQueryTypeParse(io)
+ case "S7Address":
+ return model.S7AddressParse(io)
case "S7ParameterUserDataItem":
return model.S7ParameterUserDataItemParse(io)
}
diff --git a/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go
index 8effdcf..8cb3d31 100644
--- a/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/s7/readwrite/XmlParserHelper.go
@@ -42,10 +42,25 @@ func init() {
func (m S7XmlParserHelper) Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error) {
switch typeName {
+ case "DataItem":
+ // TODO: find a way to parse the sub types
+ var dataProtocolId string
+ parsedInt1, err := strconv.ParseInt(parserArguments[1], 10, 32)
+ if err != nil {
+ return nil, err
+ }
+ stringLength := int32(parsedInt1)
+ return model.DataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), dataProtocolId, stringLength)
case "SzlId":
return model.SzlIdParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AlarmMessageObjectAckType":
return model.AlarmMessageObjectAckTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "AlarmMessageAckPushType":
+ return model.AlarmMessageAckPushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "S7Message":
+ return model.S7MessageParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "S7VarPayloadStatusItem":
+ return model.S7VarPayloadStatusItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "S7Parameter":
parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 8)
if err != nil {
@@ -60,6 +75,15 @@ func (m S7XmlParserHelper) Parse(typeName string, xmlString string, parserArgume
}
cpuFunctionType := uint8(parsedUint0)
return model.S7DataAlarmMessageParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), cpuFunctionType)
+ case "SzlDataTreeItem":
+ return model.SzlDataTreeItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "COTPPacket":
+ parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
+ if err != nil {
+ return nil, err
+ }
+ cotpLen := uint16(parsedUint0)
+ return model.COTPPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), cotpLen)
case "S7PayloadUserDataItem":
parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 4)
if err != nil {
@@ -72,38 +96,6 @@ func (m S7XmlParserHelper) Parse(typeName string, xmlString string, parserArgume
}
cpuSubfunction := uint8(parsedUint1)
return model.S7PayloadUserDataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), cpuFunctionType, cpuSubfunction)
- case "AlarmMessageObjectPushType":
- return model.AlarmMessageObjectPushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "AlarmMessagePushType":
- return model.AlarmMessagePushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "AlarmMessageAckObjectPushType":
- return model.AlarmMessageAckObjectPushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "S7Payload":
- parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 8)
- if err != nil {
- return nil, err
- }
- messageType := uint8(parsedUint0)
- // TODO: find a way to parse the sub types
- var parameter model.S7Parameter
- return model.S7PayloadParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), messageType, ¶meter)
- case "S7Address":
- return model.S7AddressParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "AlarmMessageAckPushType":
- return model.AlarmMessageAckPushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "S7Message":
- return model.S7MessageParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "S7VarPayloadStatusItem":
- return model.S7VarPayloadStatusItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "SzlDataTreeItem":
- return model.SzlDataTreeItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
- case "COTPPacket":
- parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
- if err != nil {
- return nil, err
- }
- cotpLen := uint16(parsedUint0)
- return model.COTPPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), cotpLen)
case "DateAndTime":
return model.DateAndTimeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "COTPParameter":
@@ -113,14 +105,29 @@ func (m S7XmlParserHelper) Parse(typeName string, xmlString string, parserArgume
}
rest := uint8(parsedUint0)
return model.COTPParameterParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), rest)
+ case "AlarmMessageObjectPushType":
+ return model.AlarmMessageObjectPushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "State":
return model.StateParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "AlarmMessagePushType":
+ return model.AlarmMessagePushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "TPKTPacket":
return model.TPKTPacketParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AlarmMessageAckType":
return model.AlarmMessageAckTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AssociatedValueType":
return model.AssociatedValueTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "AlarmMessageAckObjectPushType":
+ return model.AlarmMessageAckObjectPushTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "S7Payload":
+ parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 8)
+ if err != nil {
+ return nil, err
+ }
+ messageType := uint8(parsedUint0)
+ // TODO: find a way to parse the sub types
+ var parameter model.S7Parameter
+ return model.S7PayloadParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), messageType, ¶meter)
case "S7VarRequestParameterItem":
return model.S7VarRequestParameterItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "S7VarPayloadDataItem":
@@ -131,6 +138,8 @@ func (m S7XmlParserHelper) Parse(typeName string, xmlString string, parserArgume
return model.AlarmMessageAckResponseTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "AlarmMessageObjectQueryType":
return model.AlarmMessageObjectQueryTypeParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "S7Address":
+ return model.S7AddressParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "S7ParameterUserDataItem":
return model.S7ParameterUserDataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
index 4c64cd0..c23e956 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go
@@ -38,7 +38,6 @@ type ITransportSize interface {
ShortName() uint8
Supported_S7_1500() bool
DataTransportSize() DataTransportSize
- BaseType() TransportSize
DataProtocolId() string
Serialize(writeBuffer utils.WriteBuffer) error
}
@@ -1204,128 +1203,6 @@ func TransportSizeFirstEnumForFieldDataTransportSize(value DataTransportSize) (T
return 0, errors.Errorf("enum for %v describing DataTransportSize not found", value)
}
-func (e TransportSize) BaseType() TransportSize {
- switch e {
- case 0x01:
- { /* '0x01' */
- return 0
- }
- case 0x02:
- { /* '0x02' */
- return 0
- }
- case 0x03:
- { /* '0x03' */
- return 0
- }
- case 0x04:
- { /* '0x04' */
- return TransportSize_WORD
- }
- case 0x05:
- { /* '0x05' */
- return 0
- }
- case 0x06:
- { /* '0x06' */
- return 0
- }
- case 0x07:
- { /* '0x07' */
- return TransportSize_INT
- }
- case 0x08:
- { /* '0x08' */
- return TransportSize_INT
- }
- case 0x09:
- { /* '0x09' */
- return TransportSize_INT
- }
- case 0x0A:
- { /* '0x0A' */
- return TransportSize_INT
- }
- case 0x0B:
- { /* '0x0B' */
- return TransportSize_INT
- }
- case 0x0C:
- { /* '0x0C' */
- return TransportSize_INT
- }
- case 0x0D:
- { /* '0x0D' */
- return TransportSize_INT
- }
- case 0x0E:
- { /* '0x0E' */
- return 0
- }
- case 0x0F:
- { /* '0x0F' */
- return TransportSize_REAL
- }
- case 0x10:
- { /* '0x10' */
- return 0
- }
- case 0x11:
- { /* '0x11' */
- return 0
- }
- case 0x12:
- { /* '0x12' */
- return 0
- }
- case 0x13:
- { /* '0x13' */
- return 0
- }
- case 0x14:
- { /* '0x14' */
- return 0
- }
- case 0x16:
- { /* '0x16' */
- return TransportSize_TIME
- }
- case 0x17:
- { /* '0x17' */
- return 0
- }
- case 0x18:
- { /* '0x18' */
- return 0
- }
- case 0x19:
- { /* '0x19' */
- return 0
- }
- case 0x1A:
- { /* '0x1A' */
- return 0
- }
- case 0x1B:
- { /* '0x1B' */
- return 0
- }
- default:
- {
- return 0
- }
- }
-}
-
-func TransportSizeFirstEnumForFieldBaseType(value TransportSize) (TransportSize, error) {
- for _, sizeValue := range TransportSizeValues {
- if sizeValue.BaseType() == value {
- return sizeValue, nil
- }
- }
- return 0, errors.Errorf("enum for %v describing BaseType not found", value)
-}
-
func (e TransportSize) DataProtocolId() string {
switch e {
case 0x01:
diff --git a/plc4go/internal/plc4go/simulated/readwrite/ParserHelper.go b/plc4go/internal/plc4go/simulated/readwrite/ParserHelper.go
index 79ddab3..5ee4ea5 100644
--- a/plc4go/internal/plc4go/simulated/readwrite/ParserHelper.go
+++ b/plc4go/internal/plc4go/simulated/readwrite/ParserHelper.go
@@ -32,6 +32,16 @@ type SimulatedParserHelper struct {
func (m SimulatedParserHelper) Parse(typeName string, arguments []string, io utils.ReadBuffer) (interface{}, error) {
switch typeName {
+ case "DataItem":
+ dataType, err := utils.StrToString(arguments[0])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ numberOfValues, err := utils.StrToUint16(arguments[1])
+ if err != nil {
+ return nil, errors.Wrap(err, "Error parsing")
+ }
+ return model.DataItemParse(io, dataType, numberOfValues)
case "Dummy":
return model.DummyParse(io)
}
diff --git a/plc4go/internal/plc4go/simulated/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/simulated/readwrite/XmlParserHelper.go
index af40f78..0b5a2ba 100644
--- a/plc4go/internal/plc4go/simulated/readwrite/XmlParserHelper.go
+++ b/plc4go/internal/plc4go/simulated/readwrite/XmlParserHelper.go
@@ -42,6 +42,15 @@ func init() {
func (m SimulatedXmlParserHelper) Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error) {
switch typeName {
+ case "DataItem":
+ // TODO: find a way to parse the sub types
+ var dataType string
+ parsedUint1, err := strconv.ParseUint(parserArguments[1], 10, 16)
+ if err != nil {
+ return nil, err
+ }
+ numberOfValues := uint16(parsedUint1)
+ return model.DataItemParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)), dataType, numberOfValues)
case "Dummy":
return model.DummyParse(utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
}
diff --git a/plc4go/internal/plc4go/spi/utils/CastUtils.go b/plc4go/internal/plc4go/spi/utils/CastUtils.go
index c144642..e945b8e 100644
--- a/plc4go/internal/plc4go/spi/utils/CastUtils.go
+++ b/plc4go/internal/plc4go/spi/utils/CastUtils.go
@@ -142,3 +142,15 @@ func StrToUint32(str string) (uint32, error) {
}
return uint32(intVal), nil
}
+
+func StrToInt32(str string) (int32, error) {
+ intVal, err := strconv.ParseInt(str, 10, 32)
+ if err != nil {
+ return 0, err
+ }
+ return int32(intVal), nil
+}
+
+func StrToString(s string) (string, error) {
+ return s, nil
+}
diff --git a/protocols/s7/src/main/resources/protocols/s7/s7.mspec b/protocols/s7/src/main/resources/protocols/s7/s7.mspec
index 96c497e..b1a5819 100644
--- a/protocols/s7/src/main/resources/protocols/s7/s7.mspec
+++ b/protocols/s7/src/main/resources/protocols/s7/s7.mspec
@@ -667,9 +667,9 @@
[enum uint 8 DataTransportSize(bit sizeInBits)
['0x00' NULL ['false']]
- ['0x03' BIT ['true']]
- ['0x04' BYTE_WORD_DWORD ['true']]
- ['0x05' INTEGER ['true']]
+ ['0x03' BIT ['true' ]]
+ ['0x04' BYTE_WORD_DWORD ['true' ]]
+ ['0x05' INTEGER ['true' ]]
['0x06' DINTEGER ['false']]
['0x07' REAL ['false']]
['0x09' OCTET_STRING ['false']]