diff --git a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java index f32f0eade77..1634b2e36bd 100644 --- a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java +++ b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java @@ -510,7 +510,7 @@ public boolean isEnumField(Field field) { if (isSimpleTypeReference(typeReference)) { return false; } - TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typedField.getType()); + TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference); return typeDefinition instanceof EnumTypeDefinition; } 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 0eb16eb17e7..5a9e5c5257a 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 @@ -540,7 +540,7 @@ String getCastExpressionForTypeReference(TypeReference typeReference) { } private String toExpression(Field field, TypeReference fieldType, Term term, List parserArguments, List serializerArguments, boolean serialize, boolean suppressPointerAccess) { - Tracer tracer = Tracer.start("toExpression(suppressPointerAccess="+suppressPointerAccess+")"); + Tracer tracer = Tracer.start("toExpression(suppressPointerAccess=" + suppressPointerAccess + ")"); if (term == null) { return ""; } @@ -563,9 +563,10 @@ private String toTernaryTermExpression(Field field, TypeReference fieldType, Ter Term a = ternaryTerm.getA(); Term b = ternaryTerm.getB(); Term c = ternaryTerm.getC(); + String castExpressionForTypeReference = getCastExpressionForTypeReference(fieldType); return tracer + "utils.InlineIf(" + toExpression(field, new DefaultBooleanTypeReference(), a, parserArguments, serializerArguments, serialize, false) + ", " + - "func() interface{} {return " + getCastExpressionForTypeReference(fieldType) + "(" + toExpression(field, fieldType, b, parserArguments, serializerArguments, serialize, false) + ")}, " + - "func() interface{} {return " + getCastExpressionForTypeReference(fieldType) + "(" + toExpression(field, fieldType, c, parserArguments, serializerArguments, serialize, false) + ")}).(" + getCastExpressionForTypeReference(fieldType) + ")"; + "func() interface{} {return " + castExpressionForTypeReference + "(" + toExpression(field, fieldType, b, parserArguments, serializerArguments, serialize, false) + ")}, " + + "func() interface{} {return " + castExpressionForTypeReference + "(" + toExpression(field, fieldType, c, parserArguments, serializerArguments, serialize, false) + ")}).(" + castExpressionForTypeReference + ")"; } else { throw new RuntimeException("Unsupported ternary operation type " + ternaryTerm.getOperation()); } @@ -663,26 +664,31 @@ private String toLiteralTermExpression(Field field, TypeReference fieldType, Ter } private String toVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean serialize, boolean suppressPointerAccess) { - Tracer tracer = Tracer.start("toVariableExpression"); - if ("lengthInBytes".equals(variableLiteral.getName())) { + return toVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, false); + } + + private String toVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean serialize, boolean suppressPointerAccess, boolean isChild) { + Tracer tracer = Tracer.start("toVariableExpression(serialize=" + serialize + ")"); + String variableLiteralName = variableLiteral.getName(); + if ("lengthInBytes".equals(variableLiteralName)) { return toLengthInBytesVariableExpression(typeReference, serialize, tracer); - } else if ("lengthInBits".equals(variableLiteral.getName())) { + } else if ("lengthInBits".equals(variableLiteralName)) { return toLengthInBitsVariableExpression(typeReference, serialize, tracer); - } else if ("_value".equals(variableLiteral.getName())) { + } else if ("_value".equals(variableLiteralName)) { return toValueVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer); } if ("length".equals(variableLiteral.getChild().map(VariableLiteral::getName).orElse(""))) { return toLengthVariableExpression(field, variableLiteral, serialize, tracer); } // If this literal references an Enum type, then we have to output it differently. - else if (getTypeDefinitions().get(variableLiteral.getName()) instanceof EnumTypeDefinition) { + else if (getTypeDefinitions().get(variableLiteralName) instanceof EnumTypeDefinition) { return toEnumVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, suppressPointerAccess, tracer); } // If we are accessing enum constants, these also need to be output differently. else if (thisType.isComplexTypeDefinition() && thisType.asComplexTypeDefinition() .orElseThrow(IllegalAccessError::new) - .getPropertyFieldByName(variableLiteral.getName()) + .getPropertyFieldByName(variableLiteralName) .filter(EnumField.class::isInstance) .isPresent() && (variableLiteral.getChild().isPresent()) @@ -693,11 +699,22 @@ else if (thisType.isComplexTypeDefinition() else if (!serialize && thisType.isComplexTypeDefinition() && thisType.asComplexTypeDefinition() .orElseThrow(IllegalStateException::new) - .getPropertyFieldByName(variableLiteral.getName()) + .getPropertyFieldByName(variableLiteralName) .filter(OptionalField.class::isInstance) .isPresent() ) { return toOptionalVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, suppressPointerAccess, tracer); + } // If we are accessing optional fields, (we might need to use pointer-access). + else if (thisType.isComplexTypeDefinition() + && thisType.asComplexTypeDefinition() + .orElseThrow(IllegalStateException::new) + .getPropertyFieldByName(variableLiteralName) + .filter(OptionalField.class::isInstance) + .isPresent() + ) { + tracer = tracer.dive("optional fields 2"); + return tracer + "(" + (suppressPointerAccess ? "" : "*") + "m.Get"+capitalize(variableLiteral.getName()) + "())" + + variableLiteral.getChild().map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true))).orElse(""); } // If we are accessing implicit fields, we need to rely on local variable instead. //else if (isVariableLiteralImplicitField(vl)) { @@ -708,34 +725,35 @@ else if (!serialize && thisType.isComplexTypeDefinition() // If we are accessing implicit fields, we need to rely on a local variable instead. // CAST expressions are special as we need to add a ".class" to the second parameter in Java. - else if ("CAST".equals(variableLiteral.getName())) { + else if ("CAST".equals(variableLiteralName)) { return toCastVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer); - } else if ("STATIC_CALL".equals(variableLiteral.getName())) { + } else if ("STATIC_CALL".equals(variableLiteralName)) { return toStaticCallVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer); - } else if ("COUNT".equals(variableLiteral.getName())) { + } else if ("COUNT".equals(variableLiteralName)) { return toCountVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer); - } else if ("ARRAY_SIZE_IN_BYTES".equals(variableLiteral.getName())) { + } else if ("ARRAY_SIZE_IN_BYTES".equals(variableLiteralName)) { return toArraySizeInBytesVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, suppressPointerAccess, tracer); - } else if ("CEIL".equals(variableLiteral.getName())) { + } else if ("CEIL".equals(variableLiteralName)) { return toCeilVariableExpression(field, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer); } // All uppercase names are not fields, but utility methods. - else if (variableLiteral.getName().equals(variableLiteral.getName().toUpperCase())) { + else if (variableLiteralName.equals(variableLiteralName.toUpperCase())) { + tracer = tracer.dive("utility"); return toUppercaseVariableExpression(field, typeReference, variableLiteral, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer); } // If the current property references a discriminator value, we have to serialize it differently. else if (thisType.isComplexTypeDefinition() && thisType.asComplexTypeDefinition() .orElseThrow(IllegalStateException::new) - .getPropertyFieldFromThisOrParentByName(variableLiteral.getName()) + .getPropertyFieldFromThisOrParentByName(variableLiteralName) .filter(DiscriminatorField.class::isInstance) .isPresent()) { tracer = tracer.dive("discriminator value"); // TODO: Should this return something? } // 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()) && (getTypeReferenceForProperty(((ComplexTypeDefinition) thisType), variableLiteral.getName()).isPresent())) { + else if ((variableLiteral.getChild().isPresent()) && (getTypeReferenceForProperty(((ComplexTypeDefinition) thisType), variableLiteralName).isPresent())) { tracer = tracer.dive("child element"); - final Optional typeReferenceForProperty = getTypeReferenceForProperty(((ComplexTypeDefinition) thisType), variableLiteral.getName()) + final Optional typeReferenceForProperty = getTypeReferenceForProperty(((ComplexTypeDefinition) thisType), variableLiteralName) .flatMap(TypeReferenceConversions::asComplexTypeReference); if (typeReferenceForProperty.isPresent()) { tracer = tracer.dive("complex"); @@ -751,13 +769,17 @@ else if ((variableLiteral.getChild().isPresent()) && (getTypeReferenceForPropert .filter(curField -> (curField instanceof DiscriminatorField) && ((DiscriminatorField) curField).getName().equals(childProperty)) .findFirst(); if (matchingDiscriminatorField.isPresent()) { - return tracer + "Cast" + getLanguageTypeNameForTypeReference(complexTypeReference) + "(" + variableLiteral.getName() + ").Child." + capitalize(childProperty) + "()"; + return tracer + "Cast" + getLanguageTypeNameForTypeReference(complexTypeReference) + "(" + variableLiteralName + ").Child." + capitalize(childProperty) + "()"; } // TODO: is this really meant to fall through? tracer = tracer.dive("we fell through the complex complex"); } else if (typeDefinition instanceof EnumTypeDefinition) { tracer = tracer.dive("enum"); - return tracer + (serialize ? "m." + capitalize(variableLiteral.getName()) : variableLiteral.getName()) + + String variableAccess = variableLiteralName; + if (isChild) { + variableAccess = "Get" + capitalize(variableLiteralName) + "()"; + } + return tracer + (serialize ? "m.Get" + capitalize(variableLiteralName) + "()" : variableAccess) + "." + capitalize(variableLiteral.getChild().orElseThrow(() -> new RuntimeException("enum needs a child")).getName()) + "()"; } } @@ -770,17 +792,17 @@ else if ((variableLiteral.getChild().isPresent()) && (getTypeReferenceForPropert final ImplicitField referencedImplicitField = getReferencedImplicitField(variableLiteral); return tracer + toSerializationExpression(referencedImplicitField, referencedImplicitField.getType(), getReferencedImplicitField(variableLiteral).getSerializeExpression(), serializerArguments); } else { - return tracer + variableLiteral.getName(); + return tracer + variableLiteralName; //return toParseExpression(getReferencedImplicitField(vl), getReferencedImplicitField(vl).getSerializeExpression(), serializerArguments); } } - // If the current term references a serialization argument, handle it differently (don't prefix it with "m.") - else if ((serializerArguments != null) && serializerArguments.stream() - .anyMatch(argument -> argument.getName().equals(variableLiteral.getName()))) { + + if ((serializerArguments != null) && serializerArguments.stream() + .anyMatch(argument -> argument.getName().equals(variableLiteralName))) { tracer = tracer.dive("serialization argument"); - return tracer + variableLiteral.getName() + + return tracer + "m." + capitalize(variableLiteralName) + variableLiteral.getChild() - .map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess))) + .map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true))) .orElse(""); } String indexCall = ""; @@ -789,15 +811,21 @@ else if ((serializerArguments != null) && serializerArguments.stream() // We have a index call indexCall = "[" + variableLiteral.getIndex() + "]"; } - return tracer + (serialize ? "m." + capitalize(variableLiteral.getName()) : variableLiteral.getName()) + indexCall + + tracer = tracer.dive("else"); + Tracer tracer2 = tracer; + String variableAccess = variableLiteralName; + if (isChild) { + variableAccess = "Get" + capitalize(variableAccess) + "()"; + } + return tracer + (serialize ? "m.Get" + capitalize(variableLiteralName) + "()" : variableAccess) + indexCall + variableLiteral.getChild() - .map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess))) + .map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true))) .orElse(""); } private String toUppercaseVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean serialize, boolean suppressPointerAccess, Tracer tracer) { tracer = tracer.dive("toUppercaseVariableExpression"); - StringBuilder sb = new StringBuilder(capitalize(variableLiteral.getName())); + StringBuilder sb = new StringBuilder("Get" + capitalize(variableLiteral.getName()) + "()"); if (variableLiteral.getArgs().isPresent()) { sb.append("("); boolean firstArg = true; @@ -814,7 +842,7 @@ private String toUppercaseVariableExpression(Field field, TypeReference typeRefe sb.append("[").append(variableLiteral.getIndex()).append("]"); } return tracer + sb.toString() + variableLiteral.getChild() - .map(child -> "." + toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess)) + .map(child -> "." + toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true)) .orElse(""); } @@ -849,7 +877,7 @@ private String toArraySizeInBytesVariableExpression(Field field, TypeReference t } StringBuilder sb = new StringBuilder(); if (isSerializerArg) { - sb.append(va.getName()).append(va.getChild().map(child -> "." + toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, true, suppressPointerAccess)).orElse("")); + sb.append(va.getName()).append(va.getChild().map(child -> "." + toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, true, suppressPointerAccess, true)).orElse("")); } else { sb.append(toVariableExpression(field, typeReference, va, parserArguments, serializerArguments, true, suppressPointerAccess)); } @@ -905,7 +933,7 @@ private String toStaticCallVariableExpression(Field field, TypeReference typeRef } if (isParserArg) { if (va.getName().equals("_value")) { - sb.append(va.getName().substring(1)).append(va.getChild().map(child -> "." + toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess)).orElse("")); + sb.append(va.getName().substring(1)).append(va.getChild().map(child -> "." + toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true)).orElse("")); } else { sb.append(va.getName()).append((va.getChild().isPresent()) ? "." + toVariableExpression(field, typeReference, variableLiteral.getChild().orElseThrow(IllegalStateException::new), parserArguments, serializerArguments, false, suppressPointerAccess) : ""); @@ -939,12 +967,12 @@ else if (isTypeArg) { } else if (arg instanceof BooleanLiteral) { tracer = tracer.dive("BooleanLiteral"); sb.append(((BooleanLiteral) arg).getValue()); - }else if (arg instanceof NumericLiteral) { + } else if (arg instanceof NumericLiteral) { tracer = tracer.dive("NumericLiteral"); sb.append(((NumericLiteral) arg).getNumber()); } else if (arg instanceof BinaryTerm) { tracer = tracer.dive("BinaryTerm"); - sb.append(toBinaryTermExpression(field, typeReference,(BinaryTerm) arg, parserArguments,serializerArguments,serialize,tracer)); + sb.append(toBinaryTermExpression(field, typeReference, (BinaryTerm) arg, parserArguments, serializerArguments, serialize, tracer)); } else { throw new RuntimeException(arg.getClass().getName()); } @@ -974,49 +1002,49 @@ private String toCastVariableExpression(Field field, TypeReference typeReference } sb.append(typeLiteral.getValue()); sb.append("(").append(toVariableExpression(field, typeReference, firstArgument, parserArguments, serializerArguments, serialize, suppressPointerAccess)).append(")"); - return tracer + sb.toString() + variableLiteral.getChild().map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess))).orElse(""); + return tracer + sb.toString() + variableLiteral.getChild().map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true))).orElse(""); } private String toOptionalVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean suppressPointerAccess, Tracer tracer) { tracer = tracer.dive("optional fields"); return tracer + "(" + (suppressPointerAccess ? "" : "*") + variableLiteral.getName() + ")" + - variableLiteral.getChild().map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess))).orElse(""); + variableLiteral.getChild().map(child -> "." + capitalize(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true))).orElse(""); } private String toConstantVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean suppressPointerAccess, Tracer tracer) { tracer = tracer.dive("enum constant"); VariableLiteral child = variableLiteral.getChild().orElseThrow(IllegalStateException::new); return tracer + variableLiteral.getName() + "." + capitalize(child.getName()) + "()" + - child.getChild().map(childChild -> "." + toVariableExpression(field, typeReference, childChild, parserArguments, serializerArguments, false, suppressPointerAccess)).orElse(""); + child.getChild().map(childChild -> "." + toVariableExpression(field, typeReference, childChild, parserArguments, serializerArguments, false, suppressPointerAccess, true)).orElse(""); } private String toEnumVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean suppressPointerAccess, Tracer tracer) { tracer = tracer.dive("enum"); VariableLiteral child = variableLiteral.getChild().orElseThrow(() -> new RuntimeException("Enum should have a child")); return tracer + variableLiteral.getName() + "_" + child.getName() + - child.getChild().map(childChild -> "." + toVariableExpression(field, typeReference, childChild, parserArguments, serializerArguments, false, suppressPointerAccess)).orElse(""); + child.getChild().map(childChild -> "." + toVariableExpression(field, typeReference, childChild, parserArguments, serializerArguments, false, suppressPointerAccess, true)).orElse(""); } private String toLengthVariableExpression(Field field, VariableLiteral variableLiteral, boolean serialize, Tracer tracer) { tracer = tracer.dive("length"); - return tracer + (serialize ? ("len(m." + capitalize(variableLiteral.getName()) + ")") : ("(" + variableLiteral.getName() + ")")); + return tracer + (serialize ? ("len(m.Get" + capitalize(variableLiteral.getName()) + "())") : ("(" + variableLiteral.getName() + ")")); } private String toValueVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List parserArguments, List serializerArguments, boolean serialize, boolean suppressPointerAccess, Tracer tracer) { final Tracer tracer2 = tracer.dive("_value"); return variableLiteral.getChild() - .map(child -> tracer2.dive("withChild") +"m."+ toUppercaseVariableExpression(field, typeReference, child, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer2)) + .map(child -> tracer2.dive("withChild") + "m." + toUppercaseVariableExpression(field, typeReference, child, parserArguments, serializerArguments, serialize, suppressPointerAccess, tracer2)) .orElse(tracer2 + "m"); } private String toLengthInBitsVariableExpression(TypeReference typeReference, boolean serialize, Tracer tracer) { tracer = tracer.dive("lengthInBits"); - return tracer + (serialize ? getCastExpressionForTypeReference(typeReference) + "(m." : "") + "LengthInBits()" + (serialize ? ")" : ""); + return tracer + (serialize ? getCastExpressionForTypeReference(typeReference) + "(m.Get" : "Get") + "LengthInBits" + (serialize ? "())" : "()"); } private String toLengthInBytesVariableExpression(TypeReference typeReference, boolean serialize, Tracer tracer) { tracer = tracer.dive("lengthInBytes"); - return tracer + (serialize ? getCastExpressionForTypeReference(typeReference) + "(m." : "") + "LengthInBytes()" + (serialize ? ")" : ""); + return tracer + (serialize ? getCastExpressionForTypeReference(typeReference) + "(m.Get" : "Get") + "LengthInBytes" + (serialize ? "())" : "()"); } public String getSizeInBits(ComplexTypeDefinition complexTypeDefinition, List parserArguments) { diff --git a/code-generation/language-go/src/main/resources/templates/go/data-io-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/data-io-template.go.ftlh index dd338411d19..f754d538b50 100644 --- a/code-generation/language-go/src/main/resources/templates/go/data-io-template.go.ftlh +++ b/code-generation/language-go/src/main/resources/templates/go/data-io-template.go.ftlh @@ -85,7 +85,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if parserArguments?has_conte <#assign enumValue=helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)> <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)> <#assign enumValueTraces=tracer.extractTraces(enumValue)> - ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces} + ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")} <#else> ${helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)} @@ -204,6 +204,18 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if parserArguments?has_conte } func ${type.name}Serialize(writeBuffer utils.WriteBuffer, value api.PlcValue<#if parserArguments?has_content>, <#list parserArguments as parserArgument>${parserArgument.name} <#if helper.isComplexTypeReference(parserArgument.type) && !helper.isEnumTypeReference(parserArgument.type)>I${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}<#sep>, ) error { + <#if parserArguments?has_content> + m := struct { + <#list parserArguments as parserArgument> + ${parserArgument.name?cap_first} <#if helper.isComplexTypeReference(parserArgument.type) && !helper.isEnumTypeReference(parserArgument.type)>I${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} + + }{ + <#list parserArguments as parserArgument> + ${parserArgument.name?cap_first}: ${parserArgument.name}, + + } + _ = m + writeBuffer.PushContext("${type.name}") switch { <#assign defaultSet=false> @@ -221,7 +233,7 @@ func ${type.name}Serialize(writeBuffer utils.WriteBuffer, value api.PlcValue<#if <#assign enumValue=helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)> <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)> <#assign enumValueTraces=tracer.extractTraces(enumValue)> - ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces} + ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")} <#else> ${helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)} 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 de67b1e0077..09f700094b3 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 @@ -162,13 +162,13 @@ func Cast${type.name}(structType interface{}) ${type.name} { return castFunc(structType) } -func (m ${type.name}) LengthInBits() uint16 { +func (m ${type.name}) GetLengthInBits() uint16 { <#assign simpleTypeReference = type.type.asSimpleTypeReference().orElseThrow()> return <#if type.type.isStringTypeReference()>0<#else>${simpleTypeReference.sizeInBits} } -func (m ${type.name}) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ${type.name}) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } <#if type.type?has_content && helper.isSimpleTypeReference(type.type)> 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 4b8ef56dd49..41b1472ea72 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 @@ -91,9 +91,14 @@ type ${type.name} struct { ${field.name?cap_first} <#if field.loopType??>[]<#if helper.needsPointerAccess(field)>*${helper.getLanguageTypeNameForField(field)} -<#if type.virtualFields?has_content> - <#list type.virtualFields as field> - ${field.name?cap_first} <#if field.loopType??>[]<#if helper.needsPointerAccess(field)>*${helper.getLanguageTypeNameForField(field)} +<#if parserArguments?has_content> + <#assign filteredParserArguments=parserArguments?filter(arg -> !type.isDiscriminatorField(arg.name) && !type.getPropertyFieldFromThisOrParentByName(arg.name).isPresent())> + +<#if filteredParserArguments?has_content> + + // Arguments. + <#list filteredParserArguments as parserArgument> + ${parserArgument.name?cap_first} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} <#if type.isDiscriminatedParentTypeDefinition()> @@ -123,10 +128,10 @@ type I${type.name} interface { // Get${field.name?cap_first} returns ${field.name?cap_first} Get${field.name?cap_first}() <#if field.loopType??>[]<#if helper.needsPointerAccess(field)>*${helper.getLanguageTypeNameForTypeReference(typeRef)} - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -152,7 +157,7 @@ func (m *${type.name}) ${discriminatorName?cap_first}() <#if typeRef.isComplexTy <#assign enumValue=helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)> <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)> <#assign enumValueTraces=tracer.extractTraces(enumValue)> - ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces} + ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")} <#else> ${helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)} @@ -177,7 +182,7 @@ func (m *${type.name}) Get${discriminatorName?cap_first}() <#if typeRef.isComple <#assign enumValue=helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)> <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)> <#assign enumValueTraces=tracer.extractTraces(enumValue)> - ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces} + ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")} <#else> ${helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)} @@ -212,14 +217,6 @@ type I${type.name}Child interface { ${helper.getLanguageTypeNameForField(field)} <#sep>, - <#if type.virtualFields?has_content>, - <#list type.virtualFields as field> - ${field.name} - <#if field.loopType??>[] - <#if helper.needsPointerAccess(field)>* - ${helper.getLanguageTypeNameForField(field)} - <#sep>, - ) @@ -247,24 +244,12 @@ func (m *${type.name}) InitializeParent(parent *${type.parentType.name} ${helper.getLanguageTypeNameForField(parentField)} <#sep>, - <#assign parentTypeHasVritualFields=type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields?has_content> - <#if parentTypeHasVritualFields>, - <#list type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields as parentField> - ${parentField.name} - <#if parentField.loopType??>[] - <#if helper.needsPointerAccess(parentField)>* - ${helper.getLanguageTypeNameForField(parentField)} - <#sep>, - ) { <#list type.parentType.asComplexTypeDefinition().orElseThrow().allPropertyFields as field> m.${type.parentType.name}.${field.name?cap_first} = ${field.name} - <#list type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields as field> - m.${type.parentType.name}.${field.name?cap_first} = ${field.name} - } /////////////////////////////////////////////////////////// @@ -284,50 +269,69 @@ func (m *${type.name}) Get${field.name?cap_first}() <#if field.loopType??>[] <#assign typeRef=field.asTypedField().orElseThrow().type> func (m *${type.name}) Get${field.name?cap_first}() <#if field.loopType??>[]<#if helper.needsPointerAccess(field)>*${helper.getLanguageTypeNameForTypeReference(typeRef)} { - // TODO: calculation should happen here instead accessing the stored field - return m.${field.name?cap_first} + <#list type.propertyFields?filter(f->f.isOptionalField()) as field> + ${field.name} := m.${field.name?cap_first} + _ = ${field.name} + + return ${helper.toSerializationExpression(field, field.type, field.valueExpression, parserArguments)} } +<#if type.parentType?has_content && type.parentType.allParserArguments.isPresent()> + <#assign filteredParentParserArguments = type.parentType.allParserArguments.orElseThrow()?filter(arg -> !type.parentType.asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))> + + +// New${type.name} factory function for ${type.name} <@compress single_line=true> func New${type.name}( <#list type.propertyFields as field> ${field.name} <#if field.loopType??>[]<#if helper.needsPointerAccess(field)>*${helper.getLanguageTypeNameForField(field)} <#sep>, - <#if type.propertyFields?has_content && type.virtualFields?has_content>, - <#list type.virtualFields as field> - ${field.name} <#if field.loopType??>[]<#if helper.needsPointerAccess(field)>*${helper.getLanguageTypeNameForField(field)}<#sep>, - <#if type.parentType?has_content> - <#if (type.propertyFields?has_content || type.virtualFields?has_content ) && type.parentPropertyFields?has_content>, + <#if type.propertyFields?has_content && type.parentPropertyFields?has_content>, <#list type.parentPropertyFields as parentField> ${parentField.name} <#if parentField.loopType??>[]<#if helper.needsPointerAccess(parentField)>*${helper.getLanguageTypeNameForField(parentField)} <#sep>, - <#if (type.propertyFields?has_content || type.virtualFields?has_content || type.parentPropertyFields?has_content) && type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields?has_content>, - <#list type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields as parentField> - ${parentField.name} <#if parentField.loopType??>[]<#if helper.needsPointerAccess(parentField)>*${helper.getLanguageTypeNameForField(parentField)} + + <#if filteredParserArguments?has_content> + <#if type.allPropertyFields?has_content>, + <#list filteredParserArguments as parserArgument> + ${parserArgument.name} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} <#sep>, - + ) *<#if type.parentType?has_content>${type.parentType.name}<#else>${type.name} { + <#if type.parentType?has_content> child := &${type.name}{ <#list type.propertyFields as field> ${field.name?cap_first}: ${field.name}, - <#list type.virtualFields as field> - ${field.name?cap_first}: ${field.name}, - - ${type.parentType.name}: New${type.parentType.name}(<#list type.parentPropertyFields as parentField>${parentField.name}<#sep>, <#if type.parentPropertyFields?has_content && type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields?has_content>, <#list type.parentType.asComplexTypeDefinition().orElseThrow().virtualFields as parentField>${parentField.name}<#sep>, ), + ${type.parentType.name}: New${type.parentType.name}(<#list type.parentPropertyFields as parentField>${parentField.name}<#sep>, <#if filteredParentParserArguments?has_content><#if type.parentPropertyFields?has_content>, <#list filteredParentParserArguments as arg>${arg.name}<#sep>, ), } child.Child = child return child.${type.parentType.name} <#else> - return &${type.name}{<#list type.propertyFields as field>${field.name?cap_first}: ${field.name}<#sep>, <#if type.propertyFields?has_content && type.virtualFields?has_content>, <#list type.virtualFields as field>${field.name?cap_first}: ${field.name}<#sep>, } + <@compress single_line=true> + return &${type.name}{ + <#list type.propertyFields as field> + ${field.name?cap_first}: ${field.name} + <#sep>, + + <#if filteredParserArguments?has_content> + <#if type.propertyFields?has_content>, + <#list filteredParserArguments as parserArgument> + ${parserArgument.name?cap_first}: ${parserArgument.name} + <#sep>, + + + } + + } @@ -356,17 +360,17 @@ func (m *${type.name}) GetTypeName() string { return "${type.name}" } -func (m *${type.name}) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *${type.name}) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } <#-- TODO: use serializer args instead of a fixed bool for one case --> -func (m *${type.name}) LengthInBitsConditional(lastItem bool) uint16 { +func (m *${type.name}) GetLengthInBitsConditional(lastItem bool) uint16 { <#if type.isDiscriminatedParentTypeDefinition()> - return m.Child.LengthInBits() + return m.Child.GetLengthInBits() <#else> <#if type.isDiscriminatedChildTypeDefinition()> - lengthInBits := uint16(m.ParentLengthInBits()) + lengthInBits := uint16(m.GetParentLengthInBits()) <#else> lengthInBits := uint16(0) @@ -387,10 +391,10 @@ func (m *${type.name}) LengthInBitsConditional(lastItem bool) uint16 { <#if arrayField.isCountArrayField()> for i, element := range m.${arrayField.name?cap_first} { last := i == len(m.${arrayField.name?cap_first}) -1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) <#else> for _, element := range m.${arrayField.name?cap_first} { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } @@ -469,7 +473,7 @@ func (m *${type.name}) LengthInBitsConditional(lastItem bool) uint16 { <#elseif helper.isEnumField(field)> lengthInBits += ${helper.getEnumBaseTypeReference(optionalField.type).sizeInBits} <#else> - lengthInBits += (*m.${optionalField.name?cap_first}).LengthInBits() + lengthInBits += (*m.${optionalField.name?cap_first}).GetLengthInBits() } <#break> @@ -505,14 +509,14 @@ func (m *${type.name}) LengthInBitsConditional(lastItem bool) uint16 { <#elseif helper.isEnumField(field)> lengthInBits += ${helper.getEnumBaseTypeReference(simpleField.type).sizeInBits} <#else> - lengthInBits += m.${simpleField.name?cap_first}.LengthInBits() + lengthInBits += m.${simpleField.name?cap_first}.GetLengthInBits() <#break> <#case "switch"> <#assign switchField = field.asSwitchField().orElseThrow()> // Length of sub-type elements will be added by sub-type... - lengthInBits += m.Child.LengthInBits() + lengthInBits += m.Child.GetLengthInBits() <#break> <#case "unknown"> <#assign unknownField = field.asUnknownField().orElseThrow()> @@ -535,7 +539,7 @@ func (m *${type.name}) LengthInBitsConditional(lastItem bool) uint16 { } <#if type.isDiscriminatedParentTypeDefinition()> -func (m *${type.name}) ParentLengthInBits() uint16 { +func (m *${type.name}) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) <#list type.fields as field> <#switch field.typeName> @@ -554,10 +558,10 @@ func (m *${type.name}) ParentLengthInBits() uint16 { <#if arrayField.isCountArrayField()> for i, element := range m.${arrayField.name?cap_first} { last := i >= len(m.${arrayField.name?cap_first}) -1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) <#else> for _, element := range m.${arrayField.name?cap_first} { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } @@ -598,7 +602,7 @@ func (m *${type.name}) ParentLengthInBits() uint16 { <#elseif helper.isEnumField(discriminatorField)> lengthInBits += ${helper.getEnumBaseTypeReference(discriminatorField.type).sizeInBits}; <#else> - lengthInBits += ${discriminatorField.name}.getLengthInBits(); + lengthInBits += ${discriminatorField.name}.GetLengthInBits(); <#break> <#case "enum"> @@ -637,7 +641,7 @@ func (m *${type.name}) ParentLengthInBits() uint16 { <#elseif helper.isEnumField(field)> lengthInBits += ${helper.getEnumBaseTypeReference(optionalField.type).sizeInBits} <#else> - lengthInBits += (*m.${optionalField.name?cap_first}).LengthInBits() + lengthInBits += (*m.${optionalField.name?cap_first}).GetLengthInBits() } <#break> @@ -673,7 +677,7 @@ func (m *${type.name}) ParentLengthInBits() uint16 { <#elseif helper.isEnumField(field)> lengthInBits += ${helper.getEnumBaseTypeReference(simpleField.type).sizeInBits} <#else> - lengthInBits += m.${simpleField.name?cap_first}.LengthInBits() + lengthInBits += m.${simpleField.name?cap_first}.GetLengthInBits() <#break> <#case "unknown"> @@ -696,8 +700,8 @@ func (m *${type.name}) ParentLengthInBits() uint16 { } -func (m *${type.name}) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *${type.name}) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } <#assign hasParserArguments=parserArguments?has_content/> @@ -1278,7 +1282,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa <#assign enumValue=helper.toParseExpression(null, discriminatorType,discriminatorValueTerm, parserArguments)> <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)> <#assign enumValueTraces=tracer.extractTraces(enumValue)> - ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces} + ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")} <#else> ${helper.toParseExpression(null, discriminatorType,discriminatorValueTerm, parserArguments)} @@ -1321,6 +1325,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa // Virtual field _${virtualField.name} := ${helper.toParseExpression(virtualField, virtualField.type, virtualField.valueExpression, parserArguments)} ${virtualField.name} := ${helper.getLanguageTypeNameForTypeReference(virtualField.type)}(_${virtualField.name}) + _ = ${virtualField.name} <#break> <#case "validation"> <#assign validationField = field.asValidationField().orElseThrow()> @@ -1398,11 +1403,6 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa ${field.name} <#sep>, - <#if type.virtualFields?has_content>, - <#list type.virtualFields as field> - ${field.name} - <#sep>, - ) @@ -1413,16 +1413,13 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa <#list type.propertyFields as field> ${field.name?cap_first}: <#if helper.isComplex(field) && !helper.isEnumField(field) && !field.isArrayField() && !field.isManualArrayField()>Cast${helper.getLanguageTypeNameForField(field)}(${field.name}<#if helper.isComplex(field) && !helper.isEnumField(field) && !field.isArrayField() && !field.isManualArrayField()>), - <#list type.virtualFields as field> - ${field.name?cap_first}: <#if helper.isComplex(field) && !helper.isEnumField(field) && !field.isArrayField() && !field.isManualArrayField()>Cast${helper.getLanguageTypeNameForField(field)}(${field.name}<#if helper.isComplex(field) && !helper.isEnumField(field) && !field.isArrayField() && !field.isManualArrayField()>), - ${type.parentType.name}: &${type.parentType.name}{}, } _child.${type.parentType.name}.Child = _child return _child.${type.parentType.name}, nil <#else> // Create the instance - return New${type.name}(<#list type.propertyFields as field>${field.name}<#sep>, <#if type.propertyFields?has_content && type.virtualFields?has_content>, <#list type.virtualFields as field>${field.name}<#sep>, ), nil + return New${type.name}(<#list type.propertyFields as field>${field.name}<#sep>, <#if filteredParserArguments?has_content><#if type.propertyFields?has_content>, <#list filteredParserArguments as arg><#if arg.type.isComplexTypeReference() && !helper.isEnumTypeReference(arg.type)>*${arg.name}<#sep>, ), nil } @@ -1450,7 +1447,7 @@ func (m *${type.name}) Serialize(writeBuffer utils.WriteBuffer) error { ${key}ArraySizeInBytes := func(items []*${typeName}) uint32 { var sizeInBytes uint32 = 0 for _, v := range items { - sizeInBytes += uint32(v.LengthInBytes()) + sizeInBytes += uint32(v.GetLengthInBytes()) } return sizeInBytes } @@ -1721,7 +1718,7 @@ func (m *${type.name}) Serialize(writeBuffer utils.WriteBuffer) error { <#assign typedField = field.asTypedField().orElseThrow()> <#assign namedField = field.asNamedField().orElseThrow()> // Virtual field - if _${namedField.name}Err := writeBuffer.WriteVirtual("${namedField.name}", m.${namedField.name?cap_first}); _${namedField.name}Err != nil { + if _${namedField.name}Err := writeBuffer.WriteVirtual("${namedField.name}", m.Get${namedField.name?cap_first}()); _${namedField.name}Err != nil { return errors.Wrap(_${namedField.name}Err, "Error serializing '${namedField.name}' field")<@emitImport import="github.com/pkg/errors" /> } <#break> diff --git a/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml index 681c2de98e5..ffd9e5a0483 100644 --- a/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml +++ b/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml @@ -522,10 +522,10 @@ - 106 - 9 - 23 - 6 + 106 + 9 + 23 + 6 @@ -545,10 +545,10 @@ - 23 - 9 - 54 - 0 + 23 + 9 + 54 + 0 @@ -7767,10 +7767,10 @@ make -f wp.mak clean - 106 - 9 - 23 - -1 + 106 + 9 + 23 + 255 @@ -7790,10 +7790,10 @@ make -f wp.mak clean - 23 - 21 - 13 - 0 + 23 + 21 + 13 + 0 diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go index d68bf387d56..339d6036bb6 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go @@ -32,10 +32,10 @@ type CIPEncapsulationConnectionRequest struct { // The corresponding interface type ICIPEncapsulationConnectionRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -66,6 +66,7 @@ func (m *CIPEncapsulationConnectionRequest) InitializeParent(parent *CIPEncapsul // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCIPEncapsulationConnectionRequest factory function for CIPEncapsulationConnectionRequest func NewCIPEncapsulationConnectionRequest(sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *CIPEncapsulationPacket { child := &CIPEncapsulationConnectionRequest{ CIPEncapsulationPacket: NewCIPEncapsulationPacket(sessionHandle, status, senderContext, options), @@ -97,18 +98,18 @@ func (m *CIPEncapsulationConnectionRequest) GetTypeName() string { return "CIPEncapsulationConnectionRequest" } -func (m *CIPEncapsulationConnectionRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CIPEncapsulationConnectionRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CIPEncapsulationConnectionRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CIPEncapsulationConnectionRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *CIPEncapsulationConnectionRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CIPEncapsulationConnectionRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CIPEncapsulationConnectionRequestParse(readBuffer utils.ReadBuffer) (*CIPEncapsulationPacket, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go index e144e8eb694..2ecf4bb7e57 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go @@ -32,10 +32,10 @@ type CIPEncapsulationConnectionResponse struct { // The corresponding interface type ICIPEncapsulationConnectionResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -66,6 +66,7 @@ func (m *CIPEncapsulationConnectionResponse) InitializeParent(parent *CIPEncapsu // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCIPEncapsulationConnectionResponse factory function for CIPEncapsulationConnectionResponse func NewCIPEncapsulationConnectionResponse(sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *CIPEncapsulationPacket { child := &CIPEncapsulationConnectionResponse{ CIPEncapsulationPacket: NewCIPEncapsulationPacket(sessionHandle, status, senderContext, options), @@ -97,18 +98,18 @@ func (m *CIPEncapsulationConnectionResponse) GetTypeName() string { return "CIPEncapsulationConnectionResponse" } -func (m *CIPEncapsulationConnectionResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CIPEncapsulationConnectionResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CIPEncapsulationConnectionResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CIPEncapsulationConnectionResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *CIPEncapsulationConnectionResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CIPEncapsulationConnectionResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CIPEncapsulationConnectionResponseParse(readBuffer utils.ReadBuffer) (*CIPEncapsulationPacket, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go index 31351a3283e..b1e8662b1fa 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go @@ -48,10 +48,10 @@ type ICIPEncapsulationPacket interface { GetSenderContext() []uint8 // GetOptions returns Options GetOptions() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *CIPEncapsulationPacket) GetOptions() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCIPEncapsulationPacket factory function for CIPEncapsulationPacket func NewCIPEncapsulationPacket(sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *CIPEncapsulationPacket { return &CIPEncapsulationPacket{SessionHandle: sessionHandle, Status: status, SenderContext: senderContext, Options: options} } @@ -112,15 +113,15 @@ func (m *CIPEncapsulationPacket) GetTypeName() string { return "CIPEncapsulationPacket" } -func (m *CIPEncapsulationPacket) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CIPEncapsulationPacket) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CIPEncapsulationPacket) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *CIPEncapsulationPacket) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *CIPEncapsulationPacket) ParentLengthInBits() uint16 { +func (m *CIPEncapsulationPacket) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (commandType) lengthInBits += 16 @@ -148,8 +149,8 @@ func (m *CIPEncapsulationPacket) ParentLengthInBits() uint16 { return lengthInBits } -func (m *CIPEncapsulationPacket) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CIPEncapsulationPacket) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CIPEncapsulationPacketParse(readBuffer utils.ReadBuffer) (*CIPEncapsulationPacket, error) { @@ -271,7 +272,7 @@ func (m *CIPEncapsulationPacket) SerializeParent(writeBuffer utils.WriteBuffer, } // Implicit Field (len) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - len := uint16(uint16(uint16(m.LengthInBytes())) - uint16(uint16(28))) + len := uint16(uint16(uint16(m.GetLengthInBytes())) - uint16(uint16(28))) _lenErr := writeBuffer.WriteUint16("len", 16, (len)) if _lenErr != nil { return errors.Wrap(_lenErr, "Error serializing 'len' field") diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go index 3c125149cb1..7fd17bc61fc 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go @@ -36,10 +36,10 @@ type CIPEncapsulationReadRequest struct { type ICIPEncapsulationReadRequest interface { // GetRequest returns Request GetRequest() *DF1RequestMessage - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,6 +73,7 @@ func (m *CIPEncapsulationReadRequest) GetRequest() *DF1RequestMessage { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCIPEncapsulationReadRequest factory function for CIPEncapsulationReadRequest func NewCIPEncapsulationReadRequest(request *DF1RequestMessage, sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *CIPEncapsulationPacket { child := &CIPEncapsulationReadRequest{ Request: request, @@ -105,21 +106,21 @@ func (m *CIPEncapsulationReadRequest) GetTypeName() string { return "CIPEncapsulationReadRequest" } -func (m *CIPEncapsulationReadRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CIPEncapsulationReadRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CIPEncapsulationReadRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CIPEncapsulationReadRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (request) - lengthInBits += m.Request.LengthInBits() + lengthInBits += m.Request.GetLengthInBits() return lengthInBits } -func (m *CIPEncapsulationReadRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CIPEncapsulationReadRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CIPEncapsulationReadRequestParse(readBuffer utils.ReadBuffer) (*CIPEncapsulationPacket, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go index 47e904dec10..21d1a9ba298 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go @@ -30,16 +30,19 @@ import ( type CIPEncapsulationReadResponse struct { *CIPEncapsulationPacket Response *DF1ResponseMessage + + // Arguments. + Len uint16 } // The corresponding interface type ICIPEncapsulationReadResponse interface { // GetResponse returns Response GetResponse() *DF1ResponseMessage - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,7 +76,8 @@ func (m *CIPEncapsulationReadResponse) GetResponse() *DF1ResponseMessage { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCIPEncapsulationReadResponse(response *DF1ResponseMessage, sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *CIPEncapsulationPacket { +// NewCIPEncapsulationReadResponse factory function for CIPEncapsulationReadResponse +func NewCIPEncapsulationReadResponse(response *DF1ResponseMessage, sessionHandle uint32, status uint32, senderContext []uint8, options uint32, len uint16) *CIPEncapsulationPacket { child := &CIPEncapsulationReadResponse{ Response: response, CIPEncapsulationPacket: NewCIPEncapsulationPacket(sessionHandle, status, senderContext, options), @@ -105,21 +109,21 @@ func (m *CIPEncapsulationReadResponse) GetTypeName() string { return "CIPEncapsulationReadResponse" } -func (m *CIPEncapsulationReadResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CIPEncapsulationReadResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CIPEncapsulationReadResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CIPEncapsulationReadResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (response) - lengthInBits += m.Response.LengthInBits() + lengthInBits += m.Response.GetLengthInBits() return lengthInBits } -func (m *CIPEncapsulationReadResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CIPEncapsulationReadResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CIPEncapsulationReadResponseParse(readBuffer utils.ReadBuffer, len uint16) (*CIPEncapsulationPacket, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go index 5ab16d0e62b..86c0be3c041 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go @@ -36,10 +36,10 @@ type DF1CommandRequestMessage struct { type IDF1CommandRequestMessage interface { // GetCommand returns Command GetCommand() *DF1RequestCommand - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,6 +73,7 @@ func (m *DF1CommandRequestMessage) GetCommand() *DF1RequestCommand { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1CommandRequestMessage factory function for DF1CommandRequestMessage func NewDF1CommandRequestMessage(command *DF1RequestCommand, destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16) *DF1RequestMessage { child := &DF1CommandRequestMessage{ Command: command, @@ -105,21 +106,21 @@ func (m *DF1CommandRequestMessage) GetTypeName() string { return "DF1CommandRequestMessage" } -func (m *DF1CommandRequestMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1CommandRequestMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1CommandRequestMessage) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1CommandRequestMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (command) - lengthInBits += m.Command.LengthInBits() + lengthInBits += m.Command.GetLengthInBits() return lengthInBits } -func (m *DF1CommandRequestMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1CommandRequestMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1CommandRequestMessageParse(readBuffer utils.ReadBuffer) (*DF1RequestMessage, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go index de612d18e1d..7dfbc71ea71 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go @@ -30,16 +30,19 @@ import ( type DF1CommandResponseMessageProtectedTypedLogicalRead struct { *DF1ResponseMessage Data []uint8 + + // Arguments. + PayloadLength uint16 } // The corresponding interface type IDF1CommandResponseMessageProtectedTypedLogicalRead interface { // GetData returns Data GetData() []uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,10 +76,11 @@ func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) GetData() []uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewDF1CommandResponseMessageProtectedTypedLogicalRead(data []uint8, destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16) *DF1ResponseMessage { +// NewDF1CommandResponseMessageProtectedTypedLogicalRead factory function for DF1CommandResponseMessageProtectedTypedLogicalRead +func NewDF1CommandResponseMessageProtectedTypedLogicalRead(data []uint8, destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16, payloadLength uint16) *DF1ResponseMessage { child := &DF1CommandResponseMessageProtectedTypedLogicalRead{ Data: data, - DF1ResponseMessage: NewDF1ResponseMessage(destinationAddress, sourceAddress, status, transactionCounter), + DF1ResponseMessage: NewDF1ResponseMessage(destinationAddress, sourceAddress, status, transactionCounter, payloadLength), } child.Child = child return child.DF1ResponseMessage @@ -105,12 +109,12 @@ func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) GetTypeName() strin return "DF1CommandResponseMessageProtectedTypedLogicalRead" } -func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Data) > 0 { @@ -120,8 +124,8 @@ func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) LengthInBitsConditi return lengthInBits } -func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1CommandResponseMessageProtectedTypedLogicalReadParse(readBuffer utils.ReadBuffer, payloadLength uint16) (*DF1ResponseMessage, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go index fbc74d043c9..32bba0aada6 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go @@ -35,10 +35,10 @@ type DF1RequestCommand struct { type IDF1RequestCommand interface { // FunctionCode returns FunctionCode FunctionCode() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IDF1RequestCommandChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1RequestCommand factory function for DF1RequestCommand func NewDF1RequestCommand() *DF1RequestCommand { return &DF1RequestCommand{} } @@ -84,15 +85,15 @@ func (m *DF1RequestCommand) GetTypeName() string { return "DF1RequestCommand" } -func (m *DF1RequestCommand) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1RequestCommand) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1RequestCommand) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *DF1RequestCommand) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *DF1RequestCommand) ParentLengthInBits() uint16 { +func (m *DF1RequestCommand) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (functionCode) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *DF1RequestCommand) ParentLengthInBits() uint16 { return lengthInBits } -func (m *DF1RequestCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1RequestCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1RequestCommandParse(readBuffer utils.ReadBuffer) (*DF1RequestCommand, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go index c3ee772b551..40fb43625b4 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go @@ -48,10 +48,10 @@ type IDF1RequestMessage interface { GetStatus() uint8 // GetTransactionCounter returns TransactionCounter GetTransactionCounter() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *DF1RequestMessage) GetTransactionCounter() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1RequestMessage factory function for DF1RequestMessage func NewDF1RequestMessage(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16) *DF1RequestMessage { return &DF1RequestMessage{DestinationAddress: destinationAddress, SourceAddress: sourceAddress, Status: status, TransactionCounter: transactionCounter} } @@ -112,15 +113,15 @@ func (m *DF1RequestMessage) GetTypeName() string { return "DF1RequestMessage" } -func (m *DF1RequestMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1RequestMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1RequestMessage) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *DF1RequestMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *DF1RequestMessage) ParentLengthInBits() uint16 { +func (m *DF1RequestMessage) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (destinationAddress) @@ -143,8 +144,8 @@ func (m *DF1RequestMessage) ParentLengthInBits() uint16 { return lengthInBits } -func (m *DF1RequestMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1RequestMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1RequestMessageParse(readBuffer utils.ReadBuffer) (*DF1RequestMessage, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go index febcdc222c6..754adf27704 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go @@ -48,10 +48,10 @@ type IDF1RequestProtectedTypedLogicalRead interface { GetElementNumber() uint8 // GetSubElementNumber returns SubElementNumber GetSubElementNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -96,6 +96,7 @@ func (m *DF1RequestProtectedTypedLogicalRead) GetSubElementNumber() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1RequestProtectedTypedLogicalRead factory function for DF1RequestProtectedTypedLogicalRead func NewDF1RequestProtectedTypedLogicalRead(byteSize uint8, fileNumber uint8, fileType uint8, elementNumber uint8, subElementNumber uint8) *DF1RequestCommand { child := &DF1RequestProtectedTypedLogicalRead{ ByteSize: byteSize, @@ -132,12 +133,12 @@ func (m *DF1RequestProtectedTypedLogicalRead) GetTypeName() string { return "DF1RequestProtectedTypedLogicalRead" } -func (m *DF1RequestProtectedTypedLogicalRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1RequestProtectedTypedLogicalRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1RequestProtectedTypedLogicalRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1RequestProtectedTypedLogicalRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (byteSize) lengthInBits += 8 @@ -157,8 +158,8 @@ func (m *DF1RequestProtectedTypedLogicalRead) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *DF1RequestProtectedTypedLogicalRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1RequestProtectedTypedLogicalRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1RequestProtectedTypedLogicalReadParse(readBuffer utils.ReadBuffer) (*DF1RequestCommand, error) { diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go index 4469a60274b..94a3c535922 100644 --- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go +++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go @@ -33,7 +33,10 @@ type DF1ResponseMessage struct { SourceAddress uint8 Status uint8 TransactionCounter uint16 - Child IDF1ResponseMessageChild + + // Arguments. + PayloadLength uint16 + Child IDF1ResponseMessageChild } // The corresponding interface @@ -48,10 +51,10 @@ type IDF1ResponseMessage interface { GetStatus() uint8 // GetTransactionCounter returns TransactionCounter GetTransactionCounter() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,8 +94,9 @@ func (m *DF1ResponseMessage) GetTransactionCounter() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewDF1ResponseMessage(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16) *DF1ResponseMessage { - return &DF1ResponseMessage{DestinationAddress: destinationAddress, SourceAddress: sourceAddress, Status: status, TransactionCounter: transactionCounter} +// NewDF1ResponseMessage factory function for DF1ResponseMessage +func NewDF1ResponseMessage(destinationAddress uint8, sourceAddress uint8, status uint8, transactionCounter uint16, payloadLength uint16) *DF1ResponseMessage { + return &DF1ResponseMessage{DestinationAddress: destinationAddress, SourceAddress: sourceAddress, Status: status, TransactionCounter: transactionCounter, PayloadLength: payloadLength} } func CastDF1ResponseMessage(structType interface{}) *DF1ResponseMessage { @@ -112,15 +116,15 @@ func (m *DF1ResponseMessage) GetTypeName() string { return "DF1ResponseMessage" } -func (m *DF1ResponseMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1ResponseMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1ResponseMessage) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *DF1ResponseMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *DF1ResponseMessage) ParentLengthInBits() uint16 { +func (m *DF1ResponseMessage) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Reserved Field (reserved) @@ -146,8 +150,8 @@ func (m *DF1ResponseMessage) ParentLengthInBits() uint16 { return lengthInBits } -func (m *DF1ResponseMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1ResponseMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1ResponseMessageParse(readBuffer utils.ReadBuffer, payloadLength uint16) (*DF1ResponseMessage, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go index 41887b7eaf8..8ef2c19e9a1 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go @@ -52,10 +52,10 @@ type IAdsAddDeviceNotificationRequest interface { GetMaxDelay() uint32 // GetCycleTime returns CycleTime GetCycleTime() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -112,6 +112,7 @@ func (m *AdsAddDeviceNotificationRequest) GetCycleTime() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsAddDeviceNotificationRequest factory function for AdsAddDeviceNotificationRequest func NewAdsAddDeviceNotificationRequest(indexGroup uint32, indexOffset uint32, length uint32, transmissionMode uint32, maxDelay uint32, cycleTime uint32) *AdsData { child := &AdsAddDeviceNotificationRequest{ IndexGroup: indexGroup, @@ -149,12 +150,12 @@ func (m *AdsAddDeviceNotificationRequest) GetTypeName() string { return "AdsAddDeviceNotificationRequest" } -func (m *AdsAddDeviceNotificationRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsAddDeviceNotificationRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsAddDeviceNotificationRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsAddDeviceNotificationRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (indexGroup) lengthInBits += 32 @@ -183,8 +184,8 @@ func (m *AdsAddDeviceNotificationRequest) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *AdsAddDeviceNotificationRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsAddDeviceNotificationRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsAddDeviceNotificationRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go index fd8cb02ebbf..4dacd50d983 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go @@ -39,10 +39,10 @@ type IAdsAddDeviceNotificationResponse interface { GetResult() ReturnCode // GetNotificationHandle returns NotificationHandle GetNotificationHandle() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -83,6 +83,7 @@ func (m *AdsAddDeviceNotificationResponse) GetNotificationHandle() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsAddDeviceNotificationResponse factory function for AdsAddDeviceNotificationResponse func NewAdsAddDeviceNotificationResponse(result ReturnCode, notificationHandle uint32) *AdsData { child := &AdsAddDeviceNotificationResponse{ Result: result, @@ -116,12 +117,12 @@ func (m *AdsAddDeviceNotificationResponse) GetTypeName() string { return "AdsAddDeviceNotificationResponse" } -func (m *AdsAddDeviceNotificationResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsAddDeviceNotificationResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsAddDeviceNotificationResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsAddDeviceNotificationResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -132,8 +133,8 @@ func (m *AdsAddDeviceNotificationResponse) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *AdsAddDeviceNotificationResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsAddDeviceNotificationResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsAddDeviceNotificationResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go index 13ff858f3d0..e758a68c916 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go @@ -37,10 +37,10 @@ type IAdsData interface { CommandId() CommandId // Response returns Response Response() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -65,6 +65,7 @@ type IAdsDataChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsData factory function for AdsData func NewAdsData() *AdsData { return &AdsData{} } @@ -86,22 +87,22 @@ func (m *AdsData) GetTypeName() string { return "AdsData" } -func (m *AdsData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsData) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *AdsData) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *AdsData) ParentLengthInBits() uint16 { +func (m *AdsData) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) return lengthInBits } -func (m *AdsData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsDataParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDataType.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDataType.go index a94a5ec18a3..44dea265445 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDataType.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDataType.go @@ -671,12 +671,12 @@ func CastAdsDataType(structType interface{}) AdsDataType { return castFunc(structType) } -func (m AdsDataType) LengthInBits() uint16 { +func (m AdsDataType) GetLengthInBits() uint16 { return 8 } -func (m AdsDataType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m AdsDataType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsDataTypeParse(readBuffer utils.ReadBuffer) (AdsDataType, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go index 5f59c0ace88..bb69b0a8936 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go @@ -36,10 +36,10 @@ type AdsDeleteDeviceNotificationRequest struct { type IAdsDeleteDeviceNotificationRequest interface { // GetNotificationHandle returns NotificationHandle GetNotificationHandle() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *AdsDeleteDeviceNotificationRequest) GetNotificationHandle() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsDeleteDeviceNotificationRequest factory function for AdsDeleteDeviceNotificationRequest func NewAdsDeleteDeviceNotificationRequest(notificationHandle uint32) *AdsData { child := &AdsDeleteDeviceNotificationRequest{ NotificationHandle: notificationHandle, @@ -108,12 +109,12 @@ func (m *AdsDeleteDeviceNotificationRequest) GetTypeName() string { return "AdsDeleteDeviceNotificationRequest" } -func (m *AdsDeleteDeviceNotificationRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsDeleteDeviceNotificationRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsDeleteDeviceNotificationRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsDeleteDeviceNotificationRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (notificationHandle) lengthInBits += 32 @@ -121,8 +122,8 @@ func (m *AdsDeleteDeviceNotificationRequest) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *AdsDeleteDeviceNotificationRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsDeleteDeviceNotificationRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsDeleteDeviceNotificationRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go index 2dc40f0cb81..68aeba6a407 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go @@ -36,10 +36,10 @@ type AdsDeleteDeviceNotificationResponse struct { type IAdsDeleteDeviceNotificationResponse interface { // GetResult returns Result GetResult() ReturnCode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *AdsDeleteDeviceNotificationResponse) GetResult() ReturnCode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsDeleteDeviceNotificationResponse factory function for AdsDeleteDeviceNotificationResponse func NewAdsDeleteDeviceNotificationResponse(result ReturnCode) *AdsData { child := &AdsDeleteDeviceNotificationResponse{ Result: result, @@ -108,12 +109,12 @@ func (m *AdsDeleteDeviceNotificationResponse) GetTypeName() string { return "AdsDeleteDeviceNotificationResponse" } -func (m *AdsDeleteDeviceNotificationResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsDeleteDeviceNotificationResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsDeleteDeviceNotificationResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsDeleteDeviceNotificationResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -121,8 +122,8 @@ func (m *AdsDeleteDeviceNotificationResponse) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *AdsDeleteDeviceNotificationResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsDeleteDeviceNotificationResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsDeleteDeviceNotificationResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go index fa5613ec0b6..d1f6d140aac 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go @@ -42,10 +42,10 @@ type IAdsDeviceNotificationRequest interface { GetStamps() uint32 // GetAdsStampHeaders returns AdsStampHeaders GetAdsStampHeaders() []*AdsStampHeader - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *AdsDeviceNotificationRequest) GetAdsStampHeaders() []*AdsStampHeader { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsDeviceNotificationRequest factory function for AdsDeviceNotificationRequest func NewAdsDeviceNotificationRequest(length uint32, stamps uint32, adsStampHeaders []*AdsStampHeader) *AdsData { child := &AdsDeviceNotificationRequest{ Length: length, @@ -124,12 +125,12 @@ func (m *AdsDeviceNotificationRequest) GetTypeName() string { return "AdsDeviceNotificationRequest" } -func (m *AdsDeviceNotificationRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsDeviceNotificationRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsDeviceNotificationRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsDeviceNotificationRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (length) lengthInBits += 32 @@ -141,15 +142,15 @@ func (m *AdsDeviceNotificationRequest) LengthInBitsConditional(lastItem bool) ui if len(m.AdsStampHeaders) > 0 { for i, element := range m.AdsStampHeaders { last := i == len(m.AdsStampHeaders)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AdsDeviceNotificationRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsDeviceNotificationRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsDeviceNotificationRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go index bc22c607210..73f12adf3b5 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go @@ -32,10 +32,10 @@ type AdsDeviceNotificationResponse struct { // The corresponding interface type IAdsDeviceNotificationResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *AdsDeviceNotificationResponse) InitializeParent(parent *AdsData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsDeviceNotificationResponse factory function for AdsDeviceNotificationResponse func NewAdsDeviceNotificationResponse() *AdsData { child := &AdsDeviceNotificationResponse{ AdsData: NewAdsData(), @@ -100,18 +101,18 @@ func (m *AdsDeviceNotificationResponse) GetTypeName() string { return "AdsDeviceNotificationResponse" } -func (m *AdsDeviceNotificationResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsDeviceNotificationResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsDeviceNotificationResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsDeviceNotificationResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *AdsDeviceNotificationResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsDeviceNotificationResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsDeviceNotificationResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go index fd363a4c31b..b84970e09cb 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go @@ -32,10 +32,10 @@ type AdsInvalidRequest struct { // The corresponding interface type IAdsInvalidRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *AdsInvalidRequest) InitializeParent(parent *AdsData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsInvalidRequest factory function for AdsInvalidRequest func NewAdsInvalidRequest() *AdsData { child := &AdsInvalidRequest{ AdsData: NewAdsData(), @@ -100,18 +101,18 @@ func (m *AdsInvalidRequest) GetTypeName() string { return "AdsInvalidRequest" } -func (m *AdsInvalidRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsInvalidRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsInvalidRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsInvalidRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *AdsInvalidRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsInvalidRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsInvalidRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go index 2941ba0362e..d87dd3c6d66 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go @@ -32,10 +32,10 @@ type AdsInvalidResponse struct { // The corresponding interface type IAdsInvalidResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *AdsInvalidResponse) InitializeParent(parent *AdsData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsInvalidResponse factory function for AdsInvalidResponse func NewAdsInvalidResponse() *AdsData { child := &AdsInvalidResponse{ AdsData: NewAdsData(), @@ -100,18 +101,18 @@ func (m *AdsInvalidResponse) GetTypeName() string { return "AdsInvalidResponse" } -func (m *AdsInvalidResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsInvalidResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsInvalidResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsInvalidResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *AdsInvalidResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsInvalidResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsInvalidResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go index 399f558b060..b9e24e55096 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go @@ -35,10 +35,10 @@ type AdsMultiRequestItem struct { type IAdsMultiRequestItem interface { // IndexGroup returns IndexGroup IndexGroup() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IAdsMultiRequestItemChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsMultiRequestItem factory function for AdsMultiRequestItem func NewAdsMultiRequestItem() *AdsMultiRequestItem { return &AdsMultiRequestItem{} } @@ -84,22 +85,22 @@ func (m *AdsMultiRequestItem) GetTypeName() string { return "AdsMultiRequestItem" } -func (m *AdsMultiRequestItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsMultiRequestItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsMultiRequestItem) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *AdsMultiRequestItem) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *AdsMultiRequestItem) ParentLengthInBits() uint16 { +func (m *AdsMultiRequestItem) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) return lengthInBits } -func (m *AdsMultiRequestItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsMultiRequestItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsMultiRequestItemParse(readBuffer utils.ReadBuffer, indexGroup uint32) (*AdsMultiRequestItem, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go index f1fa877709b..917ec504458 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go @@ -42,10 +42,10 @@ type IAdsMultiRequestItemRead interface { GetItemIndexOffset() uint32 // GetItemReadLength returns ItemReadLength GetItemReadLength() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *AdsMultiRequestItemRead) GetItemReadLength() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsMultiRequestItemRead factory function for AdsMultiRequestItemRead func NewAdsMultiRequestItemRead(itemIndexGroup uint32, itemIndexOffset uint32, itemReadLength uint32) *AdsMultiRequestItem { child := &AdsMultiRequestItemRead{ ItemIndexGroup: itemIndexGroup, @@ -116,12 +117,12 @@ func (m *AdsMultiRequestItemRead) GetTypeName() string { return "AdsMultiRequestItemRead" } -func (m *AdsMultiRequestItemRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsMultiRequestItemRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsMultiRequestItemRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsMultiRequestItemRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (itemIndexGroup) lengthInBits += 32 @@ -135,8 +136,8 @@ func (m *AdsMultiRequestItemRead) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *AdsMultiRequestItemRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsMultiRequestItemRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsMultiRequestItemReadParse(readBuffer utils.ReadBuffer, indexGroup uint32) (*AdsMultiRequestItem, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go index dff31972518..5915c40de0d 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go @@ -45,10 +45,10 @@ type IAdsMultiRequestItemReadWrite interface { GetItemReadLength() uint32 // GetItemWriteLength returns ItemWriteLength GetItemWriteLength() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,6 +89,7 @@ func (m *AdsMultiRequestItemReadWrite) GetItemWriteLength() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsMultiRequestItemReadWrite factory function for AdsMultiRequestItemReadWrite func NewAdsMultiRequestItemReadWrite(itemIndexGroup uint32, itemIndexOffset uint32, itemReadLength uint32, itemWriteLength uint32) *AdsMultiRequestItem { child := &AdsMultiRequestItemReadWrite{ ItemIndexGroup: itemIndexGroup, @@ -124,12 +125,12 @@ func (m *AdsMultiRequestItemReadWrite) GetTypeName() string { return "AdsMultiRequestItemReadWrite" } -func (m *AdsMultiRequestItemReadWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsMultiRequestItemReadWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsMultiRequestItemReadWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsMultiRequestItemReadWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (itemIndexGroup) lengthInBits += 32 @@ -146,8 +147,8 @@ func (m *AdsMultiRequestItemReadWrite) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *AdsMultiRequestItemReadWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsMultiRequestItemReadWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsMultiRequestItemReadWriteParse(readBuffer utils.ReadBuffer, indexGroup uint32) (*AdsMultiRequestItem, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go index e6c1752354d..0870b31ba66 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go @@ -42,10 +42,10 @@ type IAdsMultiRequestItemWrite interface { GetItemIndexOffset() uint32 // GetItemWriteLength returns ItemWriteLength GetItemWriteLength() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *AdsMultiRequestItemWrite) GetItemWriteLength() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsMultiRequestItemWrite factory function for AdsMultiRequestItemWrite func NewAdsMultiRequestItemWrite(itemIndexGroup uint32, itemIndexOffset uint32, itemWriteLength uint32) *AdsMultiRequestItem { child := &AdsMultiRequestItemWrite{ ItemIndexGroup: itemIndexGroup, @@ -116,12 +117,12 @@ func (m *AdsMultiRequestItemWrite) GetTypeName() string { return "AdsMultiRequestItemWrite" } -func (m *AdsMultiRequestItemWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsMultiRequestItemWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsMultiRequestItemWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsMultiRequestItemWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (itemIndexGroup) lengthInBits += 32 @@ -135,8 +136,8 @@ func (m *AdsMultiRequestItemWrite) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *AdsMultiRequestItemWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsMultiRequestItemWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsMultiRequestItemWriteParse(readBuffer utils.ReadBuffer, indexGroup uint32) (*AdsMultiRequestItem, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go index 121131c98cb..f5413ebf746 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go @@ -41,10 +41,10 @@ type IAdsNotificationSample interface { GetSampleSize() uint32 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *AdsNotificationSample) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsNotificationSample factory function for AdsNotificationSample func NewAdsNotificationSample(notificationHandle uint32, sampleSize uint32, data []byte) *AdsNotificationSample { return &AdsNotificationSample{NotificationHandle: notificationHandle, SampleSize: sampleSize, Data: data} } @@ -89,11 +90,11 @@ func (m *AdsNotificationSample) GetTypeName() string { return "AdsNotificationSample" } -func (m *AdsNotificationSample) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsNotificationSample) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsNotificationSample) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AdsNotificationSample) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (notificationHandle) @@ -110,8 +111,8 @@ func (m *AdsNotificationSample) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsNotificationSample) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsNotificationSample) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsNotificationSampleParse(readBuffer utils.ReadBuffer) (*AdsNotificationSample, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go index 8b681471672..c40326676c5 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go @@ -32,10 +32,10 @@ type AdsReadDeviceInfoRequest struct { // The corresponding interface type IAdsReadDeviceInfoRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *AdsReadDeviceInfoRequest) InitializeParent(parent *AdsData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadDeviceInfoRequest factory function for AdsReadDeviceInfoRequest func NewAdsReadDeviceInfoRequest() *AdsData { child := &AdsReadDeviceInfoRequest{ AdsData: NewAdsData(), @@ -100,18 +101,18 @@ func (m *AdsReadDeviceInfoRequest) GetTypeName() string { return "AdsReadDeviceInfoRequest" } -func (m *AdsReadDeviceInfoRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadDeviceInfoRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadDeviceInfoRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadDeviceInfoRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *AdsReadDeviceInfoRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadDeviceInfoRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadDeviceInfoRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go index e24c9527f51..dd02eae6e5e 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go @@ -48,10 +48,10 @@ type IAdsReadDeviceInfoResponse interface { GetVersion() uint16 // GetDevice returns Device GetDevice() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -104,6 +104,7 @@ func (m *AdsReadDeviceInfoResponse) GetDevice() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadDeviceInfoResponse factory function for AdsReadDeviceInfoResponse func NewAdsReadDeviceInfoResponse(result ReturnCode, majorVersion uint8, minorVersion uint8, version uint16, device []byte) *AdsData { child := &AdsReadDeviceInfoResponse{ Result: result, @@ -140,12 +141,12 @@ func (m *AdsReadDeviceInfoResponse) GetTypeName() string { return "AdsReadDeviceInfoResponse" } -func (m *AdsReadDeviceInfoResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadDeviceInfoResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadDeviceInfoResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadDeviceInfoResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -167,8 +168,8 @@ func (m *AdsReadDeviceInfoResponse) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *AdsReadDeviceInfoResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadDeviceInfoResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadDeviceInfoResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go index a099ab4a152..babcf1241d5 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go @@ -42,10 +42,10 @@ type IAdsReadRequest interface { GetIndexOffset() uint32 // GetLength returns Length GetLength() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *AdsReadRequest) GetLength() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadRequest factory function for AdsReadRequest func NewAdsReadRequest(indexGroup uint32, indexOffset uint32, length uint32) *AdsData { child := &AdsReadRequest{ IndexGroup: indexGroup, @@ -124,12 +125,12 @@ func (m *AdsReadRequest) GetTypeName() string { return "AdsReadRequest" } -func (m *AdsReadRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (indexGroup) lengthInBits += 32 @@ -143,8 +144,8 @@ func (m *AdsReadRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsReadRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go index cefdae818d6..4cd3e50f2a0 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go @@ -39,10 +39,10 @@ type IAdsReadResponse interface { GetResult() ReturnCode // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -83,6 +83,7 @@ func (m *AdsReadResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadResponse factory function for AdsReadResponse func NewAdsReadResponse(result ReturnCode, data []byte) *AdsData { child := &AdsReadResponse{ Result: result, @@ -116,12 +117,12 @@ func (m *AdsReadResponse) GetTypeName() string { return "AdsReadResponse" } -func (m *AdsReadResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -137,8 +138,8 @@ func (m *AdsReadResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsReadResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { @@ -205,7 +206,7 @@ func (m *AdsReadResponse) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint32(uint32(len(m.Data))) + length := uint32(uint32(len(m.GetData()))) _lengthErr := writeBuffer.WriteUint32("length", 32, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go index 9b3a3fe50f8..779a800a952 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go @@ -32,10 +32,10 @@ type AdsReadStateRequest struct { // The corresponding interface type IAdsReadStateRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *AdsReadStateRequest) InitializeParent(parent *AdsData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadStateRequest factory function for AdsReadStateRequest func NewAdsReadStateRequest() *AdsData { child := &AdsReadStateRequest{ AdsData: NewAdsData(), @@ -100,18 +101,18 @@ func (m *AdsReadStateRequest) GetTypeName() string { return "AdsReadStateRequest" } -func (m *AdsReadStateRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadStateRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadStateRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadStateRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *AdsReadStateRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadStateRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadStateRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go index 5b2d23eab81..783d252c8de 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go @@ -42,10 +42,10 @@ type IAdsReadStateResponse interface { GetAdsState() uint16 // GetDeviceState returns DeviceState GetDeviceState() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *AdsReadStateResponse) GetDeviceState() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadStateResponse factory function for AdsReadStateResponse func NewAdsReadStateResponse(result ReturnCode, adsState uint16, deviceState uint16) *AdsData { child := &AdsReadStateResponse{ Result: result, @@ -124,12 +125,12 @@ func (m *AdsReadStateResponse) GetTypeName() string { return "AdsReadStateResponse" } -func (m *AdsReadStateResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadStateResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadStateResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadStateResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -143,8 +144,8 @@ func (m *AdsReadStateResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsReadStateResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadStateResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadStateResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go index 4fc79917961..c5fcf4b4a89 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go @@ -48,10 +48,10 @@ type IAdsReadWriteRequest interface { GetItems() []*AdsMultiRequestItem // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -104,6 +104,7 @@ func (m *AdsReadWriteRequest) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadWriteRequest factory function for AdsReadWriteRequest func NewAdsReadWriteRequest(indexGroup uint32, indexOffset uint32, readLength uint32, items []*AdsMultiRequestItem, data []byte) *AdsData { child := &AdsReadWriteRequest{ IndexGroup: indexGroup, @@ -140,12 +141,12 @@ func (m *AdsReadWriteRequest) GetTypeName() string { return "AdsReadWriteRequest" } -func (m *AdsReadWriteRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadWriteRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadWriteRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (indexGroup) lengthInBits += 32 @@ -163,7 +164,7 @@ func (m *AdsReadWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } @@ -175,8 +176,8 @@ func (m *AdsReadWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsReadWriteRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadWriteRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadWriteRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { @@ -282,7 +283,7 @@ func (m *AdsReadWriteRequest) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (writeLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - writeLength := uint32(uint32(uint32(uint32(uint32(len(m.Items)))*uint32(uint32(utils.InlineIf(bool(bool((m.IndexGroup) == (61570))), func() interface{} { return uint32(uint32(16)) }, func() interface{} { return uint32(uint32(12)) }).(uint32))))) + uint32(uint32(len(m.Data)))) + writeLength := uint32(uint32(uint32(uint32(uint32(len(m.GetItems())))*uint32(uint32(utils.InlineIf(bool(bool((m.GetIndexGroup()) == (61570))), func() interface{} { return uint32(uint32(16)) }, func() interface{} { return uint32(uint32(12)) }).(uint32))))) + uint32(uint32(len(m.GetData())))) _writeLengthErr := writeBuffer.WriteUint32("writeLength", 32, (writeLength)) if _writeLengthErr != nil { return errors.Wrap(_writeLengthErr, "Error serializing 'writeLength' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go index b49ca94f33a..dd91ee5c68b 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go @@ -39,10 +39,10 @@ type IAdsReadWriteResponse interface { GetResult() ReturnCode // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -83,6 +83,7 @@ func (m *AdsReadWriteResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsReadWriteResponse factory function for AdsReadWriteResponse func NewAdsReadWriteResponse(result ReturnCode, data []byte) *AdsData { child := &AdsReadWriteResponse{ Result: result, @@ -116,12 +117,12 @@ func (m *AdsReadWriteResponse) GetTypeName() string { return "AdsReadWriteResponse" } -func (m *AdsReadWriteResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsReadWriteResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsReadWriteResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsReadWriteResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -137,8 +138,8 @@ func (m *AdsReadWriteResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsReadWriteResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsReadWriteResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsReadWriteResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { @@ -205,7 +206,7 @@ func (m *AdsReadWriteResponse) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint32(uint32(len(m.Data))) + length := uint32(uint32(len(m.GetData()))) _lengthErr := writeBuffer.WriteUint32("length", 32, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go index 868f3141023..7bd7ba80960 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go @@ -41,10 +41,10 @@ type IAdsStampHeader interface { GetSamples() uint32 // GetAdsNotificationSamples returns AdsNotificationSamples GetAdsNotificationSamples() []*AdsNotificationSample - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *AdsStampHeader) GetAdsNotificationSamples() []*AdsNotificationSample { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsStampHeader factory function for AdsStampHeader func NewAdsStampHeader(timestamp uint64, samples uint32, adsNotificationSamples []*AdsNotificationSample) *AdsStampHeader { return &AdsStampHeader{Timestamp: timestamp, Samples: samples, AdsNotificationSamples: adsNotificationSamples} } @@ -89,11 +90,11 @@ func (m *AdsStampHeader) GetTypeName() string { return "AdsStampHeader" } -func (m *AdsStampHeader) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsStampHeader) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsStampHeader) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AdsStampHeader) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (timestamp) @@ -106,15 +107,15 @@ func (m *AdsStampHeader) LengthInBitsConditional(lastItem bool) uint16 { if len(m.AdsNotificationSamples) > 0 { for i, element := range m.AdsNotificationSamples { last := i == len(m.AdsNotificationSamples)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AdsStampHeader) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsStampHeader) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsStampHeaderParse(readBuffer utils.ReadBuffer) (*AdsStampHeader, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go index 5ce3b6c3730..7e1f320fea6 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go @@ -42,10 +42,10 @@ type IAdsWriteControlRequest interface { GetDeviceState() uint16 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *AdsWriteControlRequest) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsWriteControlRequest factory function for AdsWriteControlRequest func NewAdsWriteControlRequest(adsState uint16, deviceState uint16, data []byte) *AdsData { child := &AdsWriteControlRequest{ AdsState: adsState, @@ -124,12 +125,12 @@ func (m *AdsWriteControlRequest) GetTypeName() string { return "AdsWriteControlRequest" } -func (m *AdsWriteControlRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsWriteControlRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsWriteControlRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsWriteControlRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (adsState) lengthInBits += 16 @@ -148,8 +149,8 @@ func (m *AdsWriteControlRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsWriteControlRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsWriteControlRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsWriteControlRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { @@ -220,7 +221,7 @@ func (m *AdsWriteControlRequest) Serialize(writeBuffer utils.WriteBuffer) error } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint32(uint32(len(m.Data))) + length := uint32(uint32(len(m.GetData()))) _lengthErr := writeBuffer.WriteUint32("length", 32, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go index b476f3ac193..cfdc4e3e4f4 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go @@ -36,10 +36,10 @@ type AdsWriteControlResponse struct { type IAdsWriteControlResponse interface { // GetResult returns Result GetResult() ReturnCode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *AdsWriteControlResponse) GetResult() ReturnCode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsWriteControlResponse factory function for AdsWriteControlResponse func NewAdsWriteControlResponse(result ReturnCode) *AdsData { child := &AdsWriteControlResponse{ Result: result, @@ -108,12 +109,12 @@ func (m *AdsWriteControlResponse) GetTypeName() string { return "AdsWriteControlResponse" } -func (m *AdsWriteControlResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsWriteControlResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsWriteControlResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsWriteControlResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -121,8 +122,8 @@ func (m *AdsWriteControlResponse) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *AdsWriteControlResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsWriteControlResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsWriteControlResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go index baccd9153af..934666450c1 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go @@ -42,10 +42,10 @@ type IAdsWriteRequest interface { GetIndexOffset() uint32 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *AdsWriteRequest) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsWriteRequest factory function for AdsWriteRequest func NewAdsWriteRequest(indexGroup uint32, indexOffset uint32, data []byte) *AdsData { child := &AdsWriteRequest{ IndexGroup: indexGroup, @@ -124,12 +125,12 @@ func (m *AdsWriteRequest) GetTypeName() string { return "AdsWriteRequest" } -func (m *AdsWriteRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsWriteRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsWriteRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (indexGroup) lengthInBits += 32 @@ -148,8 +149,8 @@ func (m *AdsWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsWriteRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsWriteRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsWriteRequestParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { @@ -220,7 +221,7 @@ func (m *AdsWriteRequest) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint32(uint32(len(m.Data))) + length := uint32(uint32(len(m.GetData()))) _lengthErr := writeBuffer.WriteUint32("length", 32, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go index 3f41ee308f0..7aec191b0e2 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go @@ -36,10 +36,10 @@ type AdsWriteResponse struct { type IAdsWriteResponse interface { // GetResult returns Result GetResult() ReturnCode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *AdsWriteResponse) GetResult() ReturnCode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAdsWriteResponse factory function for AdsWriteResponse func NewAdsWriteResponse(result ReturnCode) *AdsData { child := &AdsWriteResponse{ Result: result, @@ -108,12 +109,12 @@ func (m *AdsWriteResponse) GetTypeName() string { return "AdsWriteResponse" } -func (m *AdsWriteResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AdsWriteResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AdsWriteResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *AdsWriteResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 32 @@ -121,8 +122,8 @@ func (m *AdsWriteResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AdsWriteResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AdsWriteResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AdsWriteResponseParse(readBuffer utils.ReadBuffer, commandId CommandId, response bool) (*AdsData, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go index 480b62d5676..b9b58169b88 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go @@ -50,10 +50,10 @@ type IAmsNetId interface { GetOctet5() uint8 // GetOctet6 returns Octet6 GetOctet6() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,6 +89,7 @@ func (m *AmsNetId) GetOctet6() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAmsNetId factory function for AmsNetId func NewAmsNetId(octet1 uint8, octet2 uint8, octet3 uint8, octet4 uint8, octet5 uint8, octet6 uint8) *AmsNetId { return &AmsNetId{Octet1: octet1, Octet2: octet2, Octet3: octet3, Octet4: octet4, Octet5: octet5, Octet6: octet6} } @@ -110,11 +111,11 @@ func (m *AmsNetId) GetTypeName() string { return "AmsNetId" } -func (m *AmsNetId) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AmsNetId) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AmsNetId) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AmsNetId) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (octet1) @@ -138,8 +139,8 @@ func (m *AmsNetId) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AmsNetId) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AmsNetId) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AmsNetIdParse(readBuffer utils.ReadBuffer) (*AmsNetId, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go index 460c15cc9d5..e73753e107e 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go @@ -59,10 +59,10 @@ type IAmsPacket interface { GetInvokeId() uint32 // GetData returns Data GetData() *AdsData - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -110,6 +110,7 @@ func (m *AmsPacket) GetData() *AdsData { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAmsPacket factory function for AmsPacket func NewAmsPacket(targetAmsNetId *AmsNetId, targetAmsPort uint16, sourceAmsNetId *AmsNetId, sourceAmsPort uint16, commandId CommandId, state *State, errorCode uint32, invokeId uint32, data *AdsData) *AmsPacket { return &AmsPacket{TargetAmsNetId: targetAmsNetId, TargetAmsPort: targetAmsPort, SourceAmsNetId: sourceAmsNetId, SourceAmsPort: sourceAmsPort, CommandId: commandId, State: state, ErrorCode: errorCode, InvokeId: invokeId, Data: data} } @@ -131,21 +132,21 @@ func (m *AmsPacket) GetTypeName() string { return "AmsPacket" } -func (m *AmsPacket) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AmsPacket) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AmsPacket) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AmsPacket) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (targetAmsNetId) - lengthInBits += m.TargetAmsNetId.LengthInBits() + lengthInBits += m.TargetAmsNetId.GetLengthInBits() // Simple field (targetAmsPort) lengthInBits += 16 // Simple field (sourceAmsNetId) - lengthInBits += m.SourceAmsNetId.LengthInBits() + lengthInBits += m.SourceAmsNetId.GetLengthInBits() // Simple field (sourceAmsPort) lengthInBits += 16 @@ -154,7 +155,7 @@ func (m *AmsPacket) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 16 // Simple field (state) - lengthInBits += m.State.LengthInBits() + lengthInBits += m.State.GetLengthInBits() // Implicit Field (length) lengthInBits += 32 @@ -166,13 +167,13 @@ func (m *AmsPacket) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 32 // Simple field (data) - lengthInBits += m.Data.LengthInBits() + lengthInBits += m.Data.GetLengthInBits() return lengthInBits } -func (m *AmsPacket) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AmsPacket) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AmsPacketParse(readBuffer utils.ReadBuffer) (*AmsPacket, error) { @@ -271,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.Response)) + _data, _dataErr := AdsDataParse(readBuffer, commandId, bool(state.GetResponse())) if _dataErr != nil { return nil, errors.Wrap(_dataErr, "Error parsing 'data' field") } @@ -356,7 +357,7 @@ func (m *AmsPacket) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint32(m.Data.LengthInBytes()) + length := uint32(m.GetData().GetLengthInBytes()) _lengthErr := writeBuffer.WriteUint32("length", 32, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go index 1f4dcf9d985..bbadda535d4 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go @@ -50,10 +50,10 @@ type IAmsSerialAcknowledgeFrame interface { GetLength() int8 // GetCrc returns Crc GetCrc() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,6 +89,7 @@ func (m *AmsSerialAcknowledgeFrame) GetCrc() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAmsSerialAcknowledgeFrame factory function for AmsSerialAcknowledgeFrame func NewAmsSerialAcknowledgeFrame(magicCookie uint16, transmitterAddress int8, receiverAddress int8, fragmentNumber int8, length int8, crc uint16) *AmsSerialAcknowledgeFrame { return &AmsSerialAcknowledgeFrame{MagicCookie: magicCookie, TransmitterAddress: transmitterAddress, ReceiverAddress: receiverAddress, FragmentNumber: fragmentNumber, Length: length, Crc: crc} } @@ -110,11 +111,11 @@ func (m *AmsSerialAcknowledgeFrame) GetTypeName() string { return "AmsSerialAcknowledgeFrame" } -func (m *AmsSerialAcknowledgeFrame) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AmsSerialAcknowledgeFrame) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AmsSerialAcknowledgeFrame) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AmsSerialAcknowledgeFrame) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (magicCookie) @@ -138,8 +139,8 @@ func (m *AmsSerialAcknowledgeFrame) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *AmsSerialAcknowledgeFrame) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AmsSerialAcknowledgeFrame) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AmsSerialAcknowledgeFrameParse(readBuffer utils.ReadBuffer) (*AmsSerialAcknowledgeFrame, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go index 4dae9539669..20eef08ca11 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go @@ -53,10 +53,10 @@ type IAmsSerialFrame interface { GetUserdata() *AmsPacket // GetCrc returns Crc GetCrc() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -96,6 +96,7 @@ func (m *AmsSerialFrame) GetCrc() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAmsSerialFrame factory function for AmsSerialFrame func NewAmsSerialFrame(magicCookie uint16, transmitterAddress int8, receiverAddress int8, fragmentNumber int8, length int8, userdata *AmsPacket, crc uint16) *AmsSerialFrame { return &AmsSerialFrame{MagicCookie: magicCookie, TransmitterAddress: transmitterAddress, ReceiverAddress: receiverAddress, FragmentNumber: fragmentNumber, Length: length, Userdata: userdata, Crc: crc} } @@ -117,11 +118,11 @@ func (m *AmsSerialFrame) GetTypeName() string { return "AmsSerialFrame" } -func (m *AmsSerialFrame) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AmsSerialFrame) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AmsSerialFrame) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AmsSerialFrame) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (magicCookie) @@ -140,7 +141,7 @@ func (m *AmsSerialFrame) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (userdata) - lengthInBits += m.Userdata.LengthInBits() + lengthInBits += m.Userdata.GetLengthInBits() // Simple field (crc) lengthInBits += 16 @@ -148,8 +149,8 @@ func (m *AmsSerialFrame) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AmsSerialFrame) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AmsSerialFrame) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AmsSerialFrameParse(readBuffer utils.ReadBuffer) (*AmsSerialFrame, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go index 815c6026363..07e44688dbd 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go @@ -50,10 +50,10 @@ type IAmsSerialResetFrame interface { GetLength() int8 // GetCrc returns Crc GetCrc() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,6 +89,7 @@ func (m *AmsSerialResetFrame) GetCrc() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAmsSerialResetFrame factory function for AmsSerialResetFrame func NewAmsSerialResetFrame(magicCookie uint16, transmitterAddress int8, receiverAddress int8, fragmentNumber int8, length int8, crc uint16) *AmsSerialResetFrame { return &AmsSerialResetFrame{MagicCookie: magicCookie, TransmitterAddress: transmitterAddress, ReceiverAddress: receiverAddress, FragmentNumber: fragmentNumber, Length: length, Crc: crc} } @@ -110,11 +111,11 @@ func (m *AmsSerialResetFrame) GetTypeName() string { return "AmsSerialResetFrame" } -func (m *AmsSerialResetFrame) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AmsSerialResetFrame) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AmsSerialResetFrame) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AmsSerialResetFrame) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (magicCookie) @@ -138,8 +139,8 @@ func (m *AmsSerialResetFrame) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AmsSerialResetFrame) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AmsSerialResetFrame) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AmsSerialResetFrameParse(readBuffer utils.ReadBuffer) (*AmsSerialResetFrame, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go index 6a6a4aa787d..4313a2a6a44 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go @@ -36,10 +36,10 @@ type AmsTCPPacket struct { type IAmsTCPPacket interface { // GetUserdata returns Userdata GetUserdata() *AmsPacket - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,6 +55,7 @@ func (m *AmsTCPPacket) GetUserdata() *AmsPacket { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAmsTCPPacket factory function for AmsTCPPacket func NewAmsTCPPacket(userdata *AmsPacket) *AmsTCPPacket { return &AmsTCPPacket{Userdata: userdata} } @@ -76,11 +77,11 @@ func (m *AmsTCPPacket) GetTypeName() string { return "AmsTCPPacket" } -func (m *AmsTCPPacket) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AmsTCPPacket) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AmsTCPPacket) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AmsTCPPacket) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Reserved Field (reserved) @@ -90,13 +91,13 @@ func (m *AmsTCPPacket) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 32 // Simple field (userdata) - lengthInBits += m.Userdata.LengthInBits() + lengthInBits += m.Userdata.GetLengthInBits() return lengthInBits } -func (m *AmsTCPPacket) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AmsTCPPacket) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AmsTCPPacketParse(readBuffer utils.ReadBuffer) (*AmsTCPPacket, error) { @@ -160,7 +161,7 @@ func (m *AmsTCPPacket) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint32(m.Userdata.LengthInBytes()) + length := uint32(m.GetUserdata().GetLengthInBytes()) _lengthErr := writeBuffer.WriteUint32("length", 32, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/ads/readwrite/model/CommandId.go b/plc4go/internal/plc4go/ads/readwrite/model/CommandId.go index 7e57a8483ec..19d4d3fdc6e 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/CommandId.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/CommandId.go @@ -134,12 +134,12 @@ func CastCommandId(structType interface{}) CommandId { return castFunc(structType) } -func (m CommandId) LengthInBits() uint16 { +func (m CommandId) GetLengthInBits() uint16 { return 16 } -func (m CommandId) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m CommandId) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CommandIdParse(readBuffer utils.ReadBuffer) (CommandId, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go b/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go index 7bdd11cf939..6ee47c0cae7 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/DataItem.go @@ -228,6 +228,14 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataFormatName string, stringLen } func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataFormatName string, stringLength int32) error { + m := struct { + DataFormatName string + StringLength int32 + }{ + DataFormatName: dataFormatName, + StringLength: stringLength, + } + _ = m writeBuffer.PushContext("DataItem") switch { case dataFormatName == "IEC61131_BOOL": // BOOL @@ -317,13 +325,13 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataFo } case dataFormatName == "IEC61131_STRING": // STRING // Manual Field (value) - _valueErr := SerializeAmsString(writeBuffer, value, stringLength, "UTF-8") + _valueErr := SerializeAmsString(writeBuffer, value, m.StringLength, "UTF-8") if _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } case dataFormatName == "IEC61131_WSTRING": // STRING // Manual Field (value) - _valueErr := SerializeAmsString(writeBuffer, value, stringLength, "UTF-16") + _valueErr := SerializeAmsString(writeBuffer, value, m.StringLength, "UTF-16") if _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } diff --git a/plc4go/internal/plc4go/ads/readwrite/model/ReservedIndexGroups.go b/plc4go/internal/plc4go/ads/readwrite/model/ReservedIndexGroups.go index df471beebbf..e9e7cb545bb 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/ReservedIndexGroups.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/ReservedIndexGroups.go @@ -254,12 +254,12 @@ func CastReservedIndexGroups(structType interface{}) ReservedIndexGroups { return castFunc(structType) } -func (m ReservedIndexGroups) LengthInBits() uint16 { +func (m ReservedIndexGroups) GetLengthInBits() uint16 { return 32 } -func (m ReservedIndexGroups) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ReservedIndexGroups) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ReservedIndexGroupsParse(readBuffer utils.ReadBuffer) (ReservedIndexGroups, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/ReturnCode.go b/plc4go/internal/plc4go/ads/readwrite/model/ReturnCode.go index 10866d8be4d..b0ae736b3df 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/ReturnCode.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/ReturnCode.go @@ -806,12 +806,12 @@ func CastReturnCode(structType interface{}) ReturnCode { return castFunc(structType) } -func (m ReturnCode) LengthInBits() uint16 { +func (m ReturnCode) GetLengthInBits() uint16 { return 32 } -func (m ReturnCode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ReturnCode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ReturnCodeParse(readBuffer utils.ReadBuffer) (ReturnCode, error) { diff --git a/plc4go/internal/plc4go/ads/readwrite/model/State.go b/plc4go/internal/plc4go/ads/readwrite/model/State.go index f4f3bdb5592..5fcfe261872 100644 --- a/plc4go/internal/plc4go/ads/readwrite/model/State.go +++ b/plc4go/internal/plc4go/ads/readwrite/model/State.go @@ -60,10 +60,10 @@ type IState interface { GetResponse() bool // GetBroadcast returns Broadcast GetBroadcast() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -111,6 +111,7 @@ func (m *State) GetBroadcast() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewState factory function for State func NewState(initCommand bool, updCommand bool, timestampAdded bool, highPriorityCommand bool, systemCommand bool, adsCommand bool, noReturn bool, response bool, broadcast bool) *State { return &State{InitCommand: initCommand, UpdCommand: updCommand, TimestampAdded: timestampAdded, HighPriorityCommand: highPriorityCommand, SystemCommand: systemCommand, AdsCommand: adsCommand, NoReturn: noReturn, Response: response, Broadcast: broadcast} } @@ -132,11 +133,11 @@ func (m *State) GetTypeName() string { return "State" } -func (m *State) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *State) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *State) LengthInBitsConditional(lastItem bool) uint16 { +func (m *State) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (initCommand) @@ -172,8 +173,8 @@ func (m *State) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *State) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *State) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func StateParse(readBuffer utils.ReadBuffer) (*State, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go index 617efd67d3e..b9315d0f47d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go @@ -28,17 +28,20 @@ import ( // The data-structure of this message type APDU struct { - Child IAPDUChild + + // Arguments. + ApduLength uint16 + Child IAPDUChild } // The corresponding interface type IAPDU interface { // ApduType returns ApduType ApduType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IAPDUChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDU() *APDU { - return &APDU{} +// NewAPDU factory function for APDU +func NewAPDU(apduLength uint16) *APDU { + return &APDU{ApduLength: apduLength} } func CastAPDU(structType interface{}) *APDU { @@ -84,15 +88,15 @@ func (m *APDU) GetTypeName() string { return "APDU" } -func (m *APDU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDU) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *APDU) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *APDU) ParentLengthInBits() uint16 { +func (m *APDU) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (apduType) lengthInBits += 4 @@ -100,8 +104,8 @@ func (m *APDU) ParentLengthInBits() uint16 { return lengthInBits } -func (m *APDU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go index 4b1acbae209..9db257a6d4d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go @@ -33,6 +33,9 @@ type APDUAbort struct { Server bool OriginalInvokeId uint8 AbortReason uint8 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -43,10 +46,10 @@ type IAPDUAbort interface { GetOriginalInvokeId() uint8 // GetAbortReason returns AbortReason GetAbortReason() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -83,12 +86,13 @@ func (m *APDUAbort) GetAbortReason() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUAbort(server bool, originalInvokeId uint8, abortReason uint8) *APDU { +// NewAPDUAbort factory function for APDUAbort +func NewAPDUAbort(server bool, originalInvokeId uint8, abortReason uint8, apduLength uint16) *APDU { child := &APDUAbort{ Server: server, OriginalInvokeId: originalInvokeId, AbortReason: abortReason, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -117,12 +121,12 @@ func (m *APDUAbort) GetTypeName() string { return "APDUAbort" } -func (m *APDUAbort) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUAbort) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUAbort) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUAbort) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 3 @@ -139,8 +143,8 @@ func (m *APDUAbort) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *APDUAbort) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUAbort) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUAbortParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go index 6df70beebd0..b296bb5179d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go @@ -39,6 +39,9 @@ type APDUComplexAck struct { ServiceAck *BACnetServiceAck SegmentServiceChoice *uint8 Segment []byte + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -59,10 +62,10 @@ type IAPDUComplexAck interface { GetSegmentServiceChoice() *uint8 // GetSegment returns Segment GetSegment() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -119,7 +122,8 @@ func (m *APDUComplexAck) GetSegment() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceAck *BACnetServiceAck, segmentServiceChoice *uint8, segment []byte) *APDU { +// NewAPDUComplexAck factory function for APDUComplexAck +func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceAck *BACnetServiceAck, segmentServiceChoice *uint8, segment []byte, apduLength uint16) *APDU { child := &APDUComplexAck{ SegmentedMessage: segmentedMessage, MoreFollows: moreFollows, @@ -129,7 +133,7 @@ func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId ServiceAck: serviceAck, SegmentServiceChoice: segmentServiceChoice, Segment: segment, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -158,12 +162,12 @@ func (m *APDUComplexAck) GetTypeName() string { return "APDUComplexAck" } -func (m *APDUComplexAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUComplexAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUComplexAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUComplexAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (segmentedMessage) lengthInBits += 1 @@ -189,7 +193,7 @@ func (m *APDUComplexAck) LengthInBitsConditional(lastItem bool) uint16 { // Optional Field (serviceAck) if m.ServiceAck != nil { - lengthInBits += (*m.ServiceAck).LengthInBits() + lengthInBits += (*m.ServiceAck).GetLengthInBits() } // Optional Field (segmentServiceChoice) @@ -205,8 +209,8 @@ func (m *APDUComplexAck) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *APDUComplexAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUComplexAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUComplexAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go index 7bce80a6f23..03c5769a4cf 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go @@ -39,6 +39,9 @@ type APDUConfirmedRequest struct { SequenceNumber *uint8 ProposedWindowSize *uint8 ServiceRequest *BACnetConfirmedServiceRequest + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -61,10 +64,10 @@ type IAPDUConfirmedRequest interface { GetProposedWindowSize() *uint8 // GetServiceRequest returns ServiceRequest GetServiceRequest() *BACnetConfirmedServiceRequest - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -125,7 +128,8 @@ func (m *APDUConfirmedRequest) GetServiceRequest() *BACnetConfirmedServiceReques // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedResponseAccepted bool, maxSegmentsAccepted uint8, maxApduLengthAccepted uint8, invokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceRequest *BACnetConfirmedServiceRequest) *APDU { +// NewAPDUConfirmedRequest factory function for APDUConfirmedRequest +func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedResponseAccepted bool, maxSegmentsAccepted uint8, maxApduLengthAccepted uint8, invokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceRequest *BACnetConfirmedServiceRequest, apduLength uint16) *APDU { child := &APDUConfirmedRequest{ SegmentedMessage: segmentedMessage, MoreFollows: moreFollows, @@ -136,7 +140,7 @@ func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedR SequenceNumber: sequenceNumber, ProposedWindowSize: proposedWindowSize, ServiceRequest: serviceRequest, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -165,12 +169,12 @@ func (m *APDUConfirmedRequest) GetTypeName() string { return "APDUConfirmedRequest" } -func (m *APDUConfirmedRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUConfirmedRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUConfirmedRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUConfirmedRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (segmentedMessage) lengthInBits += 1 @@ -204,13 +208,13 @@ func (m *APDUConfirmedRequest) LengthInBitsConditional(lastItem bool) uint16 { } // Simple field (serviceRequest) - lengthInBits += m.ServiceRequest.LengthInBits() + lengthInBits += m.ServiceRequest.GetLengthInBits() return lengthInBits } -func (m *APDUConfirmedRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUConfirmedRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUConfirmedRequestParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go index 97910ac1b98..fb0c11942e6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go @@ -32,6 +32,9 @@ type APDUError struct { *APDU OriginalInvokeId uint8 Error *BACnetError + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -40,10 +43,10 @@ type IAPDUError interface { GetOriginalInvokeId() uint8 // GetError returns Error GetError() *BACnetError - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *APDUError) GetError() *BACnetError { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUError(originalInvokeId uint8, error *BACnetError) *APDU { +// NewAPDUError factory function for APDUError +func NewAPDUError(originalInvokeId uint8, error *BACnetError, apduLength uint16) *APDU { child := &APDUError{ OriginalInvokeId: originalInvokeId, Error: error, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -109,12 +113,12 @@ func (m *APDUError) GetTypeName() string { return "APDUError" } -func (m *APDUError) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUError) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUError) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUError) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 4 @@ -123,13 +127,13 @@ func (m *APDUError) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (error) - lengthInBits += m.Error.LengthInBits() + lengthInBits += m.Error.GetLengthInBits() return lengthInBits } -func (m *APDUError) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUError) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUErrorParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go index 771546376b5..144ba92126f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go @@ -32,6 +32,9 @@ type APDUReject struct { *APDU OriginalInvokeId uint8 RejectReason uint8 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -40,10 +43,10 @@ type IAPDUReject interface { GetOriginalInvokeId() uint8 // GetRejectReason returns RejectReason GetRejectReason() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *APDUReject) GetRejectReason() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUReject(originalInvokeId uint8, rejectReason uint8) *APDU { +// NewAPDUReject factory function for APDUReject +func NewAPDUReject(originalInvokeId uint8, rejectReason uint8, apduLength uint16) *APDU { child := &APDUReject{ OriginalInvokeId: originalInvokeId, RejectReason: rejectReason, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -109,12 +113,12 @@ func (m *APDUReject) GetTypeName() string { return "APDUReject" } -func (m *APDUReject) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUReject) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUReject) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUReject) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 4 @@ -128,8 +132,8 @@ func (m *APDUReject) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *APDUReject) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUReject) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDURejectParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go index 127031f8730..38b505e2fd6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go @@ -35,6 +35,9 @@ type APDUSegmentAck struct { OriginalInvokeId uint8 SequenceNumber uint8 ProposedWindowSize uint8 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -49,10 +52,10 @@ type IAPDUSegmentAck interface { GetSequenceNumber() uint8 // GetProposedWindowSize returns ProposedWindowSize GetProposedWindowSize() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -97,14 +100,15 @@ func (m *APDUSegmentAck) GetProposedWindowSize() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUSegmentAck(negativeAck bool, server bool, originalInvokeId uint8, sequenceNumber uint8, proposedWindowSize uint8) *APDU { +// NewAPDUSegmentAck factory function for APDUSegmentAck +func NewAPDUSegmentAck(negativeAck bool, server bool, originalInvokeId uint8, sequenceNumber uint8, proposedWindowSize uint8, apduLength uint16) *APDU { child := &APDUSegmentAck{ NegativeAck: negativeAck, Server: server, OriginalInvokeId: originalInvokeId, SequenceNumber: sequenceNumber, ProposedWindowSize: proposedWindowSize, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -133,12 +137,12 @@ func (m *APDUSegmentAck) GetTypeName() string { return "APDUSegmentAck" } -func (m *APDUSegmentAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUSegmentAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUSegmentAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUSegmentAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 2 @@ -161,8 +165,8 @@ func (m *APDUSegmentAck) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *APDUSegmentAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUSegmentAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUSegmentAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go index 6b798f951a5..93cb394ca95 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go @@ -32,6 +32,9 @@ type APDUSimpleAck struct { *APDU OriginalInvokeId uint8 ServiceChoice uint8 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -40,10 +43,10 @@ type IAPDUSimpleAck interface { GetOriginalInvokeId() uint8 // GetServiceChoice returns ServiceChoice GetServiceChoice() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *APDUSimpleAck) GetServiceChoice() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUSimpleAck(originalInvokeId uint8, serviceChoice uint8) *APDU { +// NewAPDUSimpleAck factory function for APDUSimpleAck +func NewAPDUSimpleAck(originalInvokeId uint8, serviceChoice uint8, apduLength uint16) *APDU { child := &APDUSimpleAck{ OriginalInvokeId: originalInvokeId, ServiceChoice: serviceChoice, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -109,12 +113,12 @@ func (m *APDUSimpleAck) GetTypeName() string { return "APDUSimpleAck" } -func (m *APDUSimpleAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUSimpleAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUSimpleAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUSimpleAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 4 @@ -128,8 +132,8 @@ func (m *APDUSimpleAck) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *APDUSimpleAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUSimpleAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUSimpleAckParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go index 43e7c2bf6f2..0a5478ba9ec 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go @@ -31,16 +31,19 @@ import ( type APDUUnconfirmedRequest struct { *APDU ServiceRequest *BACnetUnconfirmedServiceRequest + + // Arguments. + ApduLength uint16 } // The corresponding interface type IAPDUUnconfirmedRequest interface { // GetServiceRequest returns ServiceRequest GetServiceRequest() *BACnetUnconfirmedServiceRequest - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +72,11 @@ func (m *APDUUnconfirmedRequest) GetServiceRequest() *BACnetUnconfirmedServiceRe // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUUnconfirmedRequest(serviceRequest *BACnetUnconfirmedServiceRequest) *APDU { +// NewAPDUUnconfirmedRequest factory function for APDUUnconfirmedRequest +func NewAPDUUnconfirmedRequest(serviceRequest *BACnetUnconfirmedServiceRequest, apduLength uint16) *APDU { child := &APDUUnconfirmedRequest{ ServiceRequest: serviceRequest, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -101,24 +105,24 @@ func (m *APDUUnconfirmedRequest) GetTypeName() string { return "APDUUnconfirmedRequest" } -func (m *APDUUnconfirmedRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUUnconfirmedRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUUnconfirmedRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUUnconfirmedRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 4 // Simple field (serviceRequest) - lengthInBits += m.ServiceRequest.LengthInBits() + lengthInBits += m.ServiceRequest.GetLengthInBits() return lengthInBits } -func (m *APDUUnconfirmedRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUUnconfirmedRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUUnconfirmedRequestParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go index 7542780c019..4ecea68f5da 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go @@ -30,16 +30,19 @@ import ( type APDUUnknown struct { *APDU UnknownBytes []byte + + // Arguments. + ApduLength uint16 } // The corresponding interface type IAPDUUnknown interface { // GetUnknownBytes returns UnknownBytes GetUnknownBytes() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *APDUUnknown) GetUnknownBytes() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewAPDUUnknown(unknownBytes []byte) *APDU { +// NewAPDUUnknown factory function for APDUUnknown +func NewAPDUUnknown(unknownBytes []byte, apduLength uint16) *APDU { child := &APDUUnknown{ UnknownBytes: unknownBytes, - APDU: NewAPDU(), + APDU: NewAPDU(apduLength), } child.Child = child return child.APDU @@ -100,12 +104,12 @@ func (m *APDUUnknown) GetTypeName() string { return "APDUUnknown" } -func (m *APDUUnknown) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *APDUUnknown) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *APDUUnknown) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *APDUUnknown) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.UnknownBytes) > 0 { @@ -115,8 +119,8 @@ func (m *APDUUnknown) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *APDUUnknown) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *APDUUnknown) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func APDUUnknownParse(readBuffer utils.ReadBuffer, apduLength uint16) (*APDU, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go index 67dd2617839..a63b133a666 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go @@ -29,9 +29,10 @@ import ( // The data-structure of this message type BACnetAction struct { - RawData *BACnetContextTagEnumerated - IsDirect bool - IsReverse bool + RawData *BACnetContextTagEnumerated + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -42,10 +43,10 @@ type IBACnetAction interface { GetIsDirect() bool // GetIsReverse returns IsReverse GetIsReverse() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,17 +62,20 @@ func (m *BACnetAction) GetRawData() *BACnetContextTagEnumerated { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetAction) GetIsDirect() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsDirect + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (0))) } func (m *BACnetAction) GetIsReverse() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsReverse + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (1))) } -func NewBACnetAction(rawData *BACnetContextTagEnumerated, isDirect bool, isReverse bool) *BACnetAction { - return &BACnetAction{RawData: rawData, IsDirect: isDirect, IsReverse: isReverse} +// NewBACnetAction factory function for BACnetAction +func NewBACnetAction(rawData *BACnetContextTagEnumerated, tagNumber uint8) *BACnetAction { + return &BACnetAction{RawData: rawData, TagNumber: tagNumber} } func CastBACnetAction(structType interface{}) *BACnetAction { @@ -91,16 +95,16 @@ func (m *BACnetAction) GetTypeName() string { return "BACnetAction" } -func (m *BACnetAction) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetAction) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetAction) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetAction) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Optional Field (rawData) if m.RawData != nil { - lengthInBits += (*m.RawData).LengthInBits() + lengthInBits += (*m.RawData).GetLengthInBits() } // A virtual field doesn't have any in- or output. @@ -110,8 +114,8 @@ func (m *BACnetAction) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetAction) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetAction) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetActionParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetAction, error) { @@ -141,19 +145,21 @@ func BACnetActionParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetAct } // Virtual field - _isDirect := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (0))) + _isDirect := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (0))) isDirect := bool(_isDirect) + _ = isDirect // Virtual field - _isReverse := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (1))) + _isReverse := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (1))) isReverse := bool(_isReverse) + _ = isReverse if closeErr := readBuffer.CloseContext("BACnetAction"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetAction(rawData, isDirect, isReverse), nil + return NewBACnetAction(rawData, tagNumber), nil } func (m *BACnetAction) Serialize(writeBuffer utils.WriteBuffer) error { @@ -177,11 +183,11 @@ func (m *BACnetAction) Serialize(writeBuffer utils.WriteBuffer) error { } } // Virtual field - if _isDirectErr := writeBuffer.WriteVirtual("isDirect", m.IsDirect); _isDirectErr != nil { + if _isDirectErr := writeBuffer.WriteVirtual("isDirect", m.GetIsDirect()); _isDirectErr != nil { return errors.Wrap(_isDirectErr, "Error serializing 'isDirect' field") } // Virtual field - if _isReverseErr := writeBuffer.WriteVirtual("isReverse", m.IsReverse); _isReverseErr != nil { + if _isReverseErr := writeBuffer.WriteVirtual("isReverse", m.GetIsReverse()); _isReverseErr != nil { return errors.Wrap(_isReverseErr, "Error serializing 'isReverse' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go index c277ae3a82a..e2794d85bdd 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go @@ -60,10 +60,10 @@ type IBACnetActionCommand interface { GetQuitOnFailure() *BACnetContextTagBoolean // GetWriteSuccessful returns WriteSuccessful GetWriteSuccessful() *BACnetContextTagBoolean - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -111,6 +111,7 @@ func (m *BACnetActionCommand) GetWriteSuccessful() *BACnetContextTagBoolean { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetActionCommand factory function for BACnetActionCommand func NewBACnetActionCommand(deviceIdentifier *BACnetContextTagObjectIdentifier, objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, propertyValue *BACnetConstructedData, priority *BACnetContextTagUnsignedInteger, postDelay *BACnetContextTagBoolean, quitOnFailure *BACnetContextTagBoolean, writeSuccessful *BACnetContextTagBoolean) *BACnetActionCommand { return &BACnetActionCommand{DeviceIdentifier: deviceIdentifier, ObjectIdentifier: objectIdentifier, PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, PropertyValue: propertyValue, Priority: priority, PostDelay: postDelay, QuitOnFailure: quitOnFailure, WriteSuccessful: writeSuccessful} } @@ -132,55 +133,55 @@ func (m *BACnetActionCommand) GetTypeName() string { return "BACnetActionCommand" } -func (m *BACnetActionCommand) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetActionCommand) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetActionCommand) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetActionCommand) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Optional Field (deviceIdentifier) if m.DeviceIdentifier != nil { - lengthInBits += (*m.DeviceIdentifier).LengthInBits() + lengthInBits += (*m.DeviceIdentifier).GetLengthInBits() } // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (arrayIndex) if m.ArrayIndex != nil { - lengthInBits += (*m.ArrayIndex).LengthInBits() + lengthInBits += (*m.ArrayIndex).GetLengthInBits() } // Optional Field (propertyValue) if m.PropertyValue != nil { - lengthInBits += (*m.PropertyValue).LengthInBits() + lengthInBits += (*m.PropertyValue).GetLengthInBits() } // Optional Field (priority) if m.Priority != nil { - lengthInBits += (*m.Priority).LengthInBits() + lengthInBits += (*m.Priority).GetLengthInBits() } // Optional Field (postDelay) if m.PostDelay != nil { - lengthInBits += (*m.PostDelay).LengthInBits() + lengthInBits += (*m.PostDelay).GetLengthInBits() } // Simple field (quitOnFailure) - lengthInBits += m.QuitOnFailure.LengthInBits() + lengthInBits += m.QuitOnFailure.GetLengthInBits() // Simple field (writeSuccessful) - lengthInBits += m.WriteSuccessful.LengthInBits() + lengthInBits += m.WriteSuccessful.GetLengthInBits() return lengthInBits } -func (m *BACnetActionCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetActionCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (*BACnetActionCommand, error) { @@ -263,7 +264,7 @@ func BACnetActionCommandParse(readBuffer utils.ReadBuffer) (*BACnetActionCommand if pullErr := readBuffer.PullContext("propertyValue"); pullErr != nil { return nil, pullErr } - _val, _err := BACnetConstructedDataParse(readBuffer, uint8(4), objectIdentifier.ObjectType, propertyIdentifier) + _val, _err := BACnetConstructedDataParse(readBuffer, uint8(4), objectIdentifier.GetObjectType(), propertyIdentifier) switch { case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF): readBuffer.Reset(currentPos) diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go index 0042a35e235..6cd6045448d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go @@ -38,10 +38,10 @@ type IBACnetAddress interface { GetAddress() []uint8 // GetPort returns Port GetPort() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetAddress) GetPort() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetAddress factory function for BACnetAddress func NewBACnetAddress(address []uint8, port uint16) *BACnetAddress { return &BACnetAddress{Address: address, Port: port} } @@ -82,11 +83,11 @@ func (m *BACnetAddress) GetTypeName() string { return "BACnetAddress" } -func (m *BACnetAddress) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetAddress) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetAddress) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetAddress) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Array field @@ -100,8 +101,8 @@ func (m *BACnetAddress) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetAddress) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetAddress) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetAddressParse(readBuffer utils.ReadBuffer) (*BACnetAddress, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go index 1a42ea590e7..0671b129a8a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go @@ -28,10 +28,8 @@ import ( // The data-structure of this message type BACnetApplicationTag struct { - Header *BACnetTagHeader - ActualTagNumber uint8 - ActualLength uint32 - Child IBACnetApplicationTagChild + Header *BACnetTagHeader + Child IBACnetApplicationTagChild } // The corresponding interface @@ -44,10 +42,10 @@ type IBACnetApplicationTag interface { GetActualTagNumber() uint8 // GetActualLength returns ActualLength GetActualLength() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -59,7 +57,7 @@ type IBACnetApplicationTagParent interface { type IBACnetApplicationTagChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) + InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) GetTypeName() string IBACnetApplicationTag } @@ -75,17 +73,16 @@ func (m *BACnetApplicationTag) GetHeader() *BACnetTagHeader { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTag) GetActualTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualTagNumber + return m.GetHeader().GetActualTagNumber() } func (m *BACnetApplicationTag) GetActualLength() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualLength + return m.GetHeader().GetActualLength() } -func NewBACnetApplicationTag(header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { - return &BACnetApplicationTag{Header: header, ActualTagNumber: actualTagNumber, ActualLength: actualLength} +// NewBACnetApplicationTag factory function for BACnetApplicationTag +func NewBACnetApplicationTag(header *BACnetTagHeader) *BACnetApplicationTag { + return &BACnetApplicationTag{Header: header} } func CastBACnetApplicationTag(structType interface{}) *BACnetApplicationTag { @@ -105,19 +102,19 @@ func (m *BACnetApplicationTag) GetTypeName() string { return "BACnetApplicationTag" } -func (m *BACnetApplicationTag) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTag) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTag) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetApplicationTag) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetApplicationTag) ParentLengthInBits() uint16 { +func (m *BACnetApplicationTag) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (header) - lengthInBits += m.Header.LengthInBits() + lengthInBits += m.Header.GetLengthInBits() // A virtual field doesn't have any in- or output. @@ -126,8 +123,8 @@ func (m *BACnetApplicationTag) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BACnetApplicationTag) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTag) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { @@ -149,17 +146,19 @@ func BACnetApplicationTagParse(readBuffer utils.ReadBuffer) (*BACnetApplicationT } // Validation - if !(bool((header.TagClass) == (TagClass_APPLICATION_TAGS))) { + if !(bool((header.GetTagClass()) == (TagClass_APPLICATION_TAGS))) { return nil, utils.ParseAssertError{"should be a application tag"} } // Virtual field - _actualTagNumber := header.ActualTagNumber + _actualTagNumber := header.GetActualTagNumber() actualTagNumber := uint8(_actualTagNumber) + _ = actualTagNumber // Virtual field - _actualLength := header.ActualLength + _actualLength := header.GetActualLength() actualLength := uint32(_actualLength) + _ = actualLength // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetApplicationTag @@ -204,7 +203,7 @@ func BACnetApplicationTagParse(readBuffer utils.ReadBuffer) (*BACnetApplicationT } // Finish initializing - _parent.Child.InitializeParent(_parent, header, actualTagNumber, actualLength) + _parent.Child.InitializeParent(_parent, header) return _parent, nil } @@ -229,11 +228,11 @@ func (m *BACnetApplicationTag) SerializeParent(writeBuffer utils.WriteBuffer, ch return errors.Wrap(_headerErr, "Error serializing 'header' field") } // Virtual field - if _actualTagNumberErr := writeBuffer.WriteVirtual("actualTagNumber", m.ActualTagNumber); _actualTagNumberErr != nil { + if _actualTagNumberErr := writeBuffer.WriteVirtual("actualTagNumber", m.GetActualTagNumber()); _actualTagNumberErr != nil { return errors.Wrap(_actualTagNumberErr, "Error serializing 'actualTagNumber' field") } // Virtual field - if _actualLengthErr := writeBuffer.WriteVirtual("actualLength", m.ActualLength); _actualLengthErr != nil { + if _actualLengthErr := writeBuffer.WriteVirtual("actualLength", m.GetActualLength()); _actualLengthErr != nil { return errors.Wrap(_actualLengthErr, "Error serializing 'actualLength' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go index 294dbf2e801..d88b0fb3eca 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go @@ -36,10 +36,10 @@ type BACnetApplicationTagBitString struct { type IBACnetApplicationTagBitString interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadBitString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,10 +55,8 @@ func (m *BACnetApplicationTagBitString) GetActualTagNumber() uint8 { return 0x8 } -func (m *BACnetApplicationTagBitString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagBitString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -72,10 +70,11 @@ func (m *BACnetApplicationTagBitString) GetPayload() *BACnetTagPayloadBitString // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetApplicationTagBitString(payload *BACnetTagPayloadBitString, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagBitString factory function for BACnetApplicationTagBitString +func NewBACnetApplicationTagBitString(payload *BACnetTagPayloadBitString, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagBitString{ Payload: payload, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -104,21 +103,21 @@ func (m *BACnetApplicationTagBitString) GetTypeName() string { return "BACnetApplicationTagBitString" } -func (m *BACnetApplicationTagBitString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagBitString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagBitString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagBitString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetApplicationTagBitString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagBitString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagBitStringParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -130,7 +129,7 @@ func BACnetApplicationTagBitStringParse(readBuffer utils.ReadBuffer, header *BAC if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadBitStringParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadBitStringParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go index 5d4b4f576d7..9aba5899d3c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go @@ -29,8 +29,7 @@ import ( // The data-structure of this message type BACnetApplicationTagBoolean struct { *BACnetApplicationTag - Payload *BACnetTagPayloadBoolean - ActualValue bool + Payload *BACnetTagPayloadBoolean } // The corresponding interface @@ -39,10 +38,10 @@ type IBACnetApplicationTagBoolean interface { GetPayload() *BACnetTagPayloadBoolean // GetActualValue returns ActualValue GetActualValue() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,10 +57,8 @@ func (m *BACnetApplicationTagBoolean) GetActualTagNumber() uint8 { return 0x1 } -func (m *BACnetApplicationTagBoolean) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagBoolean) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -75,15 +72,14 @@ func (m *BACnetApplicationTagBoolean) GetPayload() *BACnetTagPayloadBoolean { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagBoolean) GetActualValue() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetValue() } -func NewBACnetApplicationTagBoolean(payload *BACnetTagPayloadBoolean, actualValue bool, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagBoolean factory function for BACnetApplicationTagBoolean +func NewBACnetApplicationTagBoolean(payload *BACnetTagPayloadBoolean, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagBoolean{ Payload: payload, - ActualValue: actualValue, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -112,23 +108,23 @@ func (m *BACnetApplicationTagBoolean) GetTypeName() string { return "BACnetApplicationTagBoolean" } -func (m *BACnetApplicationTagBoolean) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagBoolean) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagBoolean) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagBoolean) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetApplicationTagBoolean) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagBoolean) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagBooleanParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -140,7 +136,7 @@ func BACnetApplicationTagBooleanParse(readBuffer utils.ReadBuffer, header *BACne if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadBooleanParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadBooleanParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } @@ -150,8 +146,9 @@ func BACnetApplicationTagBooleanParse(readBuffer utils.ReadBuffer, header *BACne } // Virtual field - _actualValue := payload.Value + _actualValue := payload.GetValue() actualValue := bool(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetApplicationTagBoolean"); closeErr != nil { return nil, closeErr @@ -160,7 +157,6 @@ func BACnetApplicationTagBooleanParse(readBuffer utils.ReadBuffer, header *BACne // Create a partially initialized instance _child := &BACnetApplicationTagBoolean{ Payload: CastBACnetTagPayloadBoolean(payload), - ActualValue: actualValue, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -185,7 +181,7 @@ func (m *BACnetApplicationTagBoolean) Serialize(writeBuffer utils.WriteBuffer) e return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go index 60b4797bbab..00df11194a3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go @@ -30,7 +30,6 @@ import ( type BACnetApplicationTagCharacterString struct { *BACnetApplicationTag Payload *BACnetTagPayloadCharacterString - Value string } // The corresponding interface @@ -39,10 +38,10 @@ type IBACnetApplicationTagCharacterString interface { GetPayload() *BACnetTagPayloadCharacterString // GetValue returns Value GetValue() string - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,10 +57,8 @@ func (m *BACnetApplicationTagCharacterString) GetActualTagNumber() uint8 { return 0x7 } -func (m *BACnetApplicationTagCharacterString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagCharacterString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -75,15 +72,14 @@ func (m *BACnetApplicationTagCharacterString) GetPayload() *BACnetTagPayloadChar // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagCharacterString) GetValue() string { - // TODO: calculation should happen here instead accessing the stored field - return m.Value + return m.GetPayload().GetValue() } -func NewBACnetApplicationTagCharacterString(payload *BACnetTagPayloadCharacterString, value string, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagCharacterString factory function for BACnetApplicationTagCharacterString +func NewBACnetApplicationTagCharacterString(payload *BACnetTagPayloadCharacterString, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagCharacterString{ Payload: payload, - Value: value, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -112,23 +108,23 @@ func (m *BACnetApplicationTagCharacterString) GetTypeName() string { return "BACnetApplicationTagCharacterString" } -func (m *BACnetApplicationTagCharacterString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagCharacterString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagCharacterString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagCharacterString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetApplicationTagCharacterString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagCharacterString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagCharacterStringParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -140,7 +136,7 @@ func BACnetApplicationTagCharacterStringParse(readBuffer utils.ReadBuffer, heade if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadCharacterStringParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadCharacterStringParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } @@ -150,8 +146,9 @@ func BACnetApplicationTagCharacterStringParse(readBuffer utils.ReadBuffer, heade } // Virtual field - _value := payload.Value + _value := payload.GetValue() value := string(_value) + _ = value if closeErr := readBuffer.CloseContext("BACnetApplicationTagCharacterString"); closeErr != nil { return nil, closeErr @@ -160,7 +157,6 @@ func BACnetApplicationTagCharacterStringParse(readBuffer utils.ReadBuffer, heade // Create a partially initialized instance _child := &BACnetApplicationTagCharacterString{ Payload: CastBACnetTagPayloadCharacterString(payload), - Value: value, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -185,7 +181,7 @@ func (m *BACnetApplicationTagCharacterString) Serialize(writeBuffer utils.WriteB return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _valueErr := writeBuffer.WriteVirtual("value", m.Value); _valueErr != nil { + if _valueErr := writeBuffer.WriteVirtual("value", m.GetValue()); _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go index c06a64984a5..b431e4e17b6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go @@ -36,10 +36,10 @@ type BACnetApplicationTagDate struct { type IBACnetApplicationTagDate interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadDate - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,10 +55,8 @@ func (m *BACnetApplicationTagDate) GetActualTagNumber() uint8 { return 0xA } -func (m *BACnetApplicationTagDate) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagDate) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -72,10 +70,11 @@ func (m *BACnetApplicationTagDate) GetPayload() *BACnetTagPayloadDate { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetApplicationTagDate(payload *BACnetTagPayloadDate, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagDate factory function for BACnetApplicationTagDate +func NewBACnetApplicationTagDate(payload *BACnetTagPayloadDate, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagDate{ Payload: payload, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -104,21 +103,21 @@ func (m *BACnetApplicationTagDate) GetTypeName() string { return "BACnetApplicationTagDate" } -func (m *BACnetApplicationTagDate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagDate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagDate) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagDate) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetApplicationTagDate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagDate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagDateParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go index caac296fb4a..302f4dd5c02 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go @@ -29,8 +29,7 @@ import ( // The data-structure of this message type BACnetApplicationTagDouble struct { *BACnetApplicationTag - Payload *BACnetTagPayloadDouble - ActualValue float64 + Payload *BACnetTagPayloadDouble } // The corresponding interface @@ -39,10 +38,10 @@ type IBACnetApplicationTagDouble interface { GetPayload() *BACnetTagPayloadDouble // GetActualValue returns ActualValue GetActualValue() float64 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,10 +57,8 @@ func (m *BACnetApplicationTagDouble) GetActualTagNumber() uint8 { return 0x5 } -func (m *BACnetApplicationTagDouble) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagDouble) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -75,15 +72,14 @@ func (m *BACnetApplicationTagDouble) GetPayload() *BACnetTagPayloadDouble { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagDouble) GetActualValue() float64 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetValue() } -func NewBACnetApplicationTagDouble(payload *BACnetTagPayloadDouble, actualValue float64, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagDouble factory function for BACnetApplicationTagDouble +func NewBACnetApplicationTagDouble(payload *BACnetTagPayloadDouble, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagDouble{ Payload: payload, - ActualValue: actualValue, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -112,23 +108,23 @@ func (m *BACnetApplicationTagDouble) GetTypeName() string { return "BACnetApplicationTagDouble" } -func (m *BACnetApplicationTagDouble) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagDouble) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagDouble) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagDouble) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetApplicationTagDouble) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagDouble) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagDoubleParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { @@ -150,8 +146,9 @@ func BACnetApplicationTagDoubleParse(readBuffer utils.ReadBuffer) (*BACnetApplic } // Virtual field - _actualValue := payload.Value + _actualValue := payload.GetValue() actualValue := float64(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetApplicationTagDouble"); closeErr != nil { return nil, closeErr @@ -160,7 +157,6 @@ func BACnetApplicationTagDoubleParse(readBuffer utils.ReadBuffer) (*BACnetApplic // Create a partially initialized instance _child := &BACnetApplicationTagDouble{ Payload: CastBACnetTagPayloadDouble(payload), - ActualValue: actualValue, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -185,7 +181,7 @@ func (m *BACnetApplicationTagDouble) Serialize(writeBuffer utils.WriteBuffer) er return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go index 5e7fd2b7e9d..1ab260f8f90 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go @@ -29,8 +29,7 @@ import ( // The data-structure of this message type BACnetApplicationTagEnumerated struct { *BACnetApplicationTag - Payload *BACnetTagPayloadEnumerated - ActualValue uint32 + Payload *BACnetTagPayloadEnumerated } // The corresponding interface @@ -39,10 +38,10 @@ type IBACnetApplicationTagEnumerated interface { GetPayload() *BACnetTagPayloadEnumerated // GetActualValue returns ActualValue GetActualValue() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,10 +57,8 @@ func (m *BACnetApplicationTagEnumerated) GetActualTagNumber() uint8 { return 0x9 } -func (m *BACnetApplicationTagEnumerated) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagEnumerated) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -75,15 +72,14 @@ func (m *BACnetApplicationTagEnumerated) GetPayload() *BACnetTagPayloadEnumerate // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagEnumerated) GetActualValue() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetActualValue() } -func NewBACnetApplicationTagEnumerated(payload *BACnetTagPayloadEnumerated, actualValue uint32, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagEnumerated factory function for BACnetApplicationTagEnumerated +func NewBACnetApplicationTagEnumerated(payload *BACnetTagPayloadEnumerated, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagEnumerated{ Payload: payload, - ActualValue: actualValue, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -112,23 +108,23 @@ func (m *BACnetApplicationTagEnumerated) GetTypeName() string { return "BACnetApplicationTagEnumerated" } -func (m *BACnetApplicationTagEnumerated) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagEnumerated) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagEnumerated) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagEnumerated) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetApplicationTagEnumerated) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagEnumerated) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagEnumeratedParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -140,7 +136,7 @@ func BACnetApplicationTagEnumeratedParse(readBuffer utils.ReadBuffer, header *BA if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadEnumeratedParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadEnumeratedParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } @@ -150,8 +146,9 @@ func BACnetApplicationTagEnumeratedParse(readBuffer utils.ReadBuffer, header *BA } // Virtual field - _actualValue := payload.ActualValue + _actualValue := payload.GetActualValue() actualValue := uint32(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetApplicationTagEnumerated"); closeErr != nil { return nil, closeErr @@ -160,7 +157,6 @@ func BACnetApplicationTagEnumeratedParse(readBuffer utils.ReadBuffer, header *BA // Create a partially initialized instance _child := &BACnetApplicationTagEnumerated{ Payload: CastBACnetTagPayloadEnumerated(payload), - ActualValue: actualValue, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -185,7 +181,7 @@ func (m *BACnetApplicationTagEnumerated) Serialize(writeBuffer utils.WriteBuffer return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go index 19452e15518..940f57087d0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go @@ -32,10 +32,10 @@ type BACnetApplicationTagNull struct { // The corresponding interface type IBACnetApplicationTagNull interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,10 +51,8 @@ func (m *BACnetApplicationTagNull) GetActualTagNumber() uint8 { return 0x0 } -func (m *BACnetApplicationTagNull) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagNull) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -65,9 +63,10 @@ func (m *BACnetApplicationTagNull) InitializeParent(parent *BACnetApplicationTag // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetApplicationTagNull(header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagNull factory function for BACnetApplicationTagNull +func NewBACnetApplicationTagNull(header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagNull{ - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -96,18 +95,18 @@ func (m *BACnetApplicationTagNull) GetTypeName() string { return "BACnetApplicationTagNull" } -func (m *BACnetApplicationTagNull) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagNull) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagNull) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagNull) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetApplicationTagNull) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagNull) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagNullParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go index ccdf717cb20..0ecbace52d8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go @@ -29,9 +29,7 @@ import ( // The data-structure of this message type BACnetApplicationTagObjectIdentifier struct { *BACnetApplicationTag - Payload *BACnetTagPayloadObjectIdentifier - ObjectType BACnetObjectType - InstanceNumber uint32 + Payload *BACnetTagPayloadObjectIdentifier } // The corresponding interface @@ -42,10 +40,10 @@ type IBACnetApplicationTagObjectIdentifier interface { GetObjectType() BACnetObjectType // GetInstanceNumber returns InstanceNumber GetInstanceNumber() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,10 +59,8 @@ func (m *BACnetApplicationTagObjectIdentifier) GetActualTagNumber() uint8 { return 0xC } -func (m *BACnetApplicationTagObjectIdentifier) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagObjectIdentifier) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -78,21 +74,18 @@ func (m *BACnetApplicationTagObjectIdentifier) GetPayload() *BACnetTagPayloadObj // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagObjectIdentifier) GetObjectType() BACnetObjectType { - // TODO: calculation should happen here instead accessing the stored field - return m.ObjectType + return m.GetPayload().GetObjectType() } func (m *BACnetApplicationTagObjectIdentifier) GetInstanceNumber() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.InstanceNumber + return m.GetPayload().GetInstanceNumber() } -func NewBACnetApplicationTagObjectIdentifier(payload *BACnetTagPayloadObjectIdentifier, objectType BACnetObjectType, instanceNumber uint32, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagObjectIdentifier factory function for BACnetApplicationTagObjectIdentifier +func NewBACnetApplicationTagObjectIdentifier(payload *BACnetTagPayloadObjectIdentifier, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagObjectIdentifier{ Payload: payload, - ObjectType: objectType, - InstanceNumber: instanceNumber, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -121,15 +114,15 @@ func (m *BACnetApplicationTagObjectIdentifier) GetTypeName() string { return "BACnetApplicationTagObjectIdentifier" } -func (m *BACnetApplicationTagObjectIdentifier) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagObjectIdentifier) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagObjectIdentifier) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagObjectIdentifier) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. @@ -138,8 +131,8 @@ func (m *BACnetApplicationTagObjectIdentifier) LengthInBitsConditional(lastItem return lengthInBits } -func (m *BACnetApplicationTagObjectIdentifier) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagObjectIdentifier) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagObjectIdentifierParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { @@ -161,12 +154,14 @@ func BACnetApplicationTagObjectIdentifierParse(readBuffer utils.ReadBuffer) (*BA } // Virtual field - _objectType := payload.ObjectType + _objectType := payload.GetObjectType() objectType := BACnetObjectType(_objectType) + _ = objectType // Virtual field - _instanceNumber := payload.InstanceNumber + _instanceNumber := payload.GetInstanceNumber() instanceNumber := uint32(_instanceNumber) + _ = instanceNumber if closeErr := readBuffer.CloseContext("BACnetApplicationTagObjectIdentifier"); closeErr != nil { return nil, closeErr @@ -175,8 +170,6 @@ func BACnetApplicationTagObjectIdentifierParse(readBuffer utils.ReadBuffer) (*BA // Create a partially initialized instance _child := &BACnetApplicationTagObjectIdentifier{ Payload: CastBACnetTagPayloadObjectIdentifier(payload), - ObjectType: objectType, - InstanceNumber: instanceNumber, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -201,11 +194,11 @@ func (m *BACnetApplicationTagObjectIdentifier) Serialize(writeBuffer utils.Write return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _objectTypeErr := writeBuffer.WriteVirtual("objectType", m.ObjectType); _objectTypeErr != nil { + if _objectTypeErr := writeBuffer.WriteVirtual("objectType", m.GetObjectType()); _objectTypeErr != nil { return errors.Wrap(_objectTypeErr, "Error serializing 'objectType' field") } // Virtual field - if _instanceNumberErr := writeBuffer.WriteVirtual("instanceNumber", m.InstanceNumber); _instanceNumberErr != nil { + if _instanceNumberErr := writeBuffer.WriteVirtual("instanceNumber", m.GetInstanceNumber()); _instanceNumberErr != nil { return errors.Wrap(_instanceNumberErr, "Error serializing 'instanceNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go index 6daa7ef2c28..07819be28a0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go @@ -30,7 +30,6 @@ import ( type BACnetApplicationTagOctetString struct { *BACnetApplicationTag Payload *BACnetTagPayloadOctetString - Value string } // The corresponding interface @@ -39,10 +38,10 @@ type IBACnetApplicationTagOctetString interface { GetPayload() *BACnetTagPayloadOctetString // GetValue returns Value GetValue() string - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,10 +57,8 @@ func (m *BACnetApplicationTagOctetString) GetActualTagNumber() uint8 { return 0x6 } -func (m *BACnetApplicationTagOctetString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagOctetString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -75,15 +72,14 @@ func (m *BACnetApplicationTagOctetString) GetPayload() *BACnetTagPayloadOctetStr // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagOctetString) GetValue() string { - // TODO: calculation should happen here instead accessing the stored field - return m.Value + return m.GetPayload().GetValue() } -func NewBACnetApplicationTagOctetString(payload *BACnetTagPayloadOctetString, value string, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagOctetString factory function for BACnetApplicationTagOctetString +func NewBACnetApplicationTagOctetString(payload *BACnetTagPayloadOctetString, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagOctetString{ Payload: payload, - Value: value, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -112,23 +108,23 @@ func (m *BACnetApplicationTagOctetString) GetTypeName() string { return "BACnetApplicationTagOctetString" } -func (m *BACnetApplicationTagOctetString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagOctetString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagOctetString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagOctetString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetApplicationTagOctetString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagOctetString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagOctetStringParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -140,7 +136,7 @@ func BACnetApplicationTagOctetStringParse(readBuffer utils.ReadBuffer, header *B if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadOctetStringParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadOctetStringParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } @@ -150,8 +146,9 @@ func BACnetApplicationTagOctetStringParse(readBuffer utils.ReadBuffer, header *B } // Virtual field - _value := payload.Value + _value := payload.GetValue() value := string(_value) + _ = value if closeErr := readBuffer.CloseContext("BACnetApplicationTagOctetString"); closeErr != nil { return nil, closeErr @@ -160,7 +157,6 @@ func BACnetApplicationTagOctetStringParse(readBuffer utils.ReadBuffer, header *B // Create a partially initialized instance _child := &BACnetApplicationTagOctetString{ Payload: CastBACnetTagPayloadOctetString(payload), - Value: value, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -185,7 +181,7 @@ func (m *BACnetApplicationTagOctetString) Serialize(writeBuffer utils.WriteBuffe return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _valueErr := writeBuffer.WriteVirtual("value", m.Value); _valueErr != nil { + if _valueErr := writeBuffer.WriteVirtual("value", m.GetValue()); _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go index bfd17cad543..ff2a486216f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go @@ -29,8 +29,7 @@ import ( // The data-structure of this message type BACnetApplicationTagReal struct { *BACnetApplicationTag - Payload *BACnetTagPayloadReal - ActualValue float32 + Payload *BACnetTagPayloadReal } // The corresponding interface @@ -39,10 +38,10 @@ type IBACnetApplicationTagReal interface { GetPayload() *BACnetTagPayloadReal // GetActualValue returns ActualValue GetActualValue() float32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,10 +57,8 @@ func (m *BACnetApplicationTagReal) GetActualTagNumber() uint8 { return 0x4 } -func (m *BACnetApplicationTagReal) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagReal) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -75,15 +72,14 @@ func (m *BACnetApplicationTagReal) GetPayload() *BACnetTagPayloadReal { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetApplicationTagReal) GetActualValue() float32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetValue() } -func NewBACnetApplicationTagReal(payload *BACnetTagPayloadReal, actualValue float32, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagReal factory function for BACnetApplicationTagReal +func NewBACnetApplicationTagReal(payload *BACnetTagPayloadReal, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagReal{ Payload: payload, - ActualValue: actualValue, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -112,23 +108,23 @@ func (m *BACnetApplicationTagReal) GetTypeName() string { return "BACnetApplicationTagReal" } -func (m *BACnetApplicationTagReal) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagReal) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagReal) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagReal) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetApplicationTagReal) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagReal) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagRealParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { @@ -150,8 +146,9 @@ func BACnetApplicationTagRealParse(readBuffer utils.ReadBuffer) (*BACnetApplicat } // Virtual field - _actualValue := payload.Value + _actualValue := payload.GetValue() actualValue := float32(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetApplicationTagReal"); closeErr != nil { return nil, closeErr @@ -160,7 +157,6 @@ func BACnetApplicationTagRealParse(readBuffer utils.ReadBuffer) (*BACnetApplicat // Create a partially initialized instance _child := &BACnetApplicationTagReal{ Payload: CastBACnetTagPayloadReal(payload), - ActualValue: actualValue, BACnetApplicationTag: &BACnetApplicationTag{}, } _child.BACnetApplicationTag.Child = _child @@ -185,7 +181,7 @@ func (m *BACnetApplicationTagReal) Serialize(writeBuffer utils.WriteBuffer) erro return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go index 25357bc6474..6c7a1a44dbe 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go @@ -36,10 +36,10 @@ type BACnetApplicationTagSignedInteger struct { type IBACnetApplicationTagSignedInteger interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadSignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,10 +55,8 @@ func (m *BACnetApplicationTagSignedInteger) GetActualTagNumber() uint8 { return 0x3 } -func (m *BACnetApplicationTagSignedInteger) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagSignedInteger) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -72,10 +70,11 @@ func (m *BACnetApplicationTagSignedInteger) GetPayload() *BACnetTagPayloadSigned // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetApplicationTagSignedInteger(payload *BACnetTagPayloadSignedInteger, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagSignedInteger factory function for BACnetApplicationTagSignedInteger +func NewBACnetApplicationTagSignedInteger(payload *BACnetTagPayloadSignedInteger, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagSignedInteger{ Payload: payload, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -104,21 +103,21 @@ func (m *BACnetApplicationTagSignedInteger) GetTypeName() string { return "BACnetApplicationTagSignedInteger" } -func (m *BACnetApplicationTagSignedInteger) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagSignedInteger) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagSignedInteger) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagSignedInteger) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetApplicationTagSignedInteger) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagSignedInteger) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagSignedIntegerParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -130,7 +129,7 @@ func BACnetApplicationTagSignedIntegerParse(readBuffer utils.ReadBuffer, header if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadSignedIntegerParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadSignedIntegerParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go index e4a0ebec720..0d67c958063 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go @@ -36,10 +36,10 @@ type BACnetApplicationTagTime struct { type IBACnetApplicationTagTime interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,10 +55,8 @@ func (m *BACnetApplicationTagTime) GetActualTagNumber() uint8 { return 0xB } -func (m *BACnetApplicationTagTime) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagTime) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -72,10 +70,11 @@ func (m *BACnetApplicationTagTime) GetPayload() *BACnetTagPayloadTime { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetApplicationTagTime(payload *BACnetTagPayloadTime, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagTime factory function for BACnetApplicationTagTime +func NewBACnetApplicationTagTime(payload *BACnetTagPayloadTime, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagTime{ Payload: payload, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -104,21 +103,21 @@ func (m *BACnetApplicationTagTime) GetTypeName() string { return "BACnetApplicationTagTime" } -func (m *BACnetApplicationTagTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagTime) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagTime) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetApplicationTagTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagTimeParse(readBuffer utils.ReadBuffer) (*BACnetApplicationTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go index 36078de6946..ca857ece3f7 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go @@ -36,10 +36,10 @@ type BACnetApplicationTagUnsignedInteger struct { type IBACnetApplicationTagUnsignedInteger interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,10 +55,8 @@ func (m *BACnetApplicationTagUnsignedInteger) GetActualTagNumber() uint8 { return 0x2 } -func (m *BACnetApplicationTagUnsignedInteger) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) { +func (m *BACnetApplicationTagUnsignedInteger) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) { m.BACnetApplicationTag.Header = header - m.BACnetApplicationTag.ActualTagNumber = actualTagNumber - m.BACnetApplicationTag.ActualLength = actualLength } /////////////////////////////////////////////////////////// @@ -72,10 +70,11 @@ func (m *BACnetApplicationTagUnsignedInteger) GetPayload() *BACnetTagPayloadUnsi // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetApplicationTagUnsignedInteger(payload *BACnetTagPayloadUnsignedInteger, header *BACnetTagHeader, actualTagNumber uint8, actualLength uint32) *BACnetApplicationTag { +// NewBACnetApplicationTagUnsignedInteger factory function for BACnetApplicationTagUnsignedInteger +func NewBACnetApplicationTagUnsignedInteger(payload *BACnetTagPayloadUnsignedInteger, header *BACnetTagHeader) *BACnetApplicationTag { child := &BACnetApplicationTagUnsignedInteger{ Payload: payload, - BACnetApplicationTag: NewBACnetApplicationTag(header, actualTagNumber, actualLength), + BACnetApplicationTag: NewBACnetApplicationTag(header), } child.Child = child return child.BACnetApplicationTag @@ -104,21 +103,21 @@ func (m *BACnetApplicationTagUnsignedInteger) GetTypeName() string { return "BACnetApplicationTagUnsignedInteger" } -func (m *BACnetApplicationTagUnsignedInteger) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetApplicationTagUnsignedInteger) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetApplicationTagUnsignedInteger) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetApplicationTagUnsignedInteger) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetApplicationTagUnsignedInteger) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetApplicationTagUnsignedInteger) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetApplicationTagUnsignedIntegerParse(readBuffer utils.ReadBuffer, header *BACnetTagHeader) (*BACnetApplicationTag, error) { @@ -130,7 +129,7 @@ func BACnetApplicationTagUnsignedIntegerParse(readBuffer utils.ReadBuffer, heade if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadUnsignedIntegerParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadUnsignedIntegerParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go index fae3eb028cd..480776020c9 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go @@ -29,9 +29,10 @@ import ( // The data-structure of this message type BACnetBinaryPV struct { - RawData *BACnetContextTagEnumerated - IsInactive bool - IsActive bool + RawData *BACnetContextTagEnumerated + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -42,10 +43,10 @@ type IBACnetBinaryPV interface { GetIsInactive() bool // GetIsActive returns IsActive GetIsActive() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,17 +62,20 @@ func (m *BACnetBinaryPV) GetRawData() *BACnetContextTagEnumerated { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetBinaryPV) GetIsInactive() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInactive + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (0))) } func (m *BACnetBinaryPV) GetIsActive() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsActive + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (1))) } -func NewBACnetBinaryPV(rawData *BACnetContextTagEnumerated, isInactive bool, isActive bool) *BACnetBinaryPV { - return &BACnetBinaryPV{RawData: rawData, IsInactive: isInactive, IsActive: isActive} +// NewBACnetBinaryPV factory function for BACnetBinaryPV +func NewBACnetBinaryPV(rawData *BACnetContextTagEnumerated, tagNumber uint8) *BACnetBinaryPV { + return &BACnetBinaryPV{RawData: rawData, TagNumber: tagNumber} } func CastBACnetBinaryPV(structType interface{}) *BACnetBinaryPV { @@ -91,16 +95,16 @@ func (m *BACnetBinaryPV) GetTypeName() string { return "BACnetBinaryPV" } -func (m *BACnetBinaryPV) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetBinaryPV) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetBinaryPV) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetBinaryPV) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Optional Field (rawData) if m.RawData != nil { - lengthInBits += (*m.RawData).LengthInBits() + lengthInBits += (*m.RawData).GetLengthInBits() } // A virtual field doesn't have any in- or output. @@ -110,8 +114,8 @@ func (m *BACnetBinaryPV) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetBinaryPV) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetBinaryPV) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetBinaryPVParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetBinaryPV, error) { @@ -141,19 +145,21 @@ func BACnetBinaryPVParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetB } // Virtual field - _isInactive := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (0))) + _isInactive := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (0))) isInactive := bool(_isInactive) + _ = isInactive // Virtual field - _isActive := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (1))) + _isActive := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (1))) isActive := bool(_isActive) + _ = isActive if closeErr := readBuffer.CloseContext("BACnetBinaryPV"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetBinaryPV(rawData, isInactive, isActive), nil + return NewBACnetBinaryPV(rawData, tagNumber), nil } func (m *BACnetBinaryPV) Serialize(writeBuffer utils.WriteBuffer) error { @@ -177,11 +183,11 @@ func (m *BACnetBinaryPV) Serialize(writeBuffer utils.WriteBuffer) error { } } // Virtual field - if _isInactiveErr := writeBuffer.WriteVirtual("isInactive", m.IsInactive); _isInactiveErr != nil { + if _isInactiveErr := writeBuffer.WriteVirtual("isInactive", m.GetIsInactive()); _isInactiveErr != nil { return errors.Wrap(_isInactiveErr, "Error serializing 'isInactive' field") } // Virtual field - if _isActiveErr := writeBuffer.WriteVirtual("isActive", m.IsActive); _isActiveErr != nil { + if _isActiveErr := writeBuffer.WriteVirtual("isActive", m.GetIsActive()); _isActiveErr != nil { return errors.Wrap(_isActiveErr, "Error serializing 'isActive' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetCharacterEncoding.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetCharacterEncoding.go index ca42257d0eb..287fc1b5f04 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetCharacterEncoding.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetCharacterEncoding.go @@ -110,12 +110,12 @@ func CastBACnetCharacterEncoding(structType interface{}) BACnetCharacterEncoding return castFunc(structType) } -func (m BACnetCharacterEncoding) LengthInBits() uint16 { +func (m BACnetCharacterEncoding) GetLengthInBits() uint16 { return 8 } -func (m BACnetCharacterEncoding) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetCharacterEncoding) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetCharacterEncodingParse(readBuffer utils.ReadBuffer) (BACnetCharacterEncoding, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go index c37bb4387c6..85802fc1172 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go @@ -28,14 +28,18 @@ import ( // The data-structure of this message type BACnetClosingTag struct { *BACnetContextTag + + // Arguments. + TagNumberArgument uint8 + ActualLength uint32 } // The corresponding interface type IBACnetClosingTag interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,11 +55,8 @@ func (m *BACnetClosingTag) GetDataType() BACnetDataType { return BACnetDataType_CLOSING_TAG } -func (m *BACnetClosingTag) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetClosingTag) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -66,9 +67,10 @@ func (m *BACnetClosingTag) InitializeParent(parent *BACnetContextTag, header *BA // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetClosingTag(header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetClosingTag factory function for BACnetClosingTag +func NewBACnetClosingTag(header *BACnetTagHeader, tagNumberArgument uint8, actualLength uint32) *BACnetContextTag { child := &BACnetClosingTag{ - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -97,18 +99,18 @@ func (m *BACnetClosingTag) GetTypeName() string { return "BACnetClosingTag" } -func (m *BACnetClosingTag) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetClosingTag) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetClosingTag) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetClosingTag) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetClosingTag) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetClosingTag) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetClosingTagParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, actualLength uint32) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go index 3a34b463aad..3a0f019d490 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go @@ -35,10 +35,10 @@ type BACnetConfirmedServiceACK struct { type IBACnetConfirmedServiceACK interface { // ServiceChoice returns ServiceChoice ServiceChoice() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IBACnetConfirmedServiceACKChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACK factory function for BACnetConfirmedServiceACK func NewBACnetConfirmedServiceACK() *BACnetConfirmedServiceACK { return &BACnetConfirmedServiceACK{} } @@ -84,15 +85,15 @@ func (m *BACnetConfirmedServiceACK) GetTypeName() string { return "BACnetConfirmedServiceACK" } -func (m *BACnetConfirmedServiceACK) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACK) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACK) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetConfirmedServiceACK) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetConfirmedServiceACK) ParentLengthInBits() uint16 { +func (m *BACnetConfirmedServiceACK) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (serviceChoice) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *BACnetConfirmedServiceACK) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BACnetConfirmedServiceACK) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACK) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go index 532495a831f..1ba0298f6cc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKAtomicReadFile struct { // The corresponding interface type IBACnetConfirmedServiceACKAtomicReadFile interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKAtomicReadFile) InitializeParent(parent *BACne // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKAtomicReadFile factory function for BACnetConfirmedServiceACKAtomicReadFile func NewBACnetConfirmedServiceACKAtomicReadFile() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKAtomicReadFile{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKAtomicReadFile) GetTypeName() string { return "BACnetConfirmedServiceACKAtomicReadFile" } -func (m *BACnetConfirmedServiceACKAtomicReadFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKAtomicReadFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKAtomicReadFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKAtomicReadFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKAtomicReadFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKAtomicReadFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKAtomicReadFileParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go index 896b17098b1..2595cbb6b85 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKAtomicWriteFile struct { // The corresponding interface type IBACnetConfirmedServiceACKAtomicWriteFile interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKAtomicWriteFile) InitializeParent(parent *BACn // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKAtomicWriteFile factory function for BACnetConfirmedServiceACKAtomicWriteFile func NewBACnetConfirmedServiceACKAtomicWriteFile() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKAtomicWriteFile{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKAtomicWriteFile) GetTypeName() string { return "BACnetConfirmedServiceACKAtomicWriteFile" } -func (m *BACnetConfirmedServiceACKAtomicWriteFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKAtomicWriteFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKAtomicWriteFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKAtomicWriteFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKAtomicWriteFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKAtomicWriteFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKAtomicWriteFileParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go index 014e20a71c8..73ce5d7655e 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKConfirmedPrivateTransfer struct { // The corresponding interface type IBACnetConfirmedServiceACKConfirmedPrivateTransfer interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) InitializeParent(par // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKConfirmedPrivateTransfer factory function for BACnetConfirmedServiceACKConfirmedPrivateTransfer func NewBACnetConfirmedServiceACKConfirmedPrivateTransfer() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKConfirmedPrivateTransfer{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) GetTypeName() string return "BACnetConfirmedServiceACKConfirmedPrivateTransfer" } -func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKConfirmedPrivateTransferParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go index 3578b80ccf0..e3905d8f00a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKCreateObject struct { // The corresponding interface type IBACnetConfirmedServiceACKCreateObject interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetConfirmedServiceACKCreateObject) InitializeParent(parent *BACnetC // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKCreateObject factory function for BACnetConfirmedServiceACKCreateObject func NewBACnetConfirmedServiceACKCreateObject() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKCreateObject{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -92,18 +93,18 @@ func (m *BACnetConfirmedServiceACKCreateObject) GetTypeName() string { return "BACnetConfirmedServiceACKCreateObject" } -func (m *BACnetConfirmedServiceACKCreateObject) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKCreateObject) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKCreateObject) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKCreateObject) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKCreateObject) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKCreateObject) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKCreateObjectParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go index bde25340e59..c132c75a611 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKGetAlarmSummary struct { // The corresponding interface type IBACnetConfirmedServiceACKGetAlarmSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKGetAlarmSummary) InitializeParent(parent *BACn // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKGetAlarmSummary factory function for BACnetConfirmedServiceACKGetAlarmSummary func NewBACnetConfirmedServiceACKGetAlarmSummary() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKGetAlarmSummary{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKGetAlarmSummary) GetTypeName() string { return "BACnetConfirmedServiceACKGetAlarmSummary" } -func (m *BACnetConfirmedServiceACKGetAlarmSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKGetAlarmSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKGetAlarmSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKGetAlarmSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKGetAlarmSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKGetAlarmSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKGetAlarmSummaryParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go index 45cc254d37a..c3a962580eb 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKGetEnrollmentSummary struct { // The corresponding interface type IBACnetConfirmedServiceACKGetEnrollmentSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKGetEnrollmentSummary factory function for BACnetConfirmedServiceACKGetEnrollmentSummary func NewBACnetConfirmedServiceACKGetEnrollmentSummary() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKGetEnrollmentSummary{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) GetTypeName() string { return "BACnetConfirmedServiceACKGetEnrollmentSummary" } -func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKGetEnrollmentSummaryParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go index 3cba6bc86bf..afa72c457d8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKGetEventInformation struct { // The corresponding interface type IBACnetConfirmedServiceACKGetEventInformation interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKGetEventInformation) InitializeParent(parent * // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKGetEventInformation factory function for BACnetConfirmedServiceACKGetEventInformation func NewBACnetConfirmedServiceACKGetEventInformation() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKGetEventInformation{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKGetEventInformation) GetTypeName() string { return "BACnetConfirmedServiceACKGetEventInformation" } -func (m *BACnetConfirmedServiceACKGetEventInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKGetEventInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKGetEventInformation) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKGetEventInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKGetEventInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKGetEventInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKGetEventInformationParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go index 354be5020a9..6bf9081eafa 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKReadProperty struct { // The corresponding interface type IBACnetConfirmedServiceACKReadProperty interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetConfirmedServiceACKReadProperty) InitializeParent(parent *BACnetC // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKReadProperty factory function for BACnetConfirmedServiceACKReadProperty func NewBACnetConfirmedServiceACKReadProperty() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKReadProperty{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -92,18 +93,18 @@ func (m *BACnetConfirmedServiceACKReadProperty) GetTypeName() string { return "BACnetConfirmedServiceACKReadProperty" } -func (m *BACnetConfirmedServiceACKReadProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKReadProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKReadProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKReadProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKReadProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKReadProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKReadPropertyParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go index dc94fabc298..024aa86f226 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKReadPropertyMultiple struct { // The corresponding interface type IBACnetConfirmedServiceACKReadPropertyMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKReadPropertyMultiple) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKReadPropertyMultiple factory function for BACnetConfirmedServiceACKReadPropertyMultiple func NewBACnetConfirmedServiceACKReadPropertyMultiple() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKReadPropertyMultiple{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKReadPropertyMultiple) GetTypeName() string { return "BACnetConfirmedServiceACKReadPropertyMultiple" } -func (m *BACnetConfirmedServiceACKReadPropertyMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKReadPropertyMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKReadPropertyMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKReadPropertyMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKReadPropertyMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKReadPropertyMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKReadPropertyMultipleParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go index cb3d433283e..8edee75db68 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKReadRange struct { // The corresponding interface type IBACnetConfirmedServiceACKReadRange interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetConfirmedServiceACKReadRange) InitializeParent(parent *BACnetConf // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKReadRange factory function for BACnetConfirmedServiceACKReadRange func NewBACnetConfirmedServiceACKReadRange() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKReadRange{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -92,18 +93,18 @@ func (m *BACnetConfirmedServiceACKReadRange) GetTypeName() string { return "BACnetConfirmedServiceACKReadRange" } -func (m *BACnetConfirmedServiceACKReadRange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKReadRange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKReadRange) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKReadRange) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKReadRange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKReadRange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKReadRangeParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go index 3683d6b832e..443cbef6d11 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKRemovedAuthenticate struct { // The corresponding interface type IBACnetConfirmedServiceACKRemovedAuthenticate interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKRemovedAuthenticate) InitializeParent(parent * // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKRemovedAuthenticate factory function for BACnetConfirmedServiceACKRemovedAuthenticate func NewBACnetConfirmedServiceACKRemovedAuthenticate() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKRemovedAuthenticate{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKRemovedAuthenticate) GetTypeName() string { return "BACnetConfirmedServiceACKRemovedAuthenticate" } -func (m *BACnetConfirmedServiceACKRemovedAuthenticate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKRemovedAuthenticate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKRemovedAuthenticate) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKRemovedAuthenticate) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKRemovedAuthenticate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKRemovedAuthenticate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKRemovedAuthenticateParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go index 30d3e4403f4..a68157c68c5 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKRemovedReadPropertyConditional struct { // The corresponding interface type IBACnetConfirmedServiceACKRemovedReadPropertyConditional interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) InitializePare // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKRemovedReadPropertyConditional factory function for BACnetConfirmedServiceACKRemovedReadPropertyConditional func NewBACnetConfirmedServiceACKRemovedReadPropertyConditional() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKRemovedReadPropertyConditional{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -93,18 +94,18 @@ func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) GetTypeName() return "BACnetConfirmedServiceACKRemovedReadPropertyConditional" } -func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKRemovedReadPropertyConditionalParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go index 0b3e45b7b2d..5728c4f752b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKVTData struct { // The corresponding interface type IBACnetConfirmedServiceACKVTData interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetConfirmedServiceACKVTData) InitializeParent(parent *BACnetConfirm // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKVTData factory function for BACnetConfirmedServiceACKVTData func NewBACnetConfirmedServiceACKVTData() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKVTData{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -92,18 +93,18 @@ func (m *BACnetConfirmedServiceACKVTData) GetTypeName() string { return "BACnetConfirmedServiceACKVTData" } -func (m *BACnetConfirmedServiceACKVTData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKVTData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKVTData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKVTData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKVTData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKVTData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKVTDataParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go index 9f073280f08..53811e6698c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceACKVTOpen struct { // The corresponding interface type IBACnetConfirmedServiceACKVTOpen interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetConfirmedServiceACKVTOpen) InitializeParent(parent *BACnetConfirm // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceACKVTOpen factory function for BACnetConfirmedServiceACKVTOpen func NewBACnetConfirmedServiceACKVTOpen() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceACKVTOpen{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -92,18 +93,18 @@ func (m *BACnetConfirmedServiceACKVTOpen) GetTypeName() string { return "BACnetConfirmedServiceACKVTOpen" } -func (m *BACnetConfirmedServiceACKVTOpen) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceACKVTOpen) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceACKVTOpen) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceACKVTOpen) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceACKVTOpen) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceACKVTOpen) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceACKVTOpenParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go index a3513c8b041..bd5cf2cd263 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go @@ -32,10 +32,10 @@ type BACnetConfirmedServiceAddListElement struct { // The corresponding interface type IBACnetConfirmedServiceAddListElement interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetConfirmedServiceAddListElement) InitializeParent(parent *BACnetCo // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetConfirmedServiceAddListElement factory function for BACnetConfirmedServiceAddListElement func NewBACnetConfirmedServiceAddListElement() *BACnetConfirmedServiceACK { child := &BACnetConfirmedServiceAddListElement{ BACnetConfirmedServiceACK: NewBACnetConfirmedServiceACK(), @@ -92,18 +93,18 @@ func (m *BACnetConfirmedServiceAddListElement) GetTypeName() string { return "BACnetConfirmedServiceAddListElement" } -func (m *BACnetConfirmedServiceAddListElement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceAddListElement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceAddListElement) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceAddListElement) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceAddListElement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceAddListElement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceAddListElementParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go index e62ef0052b6..9b1f24bf7ba 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go @@ -28,6 +28,9 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequest struct { + + // Arguments. + Len uint16 Child IBACnetConfirmedServiceRequestChild } @@ -35,10 +38,10 @@ type BACnetConfirmedServiceRequest struct { type IBACnetConfirmedServiceRequest interface { // ServiceChoice returns ServiceChoice ServiceChoice() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IBACnetConfirmedServiceRequestChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequest() *BACnetConfirmedServiceRequest { - return &BACnetConfirmedServiceRequest{} +// NewBACnetConfirmedServiceRequest factory function for BACnetConfirmedServiceRequest +func NewBACnetConfirmedServiceRequest(len uint16) *BACnetConfirmedServiceRequest { + return &BACnetConfirmedServiceRequest{Len: len} } func CastBACnetConfirmedServiceRequest(structType interface{}) *BACnetConfirmedServiceRequest { @@ -84,15 +88,15 @@ func (m *BACnetConfirmedServiceRequest) GetTypeName() string { return "BACnetConfirmedServiceRequest" } -func (m *BACnetConfirmedServiceRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequest) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetConfirmedServiceRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetConfirmedServiceRequest) ParentLengthInBits() uint16 { +func (m *BACnetConfirmedServiceRequest) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (serviceChoice) lengthInBits += 8 @@ -100,8 +104,8 @@ func (m *BACnetConfirmedServiceRequest) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BACnetConfirmedServiceRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go index 282f7317271..2a3afae3e03 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestAcknowledgeAlarm struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestAcknowledgeAlarm interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestAcknowledgeAlarm() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestAcknowledgeAlarm factory function for BACnetConfirmedServiceRequestAcknowledgeAlarm +func NewBACnetConfirmedServiceRequestAcknowledgeAlarm(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestAcknowledgeAlarm{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetTypeName() string { return "BACnetConfirmedServiceRequestAcknowledgeAlarm" } -func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAcknowledgeAlarmParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go index 95e4054c59a..e423f9b09af 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestAddListElement struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestAddListElement interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestAddListElement) InitializeParent(parent *B // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestAddListElement() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestAddListElement factory function for BACnetConfirmedServiceRequestAddListElement +func NewBACnetConfirmedServiceRequestAddListElement(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestAddListElement{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestAddListElement) GetTypeName() string { return "BACnetConfirmedServiceRequestAddListElement" } -func (m *BACnetConfirmedServiceRequestAddListElement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAddListElement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAddListElement) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestAddListElement) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestAddListElement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAddListElement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAddListElementParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go index 56cd4b1e49e..5de25bb9701 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go @@ -31,6 +31,9 @@ type BACnetConfirmedServiceRequestAtomicReadFile struct { *BACnetConfirmedServiceRequest FileIdentifier *BACnetApplicationTagObjectIdentifier AccessMethod *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord + + // Arguments. + Len uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type IBACnetConfirmedServiceRequestAtomicReadFile interface { GetFileIdentifier() *BACnetApplicationTagObjectIdentifier // GetAccessMethod returns AccessMethod GetAccessMethod() *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetAccessMethod() *BACnetC // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestAtomicReadFile(fileIdentifier *BACnetApplicationTagObjectIdentifier, accessMethod *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestAtomicReadFile factory function for BACnetConfirmedServiceRequestAtomicReadFile +func NewBACnetConfirmedServiceRequestAtomicReadFile(fileIdentifier *BACnetApplicationTagObjectIdentifier, accessMethod *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestAtomicReadFile{ FileIdentifier: fileIdentifier, AccessMethod: accessMethod, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -109,24 +113,24 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetTypeName() string { return "BACnetConfirmedServiceRequestAtomicReadFile" } -func (m *BACnetConfirmedServiceRequestAtomicReadFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAtomicReadFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fileIdentifier) - lengthInBits += m.FileIdentifier.LengthInBits() + lengthInBits += m.FileIdentifier.GetLengthInBits() // Simple field (accessMethod) - lengthInBits += m.AccessMethod.LengthInBits() + lengthInBits += m.AccessMethod.GetLengthInBits() return lengthInBits } -func (m *BACnetConfirmedServiceRequestAtomicReadFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAtomicReadFileParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go index 86a42c69064..702dbcf1e3e 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go @@ -39,10 +39,10 @@ type IBACnetConfirmedServiceRequestAtomicReadFileRecord interface { GetFileStartRecord() *BACnetApplicationTagSignedInteger // GetRequestRecordCount returns RequestRecordCount GetRequestRecordCount() *BACnetApplicationTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,11 +58,10 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetPeekedTagNumber() return 0x1 } -func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.OpeningTag = openingTag m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.ClosingTag = closingTag - m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -80,11 +79,12 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetRequestRecordCoun // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestAtomicReadFileRecord(fileStartRecord *BACnetApplicationTagSignedInteger, requestRecordCount *BACnetApplicationTagUnsignedInteger, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { +// NewBACnetConfirmedServiceRequestAtomicReadFileRecord factory function for BACnetConfirmedServiceRequestAtomicReadFileRecord +func NewBACnetConfirmedServiceRequestAtomicReadFileRecord(fileStartRecord *BACnetApplicationTagSignedInteger, requestRecordCount *BACnetApplicationTagUnsignedInteger, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { child := &BACnetConfirmedServiceRequestAtomicReadFileRecord{ FileStartRecord: fileStartRecord, RequestRecordCount: requestRecordCount, - BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord: NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag, peekedTagNumber), + BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord: NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag), } child.Child = child return child.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord @@ -113,24 +113,24 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetTypeName() string return "BACnetConfirmedServiceRequestAtomicReadFileRecord" } -func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fileStartRecord) - lengthInBits += m.FileStartRecord.LengthInBits() + lengthInBits += m.FileStartRecord.GetLengthInBits() // Simple field (requestRecordCount) - lengthInBits += m.RequestRecordCount.LengthInBits() + lengthInBits += m.RequestRecordCount.GetLengthInBits() return lengthInBits } -func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAtomicReadFileRecordParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go index 508eb8eeffa..8235543542d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go @@ -39,10 +39,10 @@ type IBACnetConfirmedServiceRequestAtomicReadFileStream interface { GetFileStartPosition() *BACnetApplicationTagSignedInteger // GetRequestOctetCount returns RequestOctetCount GetRequestOctetCount() *BACnetApplicationTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,11 +58,10 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetPeekedTagNumber() return 0x0 } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.OpeningTag = openingTag m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.ClosingTag = closingTag - m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -80,11 +79,12 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetRequestOctetCount // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestAtomicReadFileStream(fileStartPosition *BACnetApplicationTagSignedInteger, requestOctetCount *BACnetApplicationTagUnsignedInteger, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { +// NewBACnetConfirmedServiceRequestAtomicReadFileStream factory function for BACnetConfirmedServiceRequestAtomicReadFileStream +func NewBACnetConfirmedServiceRequestAtomicReadFileStream(fileStartPosition *BACnetApplicationTagSignedInteger, requestOctetCount *BACnetApplicationTagUnsignedInteger, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { child := &BACnetConfirmedServiceRequestAtomicReadFileStream{ FileStartPosition: fileStartPosition, RequestOctetCount: requestOctetCount, - BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord: NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag, peekedTagNumber), + BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord: NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag), } child.Child = child return child.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord @@ -113,24 +113,24 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetTypeName() string return "BACnetConfirmedServiceRequestAtomicReadFileStream" } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fileStartPosition) - lengthInBits += m.FileStartPosition.LengthInBits() + lengthInBits += m.FileStartPosition.GetLengthInBits() // Simple field (requestOctetCount) - lengthInBits += m.RequestOctetCount.LengthInBits() + lengthInBits += m.RequestOctetCount.GetLengthInBits() return lengthInBits } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAtomicReadFileStreamParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go index 109f6e41629..a689dd8b724 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go @@ -31,7 +31,6 @@ type BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord struct { PeekedTagHeader *BACnetTagHeader OpeningTag *BACnetOpeningTag ClosingTag *BACnetClosingTag - PeekedTagNumber uint8 Child IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordChild } @@ -47,10 +46,10 @@ type IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord interface { GetClosingTag() *BACnetClosingTag // GetPeekedTagNumber returns PeekedTagNumber GetPeekedTagNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +61,7 @@ type IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParent interface type IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) + InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) GetTypeName() string IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord } @@ -86,12 +85,12 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetClosingTa // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + return m.GetPeekedTagHeader().GetActualTagNumber() } -func NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { - return &BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord{PeekedTagHeader: peekedTagHeader, OpeningTag: openingTag, ClosingTag: closingTag, PeekedTagNumber: peekedTagNumber} +// NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord factory function for BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord +func NewBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { + return &BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord{PeekedTagHeader: peekedTagHeader, OpeningTag: openingTag, ClosingTag: closingTag} } func CastBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord(structType interface{}) *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord { @@ -111,30 +110,30 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetTypeName( return "BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord" } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) ParentLengthInBits() uint16 { +func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuffer) (*BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, error) { @@ -154,7 +153,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer u if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil { return nil, pullErr } - _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.ActualTagNumber), BACnetDataType_OPENING_TAG) + _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_OPENING_TAG) if _openingTagErr != nil { return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field") } @@ -164,8 +163,9 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer u } // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord @@ -187,7 +187,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer u if pullErr := readBuffer.PullContext("closingTag"); pullErr != nil { return nil, pullErr } - _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.ActualTagNumber), BACnetDataType_CLOSING_TAG) + _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_CLOSING_TAG) if _closingTagErr != nil { return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field") } @@ -201,7 +201,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParse(readBuffer u } // Finish initializing - _parent.Child.InitializeParent(_parent, peekedTagHeader, openingTag, closingTag, peekedTagNumber) + _parent.Child.InitializeParent(_parent, peekedTagHeader, openingTag, closingTag) return _parent, nil } @@ -226,7 +226,7 @@ func (m *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) SerializePar return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go index 2dbc93c7357..f1ac6787565 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go @@ -35,6 +35,9 @@ type BACnetConfirmedServiceRequestAtomicWriteFile struct { FileStartPosition *BACnetApplicationTagSignedInteger FileData *BACnetApplicationTagOctetString ClosingTag *BACnetClosingTag + + // Arguments. + Len uint16 } // The corresponding interface @@ -49,10 +52,10 @@ type IBACnetConfirmedServiceRequestAtomicWriteFile interface { GetFileData() *BACnetApplicationTagOctetString // GetClosingTag returns ClosingTag GetClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -98,14 +101,15 @@ func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetClosingTag() *BACnetCl // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestAtomicWriteFile(deviceIdentifier *BACnetApplicationTagObjectIdentifier, openingTag *BACnetOpeningTag, fileStartPosition *BACnetApplicationTagSignedInteger, fileData *BACnetApplicationTagOctetString, closingTag *BACnetClosingTag) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestAtomicWriteFile factory function for BACnetConfirmedServiceRequestAtomicWriteFile +func NewBACnetConfirmedServiceRequestAtomicWriteFile(deviceIdentifier *BACnetApplicationTagObjectIdentifier, openingTag *BACnetOpeningTag, fileStartPosition *BACnetApplicationTagSignedInteger, fileData *BACnetApplicationTagOctetString, closingTag *BACnetClosingTag, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestAtomicWriteFile{ DeviceIdentifier: deviceIdentifier, OpeningTag: openingTag, FileStartPosition: fileStartPosition, FileData: fileData, ClosingTag: closingTag, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -134,37 +138,37 @@ func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetTypeName() string { return "BACnetConfirmedServiceRequestAtomicWriteFile" } -func (m *BACnetConfirmedServiceRequestAtomicWriteFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestAtomicWriteFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (deviceIdentifier) - lengthInBits += m.DeviceIdentifier.LengthInBits() + lengthInBits += m.DeviceIdentifier.GetLengthInBits() // Optional Field (openingTag) if m.OpeningTag != nil { - lengthInBits += (*m.OpeningTag).LengthInBits() + lengthInBits += (*m.OpeningTag).GetLengthInBits() } // Simple field (fileStartPosition) - lengthInBits += m.FileStartPosition.LengthInBits() + lengthInBits += m.FileStartPosition.GetLengthInBits() // Simple field (fileData) - lengthInBits += m.FileData.LengthInBits() + lengthInBits += m.FileData.GetLengthInBits() // Optional Field (closingTag) if m.ClosingTag != nil { - lengthInBits += (*m.ClosingTag).LengthInBits() + lengthInBits += (*m.ClosingTag).GetLengthInBits() } return lengthInBits } -func (m *BACnetConfirmedServiceRequestAtomicWriteFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestAtomicWriteFileParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go index c5f25ff6d8b..28249bb3a00 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go @@ -34,6 +34,9 @@ type BACnetConfirmedServiceRequestConfirmedCOVNotification struct { IssueConfirmed *BACnetContextTagBoolean LifetimeInSeconds *BACnetContextTagUnsignedInteger ListOfValues *BACnetPropertyValues + + // Arguments. + Len uint16 } // The corresponding interface @@ -48,10 +51,10 @@ type IBACnetConfirmedServiceRequestConfirmedCOVNotification interface { GetLifetimeInSeconds() *BACnetContextTagUnsignedInteger // GetListOfValues returns ListOfValues GetListOfValues() *BACnetPropertyValues - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -97,14 +100,15 @@ func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetListOfValues( // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestConfirmedCOVNotification(subscriberProcessIdentifier *BACnetContextTagUnsignedInteger, monitoredObjectIdentifier *BACnetContextTagObjectIdentifier, issueConfirmed *BACnetContextTagBoolean, lifetimeInSeconds *BACnetContextTagUnsignedInteger, listOfValues *BACnetPropertyValues) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestConfirmedCOVNotification factory function for BACnetConfirmedServiceRequestConfirmedCOVNotification +func NewBACnetConfirmedServiceRequestConfirmedCOVNotification(subscriberProcessIdentifier *BACnetContextTagUnsignedInteger, monitoredObjectIdentifier *BACnetContextTagObjectIdentifier, issueConfirmed *BACnetContextTagBoolean, lifetimeInSeconds *BACnetContextTagUnsignedInteger, listOfValues *BACnetPropertyValues, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestConfirmedCOVNotification{ SubscriberProcessIdentifier: subscriberProcessIdentifier, MonitoredObjectIdentifier: monitoredObjectIdentifier, IssueConfirmed: issueConfirmed, LifetimeInSeconds: lifetimeInSeconds, ListOfValues: listOfValues, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -133,33 +137,33 @@ func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetTypeName() st return "BACnetConfirmedServiceRequestConfirmedCOVNotification" } -func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (subscriberProcessIdentifier) - lengthInBits += m.SubscriberProcessIdentifier.LengthInBits() + lengthInBits += m.SubscriberProcessIdentifier.GetLengthInBits() // Simple field (monitoredObjectIdentifier) - lengthInBits += m.MonitoredObjectIdentifier.LengthInBits() + lengthInBits += m.MonitoredObjectIdentifier.GetLengthInBits() // Simple field (issueConfirmed) - lengthInBits += m.IssueConfirmed.LengthInBits() + lengthInBits += m.IssueConfirmed.GetLengthInBits() // Simple field (lifetimeInSeconds) - lengthInBits += m.LifetimeInSeconds.LengthInBits() + lengthInBits += m.LifetimeInSeconds.GetLengthInBits() // Simple field (listOfValues) - lengthInBits += m.ListOfValues.LengthInBits() + lengthInBits += m.ListOfValues.GetLengthInBits() return lengthInBits } -func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { @@ -223,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.ObjectType) + _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(uint8(4)), monitoredObjectIdentifier.GetObjectType()) if _listOfValuesErr != nil { return nil, errors.Wrap(_listOfValuesErr, "Error parsing 'listOfValues' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go index 16cf3f87f71..7a6266f078a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) Initiali // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple factory function for BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple +func NewBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetTypeN return "BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple" } -func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go index b3088792478..4b6653b3f83 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go @@ -43,6 +43,9 @@ type BACnetConfirmedServiceRequestConfirmedEventNotification struct { FromState *BACnetContextTagEventState ToState *BACnetContextTagEventState EventValues *BACnetNotificationParameters + + // Arguments. + Len uint16 } // The corresponding interface @@ -73,10 +76,10 @@ type IBACnetConfirmedServiceRequestConfirmedEventNotification interface { GetToState() *BACnetContextTagEventState // GetEventValues returns EventValues GetEventValues() *BACnetNotificationParameters - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -154,7 +157,8 @@ func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetEventValues // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestConfirmedEventNotification(processIdentifier *BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier *BACnetContextTagObjectIdentifier, eventObjectIdentifier *BACnetContextTagObjectIdentifier, timestamp *BACnetTimeStamp, notificationClass *BACnetContextTagUnsignedInteger, priority *BACnetContextTagUnsignedInteger, eventType *BACnetContextTagEventType, messageText *BACnetContextTagCharacterString, notifyType *BACnetContextTagNotifyType, ackRequired *BACnetContextTagBoolean, fromState *BACnetContextTagEventState, toState *BACnetContextTagEventState, eventValues *BACnetNotificationParameters) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestConfirmedEventNotification factory function for BACnetConfirmedServiceRequestConfirmedEventNotification +func NewBACnetConfirmedServiceRequestConfirmedEventNotification(processIdentifier *BACnetContextTagUnsignedInteger, initiatingDeviceIdentifier *BACnetContextTagObjectIdentifier, eventObjectIdentifier *BACnetContextTagObjectIdentifier, timestamp *BACnetTimeStamp, notificationClass *BACnetContextTagUnsignedInteger, priority *BACnetContextTagUnsignedInteger, eventType *BACnetContextTagEventType, messageText *BACnetContextTagCharacterString, notifyType *BACnetContextTagNotifyType, ackRequired *BACnetContextTagBoolean, fromState *BACnetContextTagEventState, toState *BACnetContextTagEventState, eventValues *BACnetNotificationParameters, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestConfirmedEventNotification{ ProcessIdentifier: processIdentifier, InitiatingDeviceIdentifier: initiatingDeviceIdentifier, @@ -169,7 +173,7 @@ func NewBACnetConfirmedServiceRequestConfirmedEventNotification(processIdentifie FromState: fromState, ToState: toState, EventValues: eventValues, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -198,65 +202,65 @@ func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetTypeName() return "BACnetConfirmedServiceRequestConfirmedEventNotification" } -func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (processIdentifier) - lengthInBits += m.ProcessIdentifier.LengthInBits() + lengthInBits += m.ProcessIdentifier.GetLengthInBits() // Simple field (initiatingDeviceIdentifier) - lengthInBits += m.InitiatingDeviceIdentifier.LengthInBits() + lengthInBits += m.InitiatingDeviceIdentifier.GetLengthInBits() // Simple field (eventObjectIdentifier) - lengthInBits += m.EventObjectIdentifier.LengthInBits() + lengthInBits += m.EventObjectIdentifier.GetLengthInBits() // Simple field (timestamp) - lengthInBits += m.Timestamp.LengthInBits() + lengthInBits += m.Timestamp.GetLengthInBits() // Simple field (notificationClass) - lengthInBits += m.NotificationClass.LengthInBits() + lengthInBits += m.NotificationClass.GetLengthInBits() // Simple field (priority) - lengthInBits += m.Priority.LengthInBits() + lengthInBits += m.Priority.GetLengthInBits() // Simple field (eventType) - lengthInBits += m.EventType.LengthInBits() + lengthInBits += m.EventType.GetLengthInBits() // Optional Field (messageText) if m.MessageText != nil { - lengthInBits += (*m.MessageText).LengthInBits() + lengthInBits += (*m.MessageText).GetLengthInBits() } // Simple field (notifyType) - lengthInBits += m.NotifyType.LengthInBits() + lengthInBits += m.NotifyType.GetLengthInBits() // Optional Field (ackRequired) if m.AckRequired != nil { - lengthInBits += (*m.AckRequired).LengthInBits() + lengthInBits += (*m.AckRequired).GetLengthInBits() } // Optional Field (fromState) if m.FromState != nil { - lengthInBits += (*m.FromState).LengthInBits() + lengthInBits += (*m.FromState).GetLengthInBits() } // Simple field (toState) - lengthInBits += m.ToState.LengthInBits() + lengthInBits += m.ToState.GetLengthInBits() // Optional Field (eventValues) if m.EventValues != nil { - lengthInBits += (*m.EventValues).LengthInBits() + lengthInBits += (*m.EventValues).GetLengthInBits() } return lengthInBits } -func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { @@ -451,7 +455,7 @@ func BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer uti if pullErr := readBuffer.PullContext("eventValues"); pullErr != nil { return nil, pullErr } - _val, _err := BACnetNotificationParametersParse(readBuffer, uint8(12), eventObjectIdentifier.ObjectType) + _val, _err := BACnetNotificationParametersParse(readBuffer, uint8(12), eventObjectIdentifier.GetObjectType()) switch { case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF): readBuffer.Reset(currentPos) diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go index b5a77af4617..cde926b0497 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestConfirmedPrivateTransfer struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestConfirmedPrivateTransfer interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) InitializeParent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer factory function for BACnetConfirmedServiceRequestConfirmedPrivateTransfer +func NewBACnetConfirmedServiceRequestConfirmedPrivateTransfer(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestConfirmedPrivateTransfer{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetTypeName() st return "BACnetConfirmedServiceRequestConfirmedPrivateTransfer" } -func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestConfirmedPrivateTransferParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go index b68d5f398be..862c6486e8f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestConfirmedTextMessage struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestConfirmedTextMessage interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) InitializeParent(par // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestConfirmedTextMessage() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestConfirmedTextMessage factory function for BACnetConfirmedServiceRequestConfirmedTextMessage +func NewBACnetConfirmedServiceRequestConfirmedTextMessage(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestConfirmedTextMessage{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetTypeName() string return "BACnetConfirmedServiceRequestConfirmedTextMessage" } -func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestConfirmedTextMessageParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go index 4e43785d891..5c9cdbcd9c0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go @@ -30,16 +30,19 @@ import ( type BACnetConfirmedServiceRequestConfirmedUnknown struct { *BACnetConfirmedServiceRequest UnknownBytes []byte + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestConfirmedUnknown interface { // GetUnknownBytes returns UnknownBytes GetUnknownBytes() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +72,11 @@ func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetUnknownBytes() []byte // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestConfirmedUnknown(unknownBytes []byte) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestConfirmedUnknown factory function for BACnetConfirmedServiceRequestConfirmedUnknown +func NewBACnetConfirmedServiceRequestConfirmedUnknown(unknownBytes []byte, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestConfirmedUnknown{ UnknownBytes: unknownBytes, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -101,12 +105,12 @@ func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetTypeName() string { return "BACnetConfirmedServiceRequestConfirmedUnknown" } -func (m *BACnetConfirmedServiceRequestConfirmedUnknown) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestConfirmedUnknown) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.UnknownBytes) > 0 { @@ -116,8 +120,8 @@ func (m *BACnetConfirmedServiceRequestConfirmedUnknown) LengthInBitsConditional( return lengthInBits } -func (m *BACnetConfirmedServiceRequestConfirmedUnknown) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestConfirmedUnknownParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go index a9ccf3c7cfc..2ad170026bc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestCreateObject struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestCreateObject interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestCreateObject) InitializeParent(parent *BAC // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestCreateObject() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestCreateObject factory function for BACnetConfirmedServiceRequestCreateObject +func NewBACnetConfirmedServiceRequestCreateObject(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestCreateObject{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestCreateObject) GetTypeName() string { return "BACnetConfirmedServiceRequestCreateObject" } -func (m *BACnetConfirmedServiceRequestCreateObject) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestCreateObject) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestCreateObject) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestCreateObjectParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go index 7979a27fca9..ed9d9217e9b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestDeleteObject struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestDeleteObject interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestDeleteObject) InitializeParent(parent *BAC // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestDeleteObject() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestDeleteObject factory function for BACnetConfirmedServiceRequestDeleteObject +func NewBACnetConfirmedServiceRequestDeleteObject(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestDeleteObject{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestDeleteObject) GetTypeName() string { return "BACnetConfirmedServiceRequestDeleteObject" } -func (m *BACnetConfirmedServiceRequestDeleteObject) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestDeleteObject) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestDeleteObject) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestDeleteObject) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestDeleteObject) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestDeleteObject) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestDeleteObjectParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go index 09475d8cadd..404d424fef6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go @@ -33,6 +33,9 @@ type BACnetConfirmedServiceRequestDeviceCommunicationControl struct { TimeDuration *BACnetContextTagUnsignedInteger EnableDisable *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable Password *BACnetContextTagCharacterString + + // Arguments. + Len uint16 } // The corresponding interface @@ -43,10 +46,10 @@ type IBACnetConfirmedServiceRequestDeviceCommunicationControl interface { GetEnableDisable() *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable // GetPassword returns Password GetPassword() *BACnetContextTagCharacterString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,12 +87,13 @@ func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetPassword() // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestDeviceCommunicationControl(timeDuration *BACnetContextTagUnsignedInteger, enableDisable *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable, password *BACnetContextTagCharacterString) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestDeviceCommunicationControl factory function for BACnetConfirmedServiceRequestDeviceCommunicationControl +func NewBACnetConfirmedServiceRequestDeviceCommunicationControl(timeDuration *BACnetContextTagUnsignedInteger, enableDisable *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable, password *BACnetContextTagCharacterString, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestDeviceCommunicationControl{ TimeDuration: timeDuration, EnableDisable: enableDisable, Password: password, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -118,31 +122,31 @@ func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetTypeName() return "BACnetConfirmedServiceRequestDeviceCommunicationControl" } -func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Optional Field (timeDuration) if m.TimeDuration != nil { - lengthInBits += (*m.TimeDuration).LengthInBits() + lengthInBits += (*m.TimeDuration).GetLengthInBits() } // Simple field (enableDisable) - lengthInBits += m.EnableDisable.LengthInBits() + lengthInBits += m.EnableDisable.GetLengthInBits() // Optional Field (password) if m.Password != nil { - lengthInBits += (*m.Password).LengthInBits() + lengthInBits += (*m.Password).GetLengthInBits() } return lengthInBits } -func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestDeviceCommunicationControlParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go index c7d0569c7b8..45468de40f2 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestGetEnrollmentSummary struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestGetEnrollmentSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) InitializeParent(par // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestGetEnrollmentSummary() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestGetEnrollmentSummary factory function for BACnetConfirmedServiceRequestGetEnrollmentSummary +func NewBACnetConfirmedServiceRequestGetEnrollmentSummary(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestGetEnrollmentSummary{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetTypeName() string return "BACnetConfirmedServiceRequestGetEnrollmentSummary" } -func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go index 66e4ee733fd..8045ad4cab9 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestGetEventInformation struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestGetEventInformation interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestGetEventInformation) InitializeParent(pare // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestGetEventInformation() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestGetEventInformation factory function for BACnetConfirmedServiceRequestGetEventInformation +func NewBACnetConfirmedServiceRequestGetEventInformation(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestGetEventInformation{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestGetEventInformation) GetTypeName() string return "BACnetConfirmedServiceRequestGetEventInformation" } -func (m *BACnetConfirmedServiceRequestGetEventInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestGetEventInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestGetEventInformation) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestGetEventInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestGetEventInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestGetEventInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestGetEventInformationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go index 4d9e5dd04db..1ae24f4a9d7 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestLifeSafetyOperation struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestLifeSafetyOperation interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) InitializeParent(pare // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestLifeSafetyOperation() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestLifeSafetyOperation factory function for BACnetConfirmedServiceRequestLifeSafetyOperation +func NewBACnetConfirmedServiceRequestLifeSafetyOperation(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestLifeSafetyOperation{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetTypeName() string return "BACnetConfirmedServiceRequestLifeSafetyOperation" } -func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestLifeSafetyOperationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go index 68a3cfc47c7..9f02db39145 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go @@ -33,6 +33,9 @@ type BACnetConfirmedServiceRequestReadProperty struct { ObjectIdentifier *BACnetContextTagObjectIdentifier PropertyIdentifier *BACnetContextTagPropertyIdentifier ArrayIndex *BACnetContextTagUnsignedInteger + + // Arguments. + Len uint16 } // The corresponding interface @@ -43,10 +46,10 @@ type IBACnetConfirmedServiceRequestReadProperty interface { GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier // GetArrayIndex returns ArrayIndex GetArrayIndex() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,12 +87,13 @@ func (m *BACnetConfirmedServiceRequestReadProperty) GetArrayIndex() *BACnetConte // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestReadProperty(objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestReadProperty factory function for BACnetConfirmedServiceRequestReadProperty +func NewBACnetConfirmedServiceRequestReadProperty(objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestReadProperty{ ObjectIdentifier: objectIdentifier, PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -118,29 +122,29 @@ func (m *BACnetConfirmedServiceRequestReadProperty) GetTypeName() string { return "BACnetConfirmedServiceRequestReadProperty" } -func (m *BACnetConfirmedServiceRequestReadProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestReadProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestReadProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestReadProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (arrayIndex) if m.ArrayIndex != nil { - lengthInBits += (*m.ArrayIndex).LengthInBits() + lengthInBits += (*m.ArrayIndex).GetLengthInBits() } return lengthInBits } -func (m *BACnetConfirmedServiceRequestReadProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestReadProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestReadPropertyParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go index 4e9a7223c15..04fa60f44bc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go @@ -30,16 +30,19 @@ import ( type BACnetConfirmedServiceRequestReadPropertyMultiple struct { *BACnetConfirmedServiceRequest Data []*BACnetReadAccessSpecification + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestReadPropertyMultiple interface { // GetData returns Data GetData() []*BACnetReadAccessSpecification - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +72,11 @@ func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetData() []*BACnetR // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestReadPropertyMultiple(data []*BACnetReadAccessSpecification) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestReadPropertyMultiple factory function for BACnetConfirmedServiceRequestReadPropertyMultiple +func NewBACnetConfirmedServiceRequestReadPropertyMultiple(data []*BACnetReadAccessSpecification, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestReadPropertyMultiple{ Data: data, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -101,25 +105,25 @@ func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetTypeName() string return "BACnetConfirmedServiceRequestReadPropertyMultiple" } -func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Data) > 0 { for _, element := range m.Data { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestReadPropertyMultipleParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go index c4feb84c2fa..79fc3b2fc50 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestReadRange struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestReadRange interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestReadRange) InitializeParent(parent *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestReadRange() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestReadRange factory function for BACnetConfirmedServiceRequestReadRange +func NewBACnetConfirmedServiceRequestReadRange(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestReadRange{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestReadRange) GetTypeName() string { return "BACnetConfirmedServiceRequestReadRange" } -func (m *BACnetConfirmedServiceRequestReadRange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestReadRange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestReadRange) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestReadRange) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestReadRange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestReadRange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestReadRangeParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go index 6e4575064fb..bded0c17887 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go @@ -32,6 +32,9 @@ type BACnetConfirmedServiceRequestReinitializeDevice struct { *BACnetConfirmedServiceRequest ReinitializedStateOfDevice *BACnetContextTagDeviceState Password *BACnetContextTagCharacterString + + // Arguments. + Len uint16 } // The corresponding interface @@ -40,10 +43,10 @@ type IBACnetConfirmedServiceRequestReinitializeDevice interface { GetReinitializedStateOfDevice() *BACnetContextTagDeviceState // GetPassword returns Password GetPassword() *BACnetContextTagCharacterString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetPassword() *BACnetC // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestReinitializeDevice(reinitializedStateOfDevice *BACnetContextTagDeviceState, password *BACnetContextTagCharacterString) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestReinitializeDevice factory function for BACnetConfirmedServiceRequestReinitializeDevice +func NewBACnetConfirmedServiceRequestReinitializeDevice(reinitializedStateOfDevice *BACnetContextTagDeviceState, password *BACnetContextTagCharacterString, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestReinitializeDevice{ ReinitializedStateOfDevice: reinitializedStateOfDevice, Password: password, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -110,26 +114,26 @@ func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetTypeName() string { return "BACnetConfirmedServiceRequestReinitializeDevice" } -func (m *BACnetConfirmedServiceRequestReinitializeDevice) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestReinitializeDevice) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (reinitializedStateOfDevice) - lengthInBits += m.ReinitializedStateOfDevice.LengthInBits() + lengthInBits += m.ReinitializedStateOfDevice.GetLengthInBits() // Optional Field (password) if m.Password != nil { - lengthInBits += (*m.Password).LengthInBits() + lengthInBits += (*m.Password).GetLengthInBits() } return lengthInBits } -func (m *BACnetConfirmedServiceRequestReinitializeDevice) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestReinitializeDeviceParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go index c4a92b83aa0..1b1339e13ac 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go @@ -29,10 +29,10 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable struct { - RawData *BACnetContextTagEnumerated - IsEnable bool - IsDisable bool - IsDisableInitiation bool + RawData *BACnetContextTagEnumerated + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -45,10 +45,10 @@ type IBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable interface { GetIsDisable() bool // GetIsDisableInitiation returns IsDisableInitiation GetIsDisableInitiation() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,22 +64,26 @@ func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetRawDat // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetIsEnable() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsEnable + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (0))) } func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetIsDisable() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsDisable + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (1))) } func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetIsDisableInitiation() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsDisableInitiation + rawData := m.RawData + _ = rawData + return bool(bool((m.GetRawData()) != (nil))) && bool(bool(((*m.GetRawData()).GetPayload().GetActualValue()) == (2))) } -func NewBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable(rawData *BACnetContextTagEnumerated, isEnable bool, isDisable bool, isDisableInitiation bool) *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable { - return &BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable{RawData: rawData, IsEnable: isEnable, IsDisable: isDisable, IsDisableInitiation: isDisableInitiation} +// NewBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable factory function for BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable +func NewBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable(rawData *BACnetContextTagEnumerated, tagNumber uint8) *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable { + return &BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable{RawData: rawData, TagNumber: tagNumber} } func CastBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable(structType interface{}) *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable { @@ -99,16 +103,16 @@ func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetTypeNa return "BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable" } -func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Optional Field (rawData) if m.RawData != nil { - lengthInBits += (*m.RawData).LengthInBits() + lengthInBits += (*m.RawData).GetLengthInBits() } // A virtual field doesn't have any in- or output. @@ -120,8 +124,8 @@ func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) LengthInB return lengthInBits } -func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestReinitializeDeviceEnableDisableParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable, error) { @@ -151,23 +155,26 @@ func BACnetConfirmedServiceRequestReinitializeDeviceEnableDisableParse(readBuffe } // Virtual field - _isEnable := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (0))) + _isEnable := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (0))) isEnable := bool(_isEnable) + _ = isEnable // Virtual field - _isDisable := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (1))) + _isDisable := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (1))) isDisable := bool(_isDisable) + _ = isDisable // Virtual field - _isDisableInitiation := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).Payload.ActualValue) == (2))) + _isDisableInitiation := bool(bool((rawData) != (nil))) && bool(bool(((*rawData).GetPayload().GetActualValue()) == (2))) isDisableInitiation := bool(_isDisableInitiation) + _ = isDisableInitiation if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable(rawData, isEnable, isDisable, isDisableInitiation), nil + return NewBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable(rawData, tagNumber), nil } func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) Serialize(writeBuffer utils.WriteBuffer) error { @@ -191,15 +198,15 @@ func (m *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable) Serialize } } // Virtual field - if _isEnableErr := writeBuffer.WriteVirtual("isEnable", m.IsEnable); _isEnableErr != nil { + if _isEnableErr := writeBuffer.WriteVirtual("isEnable", m.GetIsEnable()); _isEnableErr != nil { return errors.Wrap(_isEnableErr, "Error serializing 'isEnable' field") } // Virtual field - if _isDisableErr := writeBuffer.WriteVirtual("isDisable", m.IsDisable); _isDisableErr != nil { + if _isDisableErr := writeBuffer.WriteVirtual("isDisable", m.GetIsDisable()); _isDisableErr != nil { return errors.Wrap(_isDisableErr, "Error serializing 'isDisable' field") } // Virtual field - if _isDisableInitiationErr := writeBuffer.WriteVirtual("isDisableInitiation", m.IsDisableInitiation); _isDisableInitiationErr != nil { + if _isDisableInitiationErr := writeBuffer.WriteVirtual("isDisableInitiation", m.GetIsDisableInitiation()); _isDisableInitiationErr != nil { return errors.Wrap(_isDisableInitiationErr, "Error serializing 'isDisableInitiation' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go index 3aec2d1cce1..e173f4e0e11 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestRemoveListElement struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestRemoveListElement interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestRemoveListElement) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestRemoveListElement() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestRemoveListElement factory function for BACnetConfirmedServiceRequestRemoveListElement +func NewBACnetConfirmedServiceRequestRemoveListElement(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestRemoveListElement{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestRemoveListElement) GetTypeName() string { return "BACnetConfirmedServiceRequestRemoveListElement" } -func (m *BACnetConfirmedServiceRequestRemoveListElement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestRemoveListElement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestRemoveListElement) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestRemoveListElement) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestRemoveListElement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestRemoveListElement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestRemoveListElementParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go index 786ead35a6b..75d391d76b1 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestRemovedAuthenticate struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestRemovedAuthenticate interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) InitializeParent(pare // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestRemovedAuthenticate() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestRemovedAuthenticate factory function for BACnetConfirmedServiceRequestRemovedAuthenticate +func NewBACnetConfirmedServiceRequestRemovedAuthenticate(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestRemovedAuthenticate{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetTypeName() string return "BACnetConfirmedServiceRequestRemovedAuthenticate" } -func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestRemovedAuthenticateParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go index df228126fea..28fe2a48c46 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestRemovedReadPropertyConditional struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestRemovedReadPropertyConditional interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) Initialize // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestRemovedReadPropertyConditional() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestRemovedReadPropertyConditional factory function for BACnetConfirmedServiceRequestRemovedReadPropertyConditional +func NewBACnetConfirmedServiceRequestRemovedReadPropertyConditional(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestRemovedReadPropertyConditional{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetTypeNam return "BACnetConfirmedServiceRequestRemovedReadPropertyConditional" } -func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestRemovedReadPropertyConditionalParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go index 62e1572b528..c3a83cd75ad 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestRemovedRequestKey struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestRemovedRequestKey interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestRemovedRequestKey) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestRemovedRequestKey() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestRemovedRequestKey factory function for BACnetConfirmedServiceRequestRemovedRequestKey +func NewBACnetConfirmedServiceRequestRemovedRequestKey(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestRemovedRequestKey{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetTypeName() string { return "BACnetConfirmedServiceRequestRemovedRequestKey" } -func (m *BACnetConfirmedServiceRequestRemovedRequestKey) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestRemovedRequestKey) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestRemovedRequestKey) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestRemovedRequestKeyParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go index 93d341bf2f9..e1fbbce1022 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go @@ -33,6 +33,9 @@ type BACnetConfirmedServiceRequestSubscribeCOV struct { MonitoredObjectIdentifier *BACnetContextTagObjectIdentifier IssueConfirmed *BACnetContextTagBoolean LifetimeInSeconds *BACnetContextTagUnsignedInteger + + // Arguments. + Len uint16 } // The corresponding interface @@ -45,10 +48,10 @@ type IBACnetConfirmedServiceRequestSubscribeCOV interface { GetIssueConfirmed() *BACnetContextTagBoolean // GetLifetimeInSeconds returns LifetimeInSeconds GetLifetimeInSeconds() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,13 +93,14 @@ func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetLifetimeInSeconds() *BACn // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestSubscribeCOV(subscriberProcessIdentifier *BACnetContextTagUnsignedInteger, monitoredObjectIdentifier *BACnetContextTagObjectIdentifier, issueConfirmed *BACnetContextTagBoolean, lifetimeInSeconds *BACnetContextTagUnsignedInteger) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestSubscribeCOV factory function for BACnetConfirmedServiceRequestSubscribeCOV +func NewBACnetConfirmedServiceRequestSubscribeCOV(subscriberProcessIdentifier *BACnetContextTagUnsignedInteger, monitoredObjectIdentifier *BACnetContextTagObjectIdentifier, issueConfirmed *BACnetContextTagBoolean, lifetimeInSeconds *BACnetContextTagUnsignedInteger, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestSubscribeCOV{ SubscriberProcessIdentifier: subscriberProcessIdentifier, MonitoredObjectIdentifier: monitoredObjectIdentifier, IssueConfirmed: issueConfirmed, LifetimeInSeconds: lifetimeInSeconds, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -125,30 +129,30 @@ func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetTypeName() string { return "BACnetConfirmedServiceRequestSubscribeCOV" } -func (m *BACnetConfirmedServiceRequestSubscribeCOV) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestSubscribeCOV) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (subscriberProcessIdentifier) - lengthInBits += m.SubscriberProcessIdentifier.LengthInBits() + lengthInBits += m.SubscriberProcessIdentifier.GetLengthInBits() // Simple field (monitoredObjectIdentifier) - lengthInBits += m.MonitoredObjectIdentifier.LengthInBits() + lengthInBits += m.MonitoredObjectIdentifier.GetLengthInBits() // Simple field (issueConfirmed) - lengthInBits += m.IssueConfirmed.LengthInBits() + lengthInBits += m.IssueConfirmed.GetLengthInBits() // Simple field (lifetimeInSeconds) - lengthInBits += m.LifetimeInSeconds.LengthInBits() + lengthInBits += m.LifetimeInSeconds.GetLengthInBits() return lengthInBits } -func (m *BACnetConfirmedServiceRequestSubscribeCOV) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go index 9645c00ef49..0b593de388a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestSubscribeCOVProperty struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestSubscribeCOVProperty interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) InitializeParent(par // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestSubscribeCOVProperty() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestSubscribeCOVProperty factory function for BACnetConfirmedServiceRequestSubscribeCOVProperty +func NewBACnetConfirmedServiceRequestSubscribeCOVProperty(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestSubscribeCOVProperty{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetTypeName() string return "BACnetConfirmedServiceRequestSubscribeCOVProperty" } -func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go index a996030890f..9612f4f9db3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) InitializePa // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple factory function for BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple +func NewBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetTypeName( return "BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple" } -func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go index 89a6afc5c02..fb71ecc2f6d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestVTClose struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestVTClose interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestVTClose) InitializeParent(parent *BACnetCo // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestVTClose() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestVTClose factory function for BACnetConfirmedServiceRequestVTClose +func NewBACnetConfirmedServiceRequestVTClose(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestVTClose{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestVTClose) GetTypeName() string { return "BACnetConfirmedServiceRequestVTClose" } -func (m *BACnetConfirmedServiceRequestVTClose) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestVTClose) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestVTClose) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestVTClose) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestVTClose) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestVTClose) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestVTCloseParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go index 59a8b988f14..a9294f9f2eb 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestVTData struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestVTData interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestVTData) InitializeParent(parent *BACnetCon // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestVTData() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestVTData factory function for BACnetConfirmedServiceRequestVTData +func NewBACnetConfirmedServiceRequestVTData(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestVTData{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestVTData) GetTypeName() string { return "BACnetConfirmedServiceRequestVTData" } -func (m *BACnetConfirmedServiceRequestVTData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestVTData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestVTData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestVTData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestVTData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestVTData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestVTDataParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go index 6f5f450dc01..df321b8f10f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestVTOpen struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestVTOpen interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestVTOpen) InitializeParent(parent *BACnetCon // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestVTOpen() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestVTOpen factory function for BACnetConfirmedServiceRequestVTOpen +func NewBACnetConfirmedServiceRequestVTOpen(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestVTOpen{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestVTOpen) GetTypeName() string { return "BACnetConfirmedServiceRequestVTOpen" } -func (m *BACnetConfirmedServiceRequestVTOpen) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestVTOpen) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestVTOpen) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestVTOpen) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestVTOpen) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestVTOpen) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestVTOpenParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go index a4259dbc056..0e26aa51db6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go @@ -35,6 +35,9 @@ type BACnetConfirmedServiceRequestWriteProperty struct { ArrayIndex *BACnetContextTagUnsignedInteger PropertyValue *BACnetConstructedData Priority *BACnetContextTagUnsignedInteger + + // Arguments. + Len uint16 } // The corresponding interface @@ -49,10 +52,10 @@ type IBACnetConfirmedServiceRequestWriteProperty interface { GetPropertyValue() *BACnetConstructedData // GetPriority returns Priority GetPriority() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -98,14 +101,15 @@ func (m *BACnetConfirmedServiceRequestWriteProperty) GetPriority() *BACnetContex // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestWriteProperty(objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, propertyValue *BACnetConstructedData, priority *BACnetContextTagUnsignedInteger) *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestWriteProperty factory function for BACnetConfirmedServiceRequestWriteProperty +func NewBACnetConfirmedServiceRequestWriteProperty(objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, propertyValue *BACnetConstructedData, priority *BACnetContextTagUnsignedInteger, len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestWriteProperty{ ObjectIdentifier: objectIdentifier, PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, PropertyValue: propertyValue, Priority: priority, - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -134,37 +138,37 @@ func (m *BACnetConfirmedServiceRequestWriteProperty) GetTypeName() string { return "BACnetConfirmedServiceRequestWriteProperty" } -func (m *BACnetConfirmedServiceRequestWriteProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestWriteProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestWriteProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestWriteProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (arrayIndex) if m.ArrayIndex != nil { - lengthInBits += (*m.ArrayIndex).LengthInBits() + lengthInBits += (*m.ArrayIndex).GetLengthInBits() } // Simple field (propertyValue) - lengthInBits += m.PropertyValue.LengthInBits() + lengthInBits += m.PropertyValue.GetLengthInBits() // Optional Field (priority) if m.Priority != nil { - lengthInBits += (*m.Priority).LengthInBits() + lengthInBits += (*m.Priority).GetLengthInBits() } return lengthInBits } -func (m *BACnetConfirmedServiceRequestWriteProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestWriteProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestWritePropertyParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { @@ -223,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.ObjectType, propertyIdentifier) + _propertyValue, _propertyValueErr := BACnetConstructedDataParse(readBuffer, uint8(uint8(3)), objectIdentifier.GetObjectType(), propertyIdentifier) if _propertyValueErr != nil { return nil, errors.Wrap(_propertyValueErr, "Error parsing 'propertyValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go index d1e04f4d012..a7384a71546 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetConfirmedServiceRequestWritePropertyMultiple struct { *BACnetConfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetConfirmedServiceRequestWritePropertyMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) InitializeParent(pa // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConfirmedServiceRequestWritePropertyMultiple() *BACnetConfirmedServiceRequest { +// NewBACnetConfirmedServiceRequestWritePropertyMultiple factory function for BACnetConfirmedServiceRequestWritePropertyMultiple +func NewBACnetConfirmedServiceRequestWritePropertyMultiple(len uint16) *BACnetConfirmedServiceRequest { child := &BACnetConfirmedServiceRequestWritePropertyMultiple{ - BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(), + BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(len), } child.Child = child return child.BACnetConfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetTypeName() strin return "BACnetConfirmedServiceRequestWritePropertyMultiple" } -func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConfirmedServiceRequestWritePropertyMultipleParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go index a6992e72595..df8ca039fcc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go @@ -28,10 +28,13 @@ import ( // The data-structure of this message type BACnetConstructedData struct { - OpeningTag *BACnetOpeningTag - ClosingTag *BACnetClosingTag - PropertyIdentifierEnum BACnetPropertyIdentifier - Child IBACnetConstructedDataChild + OpeningTag *BACnetOpeningTag + ClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + PropertyIdentifierArgument BACnetContextTagPropertyIdentifier + Child IBACnetConstructedDataChild } // The corresponding interface @@ -46,10 +49,10 @@ type IBACnetConstructedData interface { GetClosingTag() *BACnetClosingTag // GetPropertyIdentifierEnum returns PropertyIdentifierEnum GetPropertyIdentifierEnum() BACnetPropertyIdentifier - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,7 +64,7 @@ type IBACnetConstructedDataParent interface { type IBACnetConstructedDataChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) + InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) GetTypeName() string IBACnetConstructedData } @@ -81,12 +84,12 @@ func (m *BACnetConstructedData) GetClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetConstructedData) GetPropertyIdentifierEnum() BACnetPropertyIdentifier { - // TODO: calculation should happen here instead accessing the stored field - return m.PropertyIdentifierEnum + return m.PropertyIdentifierArgument.GetPropertyIdentifier() } -func NewBACnetConstructedData(openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) *BACnetConstructedData { - return &BACnetConstructedData{OpeningTag: openingTag, ClosingTag: closingTag, PropertyIdentifierEnum: propertyIdentifierEnum} +// NewBACnetConstructedData factory function for BACnetConstructedData +func NewBACnetConstructedData(openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, tagNumber uint8, propertyIdentifierArgument BACnetContextTagPropertyIdentifier) *BACnetConstructedData { + return &BACnetConstructedData{OpeningTag: openingTag, ClosingTag: closingTag, TagNumber: tagNumber, PropertyIdentifierArgument: propertyIdentifierArgument} } func CastBACnetConstructedData(structType interface{}) *BACnetConstructedData { @@ -106,30 +109,30 @@ func (m *BACnetConstructedData) GetTypeName() string { return "BACnetConstructedData" } -func (m *BACnetConstructedData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConstructedData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConstructedData) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetConstructedData) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetConstructedData) ParentLengthInBits() uint16 { +func (m *BACnetConstructedData) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetConstructedData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConstructedData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConstructedDataParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, propertyIdentifierArgument *BACnetContextTagPropertyIdentifier) (*BACnetConstructedData, error) { @@ -151,8 +154,9 @@ func BACnetConstructedDataParse(readBuffer utils.ReadBuffer, tagNumber uint8, ob } // Virtual field - _propertyIdentifierEnum := propertyIdentifierArgument.PropertyIdentifier + _propertyIdentifierEnum := propertyIdentifierArgument.GetPropertyIdentifier() propertyIdentifierEnum := BACnetPropertyIdentifier(_propertyIdentifierEnum) + _ = propertyIdentifierEnum // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetConstructedData @@ -192,7 +196,7 @@ func BACnetConstructedDataParse(readBuffer utils.ReadBuffer, tagNumber uint8, ob } // Finish initializing - _parent.Child.InitializeParent(_parent, openingTag, closingTag, propertyIdentifierEnum) + _parent.Child.InitializeParent(_parent, openingTag, closingTag) return _parent, nil } @@ -217,7 +221,7 @@ func (m *BACnetConstructedData) SerializeParent(writeBuffer utils.WriteBuffer, c return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _propertyIdentifierEnumErr := writeBuffer.WriteVirtual("propertyIdentifierEnum", m.PropertyIdentifierEnum); _propertyIdentifierEnumErr != nil { + if _propertyIdentifierEnumErr := writeBuffer.WriteVirtual("propertyIdentifierEnum", m.GetPropertyIdentifierEnum()); _propertyIdentifierEnumErr != nil { return errors.Wrap(_propertyIdentifierEnumErr, "Error serializing 'propertyIdentifierEnum' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go index a79d97ee6d6..307ebb91661 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go @@ -32,6 +32,10 @@ type BACnetConstructedDataCommand struct { InnerOpeningTag *BACnetOpeningTag Action []*BACnetActionCommand InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + PropertyIdentifierArgument BACnetContextTagPropertyIdentifier } // The corresponding interface @@ -42,10 +46,10 @@ type IBACnetConstructedDataCommand interface { GetAction() []*BACnetActionCommand // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +73,9 @@ func (m *BACnetConstructedDataCommand) GetPropertyIdentifierEnum() BACnetPropert return 0 } -func (m *BACnetConstructedDataCommand) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) { +func (m *BACnetConstructedDataCommand) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetConstructedData.OpeningTag = openingTag m.BACnetConstructedData.ClosingTag = closingTag - m.BACnetConstructedData.PropertyIdentifierEnum = propertyIdentifierEnum } /////////////////////////////////////////////////////////// @@ -94,12 +97,13 @@ func (m *BACnetConstructedDataCommand) GetInnerClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConstructedDataCommand(innerOpeningTag *BACnetOpeningTag, action []*BACnetActionCommand, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) *BACnetConstructedData { +// NewBACnetConstructedDataCommand factory function for BACnetConstructedDataCommand +func NewBACnetConstructedDataCommand(innerOpeningTag *BACnetOpeningTag, action []*BACnetActionCommand, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, tagNumber uint8, propertyIdentifierArgument BACnetContextTagPropertyIdentifier) *BACnetConstructedData { child := &BACnetConstructedDataCommand{ InnerOpeningTag: innerOpeningTag, Action: action, InnerClosingTag: innerClosingTag, - BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, propertyIdentifierEnum), + BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, tagNumber, propertyIdentifierArgument), } child.Child = child return child.BACnetConstructedData @@ -128,31 +132,31 @@ func (m *BACnetConstructedDataCommand) GetTypeName() string { return "BACnetConstructedDataCommand" } -func (m *BACnetConstructedDataCommand) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConstructedDataCommand) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConstructedDataCommand) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConstructedDataCommand) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Array field if len(m.Action) > 0 { for _, element := range m.Action { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetConstructedDataCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConstructedDataCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConstructedDataCommandParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, propertyIdentifierArgument *BACnetContextTagPropertyIdentifier) (*BACnetConstructedData, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go index a42bdaf788d..c5b93f9027d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go @@ -29,14 +29,14 @@ import ( // The data-structure of this message type BACnetConstructedDataElement struct { - PeekedTagHeader *BACnetTagHeader - ApplicationTag *BACnetApplicationTag - ContextTag *BACnetContextTag - ConstructedData *BACnetConstructedData - PeekedTagNumber uint8 - IsApplicationTag bool - IsConstructedData bool - IsContextTag bool + PeekedTagHeader *BACnetTagHeader + ApplicationTag *BACnetApplicationTag + ContextTag *BACnetContextTag + ConstructedData *BACnetConstructedData + + // Arguments. + ObjectType BACnetObjectType + PropertyIdentifier BACnetContextTagPropertyIdentifier } // The corresponding interface @@ -57,10 +57,10 @@ type IBACnetConstructedDataElement interface { GetIsConstructedData() bool // GetIsContextTag returns IsContextTag GetIsContextTag() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -88,27 +88,48 @@ func (m *BACnetConstructedDataElement) GetConstructedData() *BACnetConstructedDa // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetConstructedDataElement) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + applicationTag := m.ApplicationTag + _ = applicationTag + contextTag := m.ContextTag + _ = contextTag + constructedData := m.ConstructedData + _ = constructedData + return m.GetPeekedTagHeader().GetActualTagNumber() } func (m *BACnetConstructedDataElement) GetIsApplicationTag() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsApplicationTag + applicationTag := m.ApplicationTag + _ = applicationTag + contextTag := m.ContextTag + _ = contextTag + constructedData := m.ConstructedData + _ = constructedData + return bool((m.GetPeekedTagHeader().GetTagClass()) == (TagClass_APPLICATION_TAGS)) } func (m *BACnetConstructedDataElement) GetIsConstructedData() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsConstructedData + applicationTag := m.ApplicationTag + _ = applicationTag + contextTag := m.ContextTag + _ = contextTag + constructedData := m.ConstructedData + _ = constructedData + return bool(!(m.GetIsApplicationTag())) && bool(bool((m.GetPeekedTagHeader().GetActualLength()) == (0x6))) } func (m *BACnetConstructedDataElement) GetIsContextTag() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsContextTag + applicationTag := m.ApplicationTag + _ = applicationTag + contextTag := m.ContextTag + _ = contextTag + constructedData := m.ConstructedData + _ = constructedData + return bool(!(m.GetIsConstructedData())) && bool(!(m.GetIsApplicationTag())) } -func NewBACnetConstructedDataElement(peekedTagHeader *BACnetTagHeader, applicationTag *BACnetApplicationTag, contextTag *BACnetContextTag, constructedData *BACnetConstructedData, peekedTagNumber uint8, isApplicationTag bool, isConstructedData bool, isContextTag bool) *BACnetConstructedDataElement { - return &BACnetConstructedDataElement{PeekedTagHeader: peekedTagHeader, ApplicationTag: applicationTag, ContextTag: contextTag, ConstructedData: constructedData, PeekedTagNumber: peekedTagNumber, IsApplicationTag: isApplicationTag, IsConstructedData: isConstructedData, IsContextTag: isContextTag} +// NewBACnetConstructedDataElement factory function for BACnetConstructedDataElement +func NewBACnetConstructedDataElement(peekedTagHeader *BACnetTagHeader, applicationTag *BACnetApplicationTag, contextTag *BACnetContextTag, constructedData *BACnetConstructedData, objectType BACnetObjectType, propertyIdentifier BACnetContextTagPropertyIdentifier) *BACnetConstructedDataElement { + return &BACnetConstructedDataElement{PeekedTagHeader: peekedTagHeader, ApplicationTag: applicationTag, ContextTag: contextTag, ConstructedData: constructedData, ObjectType: objectType, PropertyIdentifier: propertyIdentifier} } func CastBACnetConstructedDataElement(structType interface{}) *BACnetConstructedDataElement { @@ -128,11 +149,11 @@ func (m *BACnetConstructedDataElement) GetTypeName() string { return "BACnetConstructedDataElement" } -func (m *BACnetConstructedDataElement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConstructedDataElement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConstructedDataElement) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetConstructedDataElement) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. @@ -145,24 +166,24 @@ func (m *BACnetConstructedDataElement) LengthInBitsConditional(lastItem bool) ui // Optional Field (applicationTag) if m.ApplicationTag != nil { - lengthInBits += (*m.ApplicationTag).LengthInBits() + lengthInBits += (*m.ApplicationTag).GetLengthInBits() } // Optional Field (contextTag) if m.ContextTag != nil { - lengthInBits += (*m.ContextTag).LengthInBits() + lengthInBits += (*m.ContextTag).GetLengthInBits() } // Optional Field (constructedData) if m.ConstructedData != nil { - lengthInBits += (*m.ConstructedData).LengthInBits() + lengthInBits += (*m.ConstructedData).GetLengthInBits() } return lengthInBits } -func (m *BACnetConstructedDataElement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConstructedDataElement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConstructedDataElementParse(readBuffer utils.ReadBuffer, objectType BACnetObjectType, propertyIdentifier *BACnetContextTagPropertyIdentifier) (*BACnetConstructedDataElement, error) { @@ -179,20 +200,24 @@ func BACnetConstructedDataElementParse(readBuffer utils.ReadBuffer, objectType B readBuffer.Reset(currentPos) // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Virtual field - _isApplicationTag := bool((peekedTagHeader.TagClass) == (TagClass_APPLICATION_TAGS)) + _isApplicationTag := bool((peekedTagHeader.GetTagClass()) == (TagClass_APPLICATION_TAGS)) isApplicationTag := bool(_isApplicationTag) + _ = isApplicationTag // Virtual field - _isConstructedData := bool(!(isApplicationTag)) && bool(bool((peekedTagHeader.ActualLength) == (0x6))) + _isConstructedData := bool(!(isApplicationTag)) && bool(bool((peekedTagHeader.GetActualLength()) == (0x6))) isConstructedData := bool(_isConstructedData) + _ = isConstructedData // Virtual field _isContextTag := bool(!(isConstructedData)) && bool(!(isApplicationTag)) isContextTag := bool(_isContextTag) + _ = isContextTag // Optional Field (applicationTag) (Can be skipped, if a given expression evaluates to false) var applicationTag *BACnetApplicationTag = nil @@ -267,7 +292,7 @@ func BACnetConstructedDataElementParse(readBuffer utils.ReadBuffer, objectType B } // Create the instance - return NewBACnetConstructedDataElement(peekedTagHeader, applicationTag, contextTag, constructedData, peekedTagNumber, isApplicationTag, isConstructedData, isContextTag), nil + return NewBACnetConstructedDataElement(peekedTagHeader, applicationTag, contextTag, constructedData, objectType, *propertyIdentifier), nil } func (m *BACnetConstructedDataElement) Serialize(writeBuffer utils.WriteBuffer) error { @@ -275,19 +300,19 @@ func (m *BACnetConstructedDataElement) Serialize(writeBuffer utils.WriteBuffer) return pushErr } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } // Virtual field - if _isApplicationTagErr := writeBuffer.WriteVirtual("isApplicationTag", m.IsApplicationTag); _isApplicationTagErr != nil { + if _isApplicationTagErr := writeBuffer.WriteVirtual("isApplicationTag", m.GetIsApplicationTag()); _isApplicationTagErr != nil { return errors.Wrap(_isApplicationTagErr, "Error serializing 'isApplicationTag' field") } // Virtual field - if _isConstructedDataErr := writeBuffer.WriteVirtual("isConstructedData", m.IsConstructedData); _isConstructedDataErr != nil { + if _isConstructedDataErr := writeBuffer.WriteVirtual("isConstructedData", m.GetIsConstructedData()); _isConstructedDataErr != nil { return errors.Wrap(_isConstructedDataErr, "Error serializing 'isConstructedData' field") } // Virtual field - if _isContextTagErr := writeBuffer.WriteVirtual("isContextTag", m.IsContextTag); _isContextTagErr != nil { + if _isContextTagErr := writeBuffer.WriteVirtual("isContextTag", m.GetIsContextTag()); _isContextTagErr != nil { return errors.Wrap(_isContextTagErr, "Error serializing 'isContextTag' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go index e07f130dfe7..49ddf56027b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go @@ -32,6 +32,10 @@ type BACnetConstructedDataEventTimestamps struct { ToOffnormal *BACnetContextTagTime ToFault *BACnetContextTagUnsignedInteger ToNormal *BACnetDateTime + + // Arguments. + TagNumber uint8 + PropertyIdentifierArgument BACnetContextTagPropertyIdentifier } // The corresponding interface @@ -42,10 +46,10 @@ type IBACnetConstructedDataEventTimestamps interface { GetToFault() *BACnetContextTagUnsignedInteger // GetToNormal returns ToNormal GetToNormal() *BACnetDateTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +73,9 @@ func (m *BACnetConstructedDataEventTimestamps) GetPropertyIdentifierEnum() BACne return BACnetPropertyIdentifier_EVENT_TIME_STAMPS } -func (m *BACnetConstructedDataEventTimestamps) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) { +func (m *BACnetConstructedDataEventTimestamps) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetConstructedData.OpeningTag = openingTag m.BACnetConstructedData.ClosingTag = closingTag - m.BACnetConstructedData.PropertyIdentifierEnum = propertyIdentifierEnum } /////////////////////////////////////////////////////////// @@ -94,12 +97,13 @@ func (m *BACnetConstructedDataEventTimestamps) GetToNormal() *BACnetDateTime { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConstructedDataEventTimestamps(toOffnormal *BACnetContextTagTime, toFault *BACnetContextTagUnsignedInteger, toNormal *BACnetDateTime, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) *BACnetConstructedData { +// NewBACnetConstructedDataEventTimestamps factory function for BACnetConstructedDataEventTimestamps +func NewBACnetConstructedDataEventTimestamps(toOffnormal *BACnetContextTagTime, toFault *BACnetContextTagUnsignedInteger, toNormal *BACnetDateTime, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, tagNumber uint8, propertyIdentifierArgument BACnetContextTagPropertyIdentifier) *BACnetConstructedData { child := &BACnetConstructedDataEventTimestamps{ ToOffnormal: toOffnormal, ToFault: toFault, ToNormal: toNormal, - BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, propertyIdentifierEnum), + BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, tagNumber, propertyIdentifierArgument), } child.Child = child return child.BACnetConstructedData @@ -128,27 +132,27 @@ func (m *BACnetConstructedDataEventTimestamps) GetTypeName() string { return "BACnetConstructedDataEventTimestamps" } -func (m *BACnetConstructedDataEventTimestamps) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConstructedDataEventTimestamps) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConstructedDataEventTimestamps) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConstructedDataEventTimestamps) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (toOffnormal) - lengthInBits += m.ToOffnormal.LengthInBits() + lengthInBits += m.ToOffnormal.GetLengthInBits() // Simple field (toFault) - lengthInBits += m.ToFault.LengthInBits() + lengthInBits += m.ToFault.GetLengthInBits() // Simple field (toNormal) - lengthInBits += m.ToNormal.LengthInBits() + lengthInBits += m.ToNormal.GetLengthInBits() return lengthInBits } -func (m *BACnetConstructedDataEventTimestamps) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConstructedDataEventTimestamps) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConstructedDataEventTimestampsParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, propertyIdentifierArgument *BACnetContextTagPropertyIdentifier) (*BACnetConstructedData, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go index aaafef3c627..b191bd938b8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go @@ -30,16 +30,20 @@ import ( type BACnetConstructedDataLifeSafetyZone struct { *BACnetConstructedData Zones []*BACnetContextTagObjectIdentifier + + // Arguments. + TagNumber uint8 + PropertyIdentifierArgument BACnetContextTagPropertyIdentifier } // The corresponding interface type IBACnetConstructedDataLifeSafetyZone interface { // GetZones returns Zones GetZones() []*BACnetContextTagObjectIdentifier - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,10 +67,9 @@ func (m *BACnetConstructedDataLifeSafetyZone) GetPropertyIdentifierEnum() BACnet return 0 } -func (m *BACnetConstructedDataLifeSafetyZone) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) { +func (m *BACnetConstructedDataLifeSafetyZone) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetConstructedData.OpeningTag = openingTag m.BACnetConstructedData.ClosingTag = closingTag - m.BACnetConstructedData.PropertyIdentifierEnum = propertyIdentifierEnum } /////////////////////////////////////////////////////////// @@ -80,10 +83,11 @@ func (m *BACnetConstructedDataLifeSafetyZone) GetZones() []*BACnetContextTagObje // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetConstructedDataLifeSafetyZone(zones []*BACnetContextTagObjectIdentifier, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) *BACnetConstructedData { +// NewBACnetConstructedDataLifeSafetyZone factory function for BACnetConstructedDataLifeSafetyZone +func NewBACnetConstructedDataLifeSafetyZone(zones []*BACnetContextTagObjectIdentifier, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, tagNumber uint8, propertyIdentifierArgument BACnetContextTagPropertyIdentifier) *BACnetConstructedData { child := &BACnetConstructedDataLifeSafetyZone{ Zones: zones, - BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, propertyIdentifierEnum), + BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, tagNumber, propertyIdentifierArgument), } child.Child = child return child.BACnetConstructedData @@ -112,25 +116,25 @@ func (m *BACnetConstructedDataLifeSafetyZone) GetTypeName() string { return "BACnetConstructedDataLifeSafetyZone" } -func (m *BACnetConstructedDataLifeSafetyZone) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConstructedDataLifeSafetyZone) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConstructedDataLifeSafetyZone) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConstructedDataLifeSafetyZone) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Zones) > 0 { for _, element := range m.Zones { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *BACnetConstructedDataLifeSafetyZone) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConstructedDataLifeSafetyZone) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConstructedDataLifeSafetyZoneParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, propertyIdentifierArgument *BACnetContextTagPropertyIdentifier) (*BACnetConstructedData, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go index 8104946e544..e386dac44fc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go @@ -33,7 +33,10 @@ type BACnetConstructedDataUnspecified struct { Data []*BACnetConstructedDataElement PropertyIdentifier *BACnetContextTagPropertyIdentifier Content *BACnetApplicationTag - HasData bool + + // Arguments. + TagNumber uint8 + PropertyIdentifierArgument BACnetContextTagPropertyIdentifier } // The corresponding interface @@ -46,10 +49,10 @@ type IBACnetConstructedDataUnspecified interface { GetContent() *BACnetApplicationTag // GetHasData returns HasData GetHasData() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,10 +76,9 @@ func (m *BACnetConstructedDataUnspecified) GetPropertyIdentifierEnum() BACnetPro return 0 } -func (m *BACnetConstructedDataUnspecified) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) { +func (m *BACnetConstructedDataUnspecified) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetConstructedData.OpeningTag = openingTag m.BACnetConstructedData.ClosingTag = closingTag - m.BACnetConstructedData.PropertyIdentifierEnum = propertyIdentifierEnum } /////////////////////////////////////////////////////////// @@ -98,17 +100,20 @@ func (m *BACnetConstructedDataUnspecified) GetContent() *BACnetApplicationTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetConstructedDataUnspecified) GetHasData() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.HasData + propertyIdentifier := m.PropertyIdentifier + _ = propertyIdentifier + content := m.Content + _ = content + return bool((len(m.GetData())) == (0)) } -func NewBACnetConstructedDataUnspecified(data []*BACnetConstructedDataElement, propertyIdentifier *BACnetContextTagPropertyIdentifier, content *BACnetApplicationTag, hasData bool, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, propertyIdentifierEnum BACnetPropertyIdentifier) *BACnetConstructedData { +// NewBACnetConstructedDataUnspecified factory function for BACnetConstructedDataUnspecified +func NewBACnetConstructedDataUnspecified(data []*BACnetConstructedDataElement, propertyIdentifier *BACnetContextTagPropertyIdentifier, content *BACnetApplicationTag, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, tagNumber uint8, propertyIdentifierArgument BACnetContextTagPropertyIdentifier) *BACnetConstructedData { child := &BACnetConstructedDataUnspecified{ Data: data, PropertyIdentifier: propertyIdentifier, Content: content, - HasData: hasData, - BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, propertyIdentifierEnum), + BACnetConstructedData: NewBACnetConstructedData(openingTag, closingTag, tagNumber, propertyIdentifierArgument), } child.Child = child return child.BACnetConstructedData @@ -137,17 +142,17 @@ func (m *BACnetConstructedDataUnspecified) GetTypeName() string { return "BACnetConstructedDataUnspecified" } -func (m *BACnetConstructedDataUnspecified) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetConstructedDataUnspecified) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetConstructedDataUnspecified) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetConstructedDataUnspecified) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Data) > 0 { for _, element := range m.Data { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } @@ -155,19 +160,19 @@ func (m *BACnetConstructedDataUnspecified) LengthInBitsConditional(lastItem bool // Optional Field (propertyIdentifier) if m.PropertyIdentifier != nil { - lengthInBits += (*m.PropertyIdentifier).LengthInBits() + lengthInBits += (*m.PropertyIdentifier).GetLengthInBits() } // Optional Field (content) if m.Content != nil { - lengthInBits += (*m.Content).LengthInBits() + lengthInBits += (*m.Content).GetLengthInBits() } return lengthInBits } -func (m *BACnetConstructedDataUnspecified) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetConstructedDataUnspecified) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetConstructedDataUnspecifiedParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, propertyIdentifierArgument *BACnetContextTagPropertyIdentifier) (*BACnetConstructedData, error) { @@ -198,6 +203,7 @@ func BACnetConstructedDataUnspecifiedParse(readBuffer utils.ReadBuffer, tagNumbe // Virtual field _hasData := bool((len(data)) == (0)) hasData := bool(_hasData) + _ = hasData // Optional Field (propertyIdentifier) (Can be skipped, if a given expression evaluates to false) var propertyIdentifier *BACnetContextTagPropertyIdentifier = nil @@ -250,7 +256,6 @@ func BACnetConstructedDataUnspecifiedParse(readBuffer utils.ReadBuffer, tagNumbe Data: data, PropertyIdentifier: CastBACnetContextTagPropertyIdentifier(propertyIdentifier), Content: CastBACnetApplicationTag(content), - HasData: hasData, BACnetConstructedData: &BACnetConstructedData{}, } _child.BACnetConstructedData.Child = _child @@ -279,7 +284,7 @@ func (m *BACnetConstructedDataUnspecified) Serialize(writeBuffer utils.WriteBuff } } // Virtual field - if _hasDataErr := writeBuffer.WriteVirtual("hasData", m.HasData); _hasDataErr != nil { + if _hasDataErr := writeBuffer.WriteVirtual("hasData", m.GetHasData()); _hasDataErr != nil { return errors.Wrap(_hasDataErr, "Error serializing 'hasData' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go index 57485110cf3..9ae8b6d9c49 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go @@ -28,11 +28,11 @@ import ( // The data-structure of this message type BACnetContextTag struct { - Header *BACnetTagHeader - TagNumber uint8 - ActualLength uint32 - IsNotOpeningOrClosingTag bool - Child IBACnetContextTagChild + Header *BACnetTagHeader + + // Arguments. + TagNumberArgument uint8 + Child IBACnetContextTagChild } // The corresponding interface @@ -47,10 +47,10 @@ type IBACnetContextTag interface { GetActualLength() uint32 // GetIsNotOpeningOrClosingTag returns IsNotOpeningOrClosingTag GetIsNotOpeningOrClosingTag() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +62,7 @@ type IBACnetContextTagParent interface { type IBACnetContextTagChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) + InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) GetTypeName() string IBACnetContextTag } @@ -78,22 +78,20 @@ func (m *BACnetContextTag) GetHeader() *BACnetTagHeader { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTag) GetTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.TagNumber + return m.GetHeader().GetTagNumber() } func (m *BACnetContextTag) GetActualLength() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualLength + return m.GetHeader().GetActualLength() } func (m *BACnetContextTag) GetIsNotOpeningOrClosingTag() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsNotOpeningOrClosingTag + return bool(bool((m.GetHeader().GetLengthValueType()) != (6))) && bool(bool((m.GetHeader().GetLengthValueType()) != (7))) } -func NewBACnetContextTag(header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { - return &BACnetContextTag{Header: header, TagNumber: tagNumber, ActualLength: actualLength, IsNotOpeningOrClosingTag: isNotOpeningOrClosingTag} +// NewBACnetContextTag factory function for BACnetContextTag +func NewBACnetContextTag(header *BACnetTagHeader, tagNumberArgument uint8) *BACnetContextTag { + return &BACnetContextTag{Header: header, TagNumberArgument: tagNumberArgument} } func CastBACnetContextTag(structType interface{}) *BACnetContextTag { @@ -113,19 +111,19 @@ func (m *BACnetContextTag) GetTypeName() string { return "BACnetContextTag" } -func (m *BACnetContextTag) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTag) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTag) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetContextTag) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetContextTag) ParentLengthInBits() uint16 { +func (m *BACnetContextTag) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (header) - lengthInBits += m.Header.LengthInBits() + lengthInBits += m.Header.GetLengthInBits() // A virtual field doesn't have any in- or output. @@ -136,8 +134,8 @@ func (m *BACnetContextTag) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BACnetContextTag) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTag) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType) (*BACnetContextTag, error) { @@ -159,26 +157,29 @@ func BACnetContextTagParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, } // Validation - if !(bool((header.ActualTagNumber) == (tagNumberArgument))) { + if !(bool((header.GetActualTagNumber()) == (tagNumberArgument))) { return nil, utils.ParseAssertError{"tagnumber doesn't match"} } // Validation - if !(bool((header.TagClass) == (TagClass_CONTEXT_SPECIFIC_TAGS))) { + if !(bool((header.GetTagClass()) == (TagClass_CONTEXT_SPECIFIC_TAGS))) { return nil, utils.ParseAssertError{"should be a context tag"} } // Virtual field - _tagNumber := header.TagNumber + _tagNumber := header.GetTagNumber() tagNumber := uint8(_tagNumber) + _ = tagNumber // Virtual field - _actualLength := header.ActualLength + _actualLength := header.GetActualLength() actualLength := uint32(_actualLength) + _ = actualLength // Virtual field - _isNotOpeningOrClosingTag := bool(bool((header.LengthValueType) != (6))) && bool(bool((header.LengthValueType) != (7))) + _isNotOpeningOrClosingTag := bool(bool((header.GetLengthValueType()) != (6))) && bool(bool((header.GetLengthValueType()) != (7))) isNotOpeningOrClosingTag := bool(_isNotOpeningOrClosingTag) + _ = isNotOpeningOrClosingTag // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetContextTag @@ -237,7 +238,7 @@ func BACnetContextTagParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, } // Finish initializing - _parent.Child.InitializeParent(_parent, header, tagNumber, actualLength, isNotOpeningOrClosingTag) + _parent.Child.InitializeParent(_parent, header) return _parent, nil } @@ -262,15 +263,15 @@ func (m *BACnetContextTag) SerializeParent(writeBuffer utils.WriteBuffer, child return errors.Wrap(_headerErr, "Error serializing 'header' field") } // Virtual field - if _tagNumberErr := writeBuffer.WriteVirtual("tagNumber", m.TagNumber); _tagNumberErr != nil { + if _tagNumberErr := writeBuffer.WriteVirtual("tagNumber", m.GetTagNumber()); _tagNumberErr != nil { return errors.Wrap(_tagNumberErr, "Error serializing 'tagNumber' field") } // Virtual field - if _actualLengthErr := writeBuffer.WriteVirtual("actualLength", m.ActualLength); _actualLengthErr != nil { + if _actualLengthErr := writeBuffer.WriteVirtual("actualLength", m.GetActualLength()); _actualLengthErr != nil { return errors.Wrap(_actualLengthErr, "Error serializing 'actualLength' field") } // Virtual field - if _isNotOpeningOrClosingTagErr := writeBuffer.WriteVirtual("isNotOpeningOrClosingTag", m.IsNotOpeningOrClosingTag); _isNotOpeningOrClosingTagErr != nil { + if _isNotOpeningOrClosingTagErr := writeBuffer.WriteVirtual("isNotOpeningOrClosingTag", m.GetIsNotOpeningOrClosingTag()); _isNotOpeningOrClosingTagErr != nil { return errors.Wrap(_isNotOpeningOrClosingTagErr, "Error serializing 'isNotOpeningOrClosingTag' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go index 9fa5c178841..862d5a8022e 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagBitString struct { *BACnetContextTag Payload *BACnetTagPayloadBitString + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagBitString interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadBitString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagBitString) GetDataType() BACnetDataType { return BACnetDataType_BIT_STRING } -func (m *BACnetContextTagBitString) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagBitString) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagBitString) GetPayload() *BACnetTagPayloadBitString { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagBitString(payload *BACnetTagPayloadBitString, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagBitString factory function for BACnetContextTagBitString +func NewBACnetContextTagBitString(payload *BACnetTagPayloadBitString, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagBitString{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagBitString) GetTypeName() string { return "BACnetContextTagBitString" } -func (m *BACnetContextTagBitString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagBitString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagBitString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagBitString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagBitString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagBitString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagBitStringParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -136,7 +138,7 @@ func BACnetContextTagBitStringParse(readBuffer utils.ReadBuffer, tagNumberArgume if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadBitStringParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadBitStringParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go index 4960bc8ddb8..2bff251d720 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go @@ -29,9 +29,12 @@ import ( // The data-structure of this message type BACnetContextTagBoolean struct { *BACnetContextTag - Value uint8 - Payload *BACnetTagPayloadBoolean - ActualValue bool + Value uint8 + Payload *BACnetTagPayloadBoolean + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface @@ -42,10 +45,10 @@ type IBACnetContextTagBoolean interface { GetPayload() *BACnetTagPayloadBoolean // GetActualValue returns ActualValue GetActualValue() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,11 +64,8 @@ func (m *BACnetContextTagBoolean) GetDataType() BACnetDataType { return BACnetDataType_BOOLEAN } -func (m *BACnetContextTagBoolean) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagBoolean) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -83,16 +83,15 @@ func (m *BACnetContextTagBoolean) GetPayload() *BACnetTagPayloadBoolean { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagBoolean) GetActualValue() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetValue() } -func NewBACnetContextTagBoolean(value uint8, payload *BACnetTagPayloadBoolean, actualValue bool, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagBoolean factory function for BACnetContextTagBoolean +func NewBACnetContextTagBoolean(value uint8, payload *BACnetTagPayloadBoolean, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagBoolean{ Value: value, Payload: payload, - ActualValue: actualValue, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -121,26 +120,26 @@ func (m *BACnetContextTagBoolean) GetTypeName() string { return "BACnetContextTagBoolean" } -func (m *BACnetContextTagBoolean) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagBoolean) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagBoolean) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagBoolean) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (value) lengthInBits += 8 // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetContextTagBoolean) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagBoolean) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagBooleanParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -154,7 +153,7 @@ func BACnetContextTagBooleanParse(readBuffer utils.ReadBuffer, tagNumberArgument } // Validation - if !(bool((header.ActualLength) == (1))) { + if !(bool((header.GetActualLength()) == (1))) { return nil, utils.ParseAssertError{"length field should be 1"} } @@ -179,8 +178,9 @@ func BACnetContextTagBooleanParse(readBuffer utils.ReadBuffer, tagNumberArgument } // Virtual field - _actualValue := payload.Value + _actualValue := payload.GetValue() actualValue := bool(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetContextTagBoolean"); closeErr != nil { return nil, closeErr @@ -190,7 +190,6 @@ func BACnetContextTagBooleanParse(readBuffer utils.ReadBuffer, tagNumberArgument _child := &BACnetContextTagBoolean{ Value: value, Payload: CastBACnetTagPayloadBoolean(payload), - ActualValue: actualValue, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -222,7 +221,7 @@ func (m *BACnetContextTagBoolean) Serialize(writeBuffer utils.WriteBuffer) error return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go index d2a173fc0d8..b2b9dcd0580 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagCharacterString struct { *BACnetContextTag Payload *BACnetTagPayloadCharacterString + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagCharacterString interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadCharacterString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagCharacterString) GetDataType() BACnetDataType { return BACnetDataType_CHARACTER_STRING } -func (m *BACnetContextTagCharacterString) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagCharacterString) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagCharacterString) GetPayload() *BACnetTagPayloadCharacte // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagCharacterString(payload *BACnetTagPayloadCharacterString, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagCharacterString factory function for BACnetContextTagCharacterString +func NewBACnetContextTagCharacterString(payload *BACnetTagPayloadCharacterString, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagCharacterString{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagCharacterString) GetTypeName() string { return "BACnetContextTagCharacterString" } -func (m *BACnetContextTagCharacterString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagCharacterString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagCharacterString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagCharacterString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagCharacterString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagCharacterString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagCharacterStringParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -136,7 +138,7 @@ func BACnetContextTagCharacterStringParse(readBuffer utils.ReadBuffer, tagNumber if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadCharacterStringParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadCharacterStringParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go index 7ef609a33b2..60d6b2cf7a7 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagDate struct { *BACnetContextTag Payload *BACnetTagPayloadDate + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagDate interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadDate - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagDate) GetDataType() BACnetDataType { return BACnetDataType_DATE } -func (m *BACnetContextTagDate) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagDate) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagDate) GetPayload() *BACnetTagPayloadDate { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagDate(payload *BACnetTagPayloadDate, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagDate factory function for BACnetContextTagDate +func NewBACnetContextTagDate(payload *BACnetTagPayloadDate, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagDate{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagDate) GetTypeName() string { return "BACnetContextTagDate" } -func (m *BACnetContextTagDate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagDate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagDate) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagDate) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagDate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagDate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagDateParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go index f2181a51e7f..d617b265583 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagDeviceState struct { *BACnetContextTag State BACnetDeviceState + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagDeviceState interface { // GetState returns State GetState() BACnetDeviceState - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagDeviceState) GetDataType() BACnetDataType { return BACnetDataType_BACNET_DEVICE_STATE } -func (m *BACnetContextTagDeviceState) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagDeviceState) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagDeviceState) GetState() BACnetDeviceState { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagDeviceState(state BACnetDeviceState, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagDeviceState factory function for BACnetContextTagDeviceState +func NewBACnetContextTagDeviceState(state BACnetDeviceState, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagDeviceState{ State: state, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,12 +107,12 @@ func (m *BACnetContextTagDeviceState) GetTypeName() string { return "BACnetContextTagDeviceState" } -func (m *BACnetContextTagDeviceState) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagDeviceState) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagDeviceState) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagDeviceState) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (state) lengthInBits += 8 @@ -118,8 +120,8 @@ func (m *BACnetContextTagDeviceState) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *BACnetContextTagDeviceState) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagDeviceState) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagDeviceStateParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go index 2d1f953feda..f0132beacb2 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go @@ -29,8 +29,11 @@ import ( // The data-structure of this message type BACnetContextTagDouble struct { *BACnetContextTag - Payload *BACnetTagPayloadDouble - ActualValue float64 + Payload *BACnetTagPayloadDouble + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface @@ -39,10 +42,10 @@ type IBACnetContextTagDouble interface { GetPayload() *BACnetTagPayloadDouble // GetActualValue returns ActualValue GetActualValue() float64 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,11 +61,8 @@ func (m *BACnetContextTagDouble) GetDataType() BACnetDataType { return BACnetDataType_DOUBLE } -func (m *BACnetContextTagDouble) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagDouble) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -76,15 +76,14 @@ func (m *BACnetContextTagDouble) GetPayload() *BACnetTagPayloadDouble { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagDouble) GetActualValue() float64 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetValue() } -func NewBACnetContextTagDouble(payload *BACnetTagPayloadDouble, actualValue float64, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagDouble factory function for BACnetContextTagDouble +func NewBACnetContextTagDouble(payload *BACnetTagPayloadDouble, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagDouble{ Payload: payload, - ActualValue: actualValue, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -113,23 +112,23 @@ func (m *BACnetContextTagDouble) GetTypeName() string { return "BACnetContextTagDouble" } -func (m *BACnetContextTagDouble) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagDouble) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagDouble) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagDouble) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetContextTagDouble) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagDouble) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagDoubleParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool) (*BACnetContextTag, error) { @@ -156,8 +155,9 @@ func BACnetContextTagDoubleParse(readBuffer utils.ReadBuffer, tagNumberArgument } // Virtual field - _actualValue := payload.Value + _actualValue := payload.GetValue() actualValue := float64(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetContextTagDouble"); closeErr != nil { return nil, closeErr @@ -166,7 +166,6 @@ func BACnetContextTagDoubleParse(readBuffer utils.ReadBuffer, tagNumberArgument // Create a partially initialized instance _child := &BACnetContextTagDouble{ Payload: CastBACnetTagPayloadDouble(payload), - ActualValue: actualValue, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -191,7 +190,7 @@ func (m *BACnetContextTagDouble) Serialize(writeBuffer utils.WriteBuffer) error return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go index 136e15d864f..4510231a936 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetContextTagEmpty struct { *BACnetContextTag + + // Arguments. + TagNumberArgument uint8 } // The corresponding interface type IBACnetContextTagEmpty interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,11 +54,8 @@ func (m *BACnetContextTagEmpty) GetDataType() BACnetDataType { return 0 } -func (m *BACnetContextTagEmpty) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagEmpty) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -66,9 +66,10 @@ func (m *BACnetContextTagEmpty) InitializeParent(parent *BACnetContextTag, heade // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagEmpty(header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagEmpty factory function for BACnetContextTagEmpty +func NewBACnetContextTagEmpty(header *BACnetTagHeader, tagNumberArgument uint8) *BACnetContextTag { child := &BACnetContextTagEmpty{ - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -97,18 +98,18 @@ func (m *BACnetContextTagEmpty) GetTypeName() string { return "BACnetContextTagEmpty" } -func (m *BACnetContextTagEmpty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagEmpty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagEmpty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagEmpty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetContextTagEmpty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagEmpty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagEmptyParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go index c647c1c9157..4ad74ba539c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go @@ -30,16 +30,22 @@ import ( type BACnetContextTagEnumerated struct { *BACnetContextTag Payload *BACnetTagPayloadEnumerated + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagEnumerated interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadEnumerated - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetActualValue returns ActualValue + GetActualValue() uint32 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +61,8 @@ func (m *BACnetContextTagEnumerated) GetDataType() BACnetDataType { return BACnetDataType_ENUMERATED } -func (m *BACnetContextTagEnumerated) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagEnumerated) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -72,11 +75,15 @@ func (m *BACnetContextTagEnumerated) GetPayload() *BACnetTagPayloadEnumerated { /////////////////////////////////////////////////////////// // Accessors for virtual fields. /////////////////////////////////////////////////////////// +func (m *BACnetContextTagEnumerated) GetActualValue() uint32 { + return m.GetPayload().GetActualValue() +} -func NewBACnetContextTagEnumerated(payload *BACnetTagPayloadEnumerated, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagEnumerated factory function for BACnetContextTagEnumerated +func NewBACnetContextTagEnumerated(payload *BACnetTagPayloadEnumerated, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagEnumerated{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +112,23 @@ func (m *BACnetContextTagEnumerated) GetTypeName() string { return "BACnetContextTagEnumerated" } -func (m *BACnetContextTagEnumerated) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagEnumerated) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagEnumerated) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagEnumerated) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() + + // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetContextTagEnumerated) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagEnumerated) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagEnumeratedParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -136,7 +145,7 @@ func BACnetContextTagEnumeratedParse(readBuffer utils.ReadBuffer, tagNumberArgum if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadEnumeratedParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadEnumeratedParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } @@ -145,6 +154,11 @@ func BACnetContextTagEnumeratedParse(readBuffer utils.ReadBuffer, tagNumberArgum return nil, closeErr } + // Virtual field + _actualValue := payload.GetActualValue() + actualValue := uint32(_actualValue) + _ = actualValue + if closeErr := readBuffer.CloseContext("BACnetContextTagEnumerated"); closeErr != nil { return nil, closeErr } @@ -175,6 +189,10 @@ func (m *BACnetContextTagEnumerated) Serialize(writeBuffer utils.WriteBuffer) er if _payloadErr != nil { return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } + // Virtual field + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { + return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") + } if popErr := writeBuffer.PopContext("BACnetContextTagEnumerated"); popErr != nil { return popErr diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go index 95a22d233e3..494443efa9c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go @@ -31,7 +31,11 @@ type BACnetContextTagEventState struct { *BACnetContextTag EventState BACnetEventState ProprietaryValue uint32 - IsProprietary bool + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool + ActualLength uint32 } // The corresponding interface @@ -42,10 +46,10 @@ type IBACnetContextTagEventState interface { GetProprietaryValue() uint32 // GetIsProprietary returns IsProprietary GetIsProprietary() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,11 +65,8 @@ func (m *BACnetContextTagEventState) GetDataType() BACnetDataType { return BACnetDataType_EVENT_STATE } -func (m *BACnetContextTagEventState) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagEventState) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -83,16 +84,15 @@ func (m *BACnetContextTagEventState) GetProprietaryValue() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagEventState) GetIsProprietary() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsProprietary + return bool((m.GetEventState()) == (BACnetEventState_VENDOR_PROPRIETARY_VALUE)) } -func NewBACnetContextTagEventState(eventState BACnetEventState, proprietaryValue uint32, isProprietary bool, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagEventState factory function for BACnetContextTagEventState +func NewBACnetContextTagEventState(eventState BACnetEventState, proprietaryValue uint32, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool, actualLength uint32) *BACnetContextTag { child := &BACnetContextTagEventState{ EventState: eventState, ProprietaryValue: proprietaryValue, - IsProprietary: isProprietary, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -121,15 +121,15 @@ func (m *BACnetContextTagEventState) GetTypeName() string { return "BACnetContextTagEventState" } -func (m *BACnetContextTagEventState) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagEventState) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagEventState) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagEventState) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Manual Field (eventState) - lengthInBits += uint16(int32(m.ActualLength) * int32(int32(8))) + lengthInBits += uint16(int32(m.GetActualLength()) * int32(int32(8))) // Manual Field (proprietaryValue) lengthInBits += uint16(int32(0)) @@ -139,8 +139,8 @@ func (m *BACnetContextTagEventState) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *BACnetContextTagEventState) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagEventState) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagEventStateParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, actualLength uint32) (*BACnetContextTag, error) { @@ -168,6 +168,7 @@ func BACnetContextTagEventStateParse(readBuffer utils.ReadBuffer, tagNumberArgum // Virtual field _isProprietary := bool((eventState) == (BACnetEventState_VENDOR_PROPRIETARY_VALUE)) isProprietary := bool(_isProprietary) + _ = isProprietary if closeErr := readBuffer.CloseContext("BACnetContextTagEventState"); closeErr != nil { return nil, closeErr @@ -177,7 +178,6 @@ func BACnetContextTagEventStateParse(readBuffer utils.ReadBuffer, tagNumberArgum _child := &BACnetContextTagEventState{ EventState: eventState, ProprietaryValue: proprietaryValue, - IsProprietary: isProprietary, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -191,18 +191,18 @@ func (m *BACnetContextTagEventState) Serialize(writeBuffer utils.WriteBuffer) er } // Manual Field (eventState) - _eventStateErr := WriteEventState(writeBuffer, m.EventState) + _eventStateErr := WriteEventState(writeBuffer, m.GetEventState()) if _eventStateErr != nil { return errors.Wrap(_eventStateErr, "Error serializing 'eventState' field") } // Manual Field (proprietaryValue) - _proprietaryValueErr := WriteProprietaryEventState(writeBuffer, m.EventState, m.ProprietaryValue) + _proprietaryValueErr := WriteProprietaryEventState(writeBuffer, m.GetEventState(), m.GetProprietaryValue()) if _proprietaryValueErr != nil { return errors.Wrap(_proprietaryValueErr, "Error serializing 'proprietaryValue' field") } // Virtual field - if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.IsProprietary); _isProprietaryErr != nil { + if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.GetIsProprietary()); _isProprietaryErr != nil { return errors.Wrap(_isProprietaryErr, "Error serializing 'isProprietary' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go index 0d14e795cb0..581bd370cfb 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go @@ -31,7 +31,11 @@ type BACnetContextTagEventType struct { *BACnetContextTag EventType BACnetEventType ProprietaryValue uint32 - IsProprietary bool + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool + ActualLength uint32 } // The corresponding interface @@ -42,10 +46,10 @@ type IBACnetContextTagEventType interface { GetProprietaryValue() uint32 // GetIsProprietary returns IsProprietary GetIsProprietary() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,11 +65,8 @@ func (m *BACnetContextTagEventType) GetDataType() BACnetDataType { return BACnetDataType_EVENT_TYPE } -func (m *BACnetContextTagEventType) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagEventType) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -83,16 +84,15 @@ func (m *BACnetContextTagEventType) GetProprietaryValue() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagEventType) GetIsProprietary() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsProprietary + return bool((m.GetEventType()) == (BACnetEventType_VENDOR_PROPRIETARY_VALUE)) } -func NewBACnetContextTagEventType(eventType BACnetEventType, proprietaryValue uint32, isProprietary bool, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagEventType factory function for BACnetContextTagEventType +func NewBACnetContextTagEventType(eventType BACnetEventType, proprietaryValue uint32, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool, actualLength uint32) *BACnetContextTag { child := &BACnetContextTagEventType{ EventType: eventType, ProprietaryValue: proprietaryValue, - IsProprietary: isProprietary, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -121,15 +121,15 @@ func (m *BACnetContextTagEventType) GetTypeName() string { return "BACnetContextTagEventType" } -func (m *BACnetContextTagEventType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagEventType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagEventType) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagEventType) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Manual Field (eventType) - lengthInBits += uint16(int32(m.ActualLength) * int32(int32(8))) + lengthInBits += uint16(int32(m.GetActualLength()) * int32(int32(8))) // Manual Field (proprietaryValue) lengthInBits += uint16(int32(0)) @@ -139,8 +139,8 @@ func (m *BACnetContextTagEventType) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *BACnetContextTagEventType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagEventType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagEventTypeParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, actualLength uint32) (*BACnetContextTag, error) { @@ -168,6 +168,7 @@ func BACnetContextTagEventTypeParse(readBuffer utils.ReadBuffer, tagNumberArgume // Virtual field _isProprietary := bool((eventType) == (BACnetEventType_VENDOR_PROPRIETARY_VALUE)) isProprietary := bool(_isProprietary) + _ = isProprietary if closeErr := readBuffer.CloseContext("BACnetContextTagEventType"); closeErr != nil { return nil, closeErr @@ -177,7 +178,6 @@ func BACnetContextTagEventTypeParse(readBuffer utils.ReadBuffer, tagNumberArgume _child := &BACnetContextTagEventType{ EventType: eventType, ProprietaryValue: proprietaryValue, - IsProprietary: isProprietary, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -191,18 +191,18 @@ func (m *BACnetContextTagEventType) Serialize(writeBuffer utils.WriteBuffer) err } // Manual Field (eventType) - _eventTypeErr := WriteEventType(writeBuffer, m.EventType) + _eventTypeErr := WriteEventType(writeBuffer, m.GetEventType()) if _eventTypeErr != nil { return errors.Wrap(_eventTypeErr, "Error serializing 'eventType' field") } // Manual Field (proprietaryValue) - _proprietaryValueErr := WriteProprietaryEventType(writeBuffer, m.EventType, m.ProprietaryValue) + _proprietaryValueErr := WriteProprietaryEventType(writeBuffer, m.GetEventType(), m.GetProprietaryValue()) if _proprietaryValueErr != nil { return errors.Wrap(_proprietaryValueErr, "Error serializing 'proprietaryValue' field") } // Virtual field - if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.IsProprietary); _isProprietaryErr != nil { + if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.GetIsProprietary()); _isProprietaryErr != nil { return errors.Wrap(_isProprietaryErr, "Error serializing 'isProprietary' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go index d878cb7dd8e..881066e20f6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go @@ -30,16 +30,21 @@ import ( type BACnetContextTagNotifyType struct { *BACnetContextTag Value BACnetNotifyType + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool + ActualLength uint32 } // The corresponding interface type IBACnetContextTagNotifyType interface { // GetValue returns Value GetValue() BACnetNotifyType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +60,8 @@ func (m *BACnetContextTagNotifyType) GetDataType() BACnetDataType { return BACnetDataType_NOTIFY_TYPE } -func (m *BACnetContextTagNotifyType) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagNotifyType) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +75,11 @@ func (m *BACnetContextTagNotifyType) GetValue() BACnetNotifyType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagNotifyType(value BACnetNotifyType, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagNotifyType factory function for BACnetContextTagNotifyType +func NewBACnetContextTagNotifyType(value BACnetNotifyType, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool, actualLength uint32) *BACnetContextTag { child := &BACnetContextTagNotifyType{ Value: value, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,12 +108,12 @@ func (m *BACnetContextTagNotifyType) GetTypeName() string { return "BACnetContextTagNotifyType" } -func (m *BACnetContextTagNotifyType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagNotifyType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagNotifyType) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagNotifyType) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (value) lengthInBits += 8 @@ -118,8 +121,8 @@ func (m *BACnetContextTagNotifyType) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *BACnetContextTagNotifyType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagNotifyType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagNotifyTypeParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, actualLength uint32) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go index 8d22bee7ab6..f2c45b5bc73 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go @@ -29,9 +29,11 @@ import ( // The data-structure of this message type BACnetContextTagObjectIdentifier struct { *BACnetContextTag - Payload *BACnetTagPayloadObjectIdentifier - ObjectType BACnetObjectType - InstanceNumber uint32 + Payload *BACnetTagPayloadObjectIdentifier + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface @@ -42,10 +44,10 @@ type IBACnetContextTagObjectIdentifier interface { GetObjectType() BACnetObjectType // GetInstanceNumber returns InstanceNumber GetInstanceNumber() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,11 +63,8 @@ func (m *BACnetContextTagObjectIdentifier) GetDataType() BACnetDataType { return BACnetDataType_BACNET_OBJECT_IDENTIFIER } -func (m *BACnetContextTagObjectIdentifier) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagObjectIdentifier) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -79,21 +78,18 @@ func (m *BACnetContextTagObjectIdentifier) GetPayload() *BACnetTagPayloadObjectI // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagObjectIdentifier) GetObjectType() BACnetObjectType { - // TODO: calculation should happen here instead accessing the stored field - return m.ObjectType + return m.GetPayload().GetObjectType() } func (m *BACnetContextTagObjectIdentifier) GetInstanceNumber() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.InstanceNumber + return m.GetPayload().GetInstanceNumber() } -func NewBACnetContextTagObjectIdentifier(payload *BACnetTagPayloadObjectIdentifier, objectType BACnetObjectType, instanceNumber uint32, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagObjectIdentifier factory function for BACnetContextTagObjectIdentifier +func NewBACnetContextTagObjectIdentifier(payload *BACnetTagPayloadObjectIdentifier, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagObjectIdentifier{ Payload: payload, - ObjectType: objectType, - InstanceNumber: instanceNumber, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -122,15 +118,15 @@ func (m *BACnetContextTagObjectIdentifier) GetTypeName() string { return "BACnetContextTagObjectIdentifier" } -func (m *BACnetContextTagObjectIdentifier) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagObjectIdentifier) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagObjectIdentifier) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagObjectIdentifier) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. @@ -139,8 +135,8 @@ func (m *BACnetContextTagObjectIdentifier) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *BACnetContextTagObjectIdentifier) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagObjectIdentifier) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagObjectIdentifierParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool) (*BACnetContextTag, error) { @@ -167,12 +163,14 @@ func BACnetContextTagObjectIdentifierParse(readBuffer utils.ReadBuffer, tagNumbe } // Virtual field - _objectType := payload.ObjectType + _objectType := payload.GetObjectType() objectType := BACnetObjectType(_objectType) + _ = objectType // Virtual field - _instanceNumber := payload.InstanceNumber + _instanceNumber := payload.GetInstanceNumber() instanceNumber := uint32(_instanceNumber) + _ = instanceNumber if closeErr := readBuffer.CloseContext("BACnetContextTagObjectIdentifier"); closeErr != nil { return nil, closeErr @@ -181,8 +179,6 @@ func BACnetContextTagObjectIdentifierParse(readBuffer utils.ReadBuffer, tagNumbe // Create a partially initialized instance _child := &BACnetContextTagObjectIdentifier{ Payload: CastBACnetTagPayloadObjectIdentifier(payload), - ObjectType: objectType, - InstanceNumber: instanceNumber, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -207,11 +203,11 @@ func (m *BACnetContextTagObjectIdentifier) Serialize(writeBuffer utils.WriteBuff return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _objectTypeErr := writeBuffer.WriteVirtual("objectType", m.ObjectType); _objectTypeErr != nil { + if _objectTypeErr := writeBuffer.WriteVirtual("objectType", m.GetObjectType()); _objectTypeErr != nil { return errors.Wrap(_objectTypeErr, "Error serializing 'objectType' field") } // Virtual field - if _instanceNumberErr := writeBuffer.WriteVirtual("instanceNumber", m.InstanceNumber); _instanceNumberErr != nil { + if _instanceNumberErr := writeBuffer.WriteVirtual("instanceNumber", m.GetInstanceNumber()); _instanceNumberErr != nil { return errors.Wrap(_instanceNumberErr, "Error serializing 'instanceNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go index 5a0cb531b5a..340e74d1bb2 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagOctetString struct { *BACnetContextTag Payload *BACnetTagPayloadOctetString + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagOctetString interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadOctetString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagOctetString) GetDataType() BACnetDataType { return BACnetDataType_OCTET_STRING } -func (m *BACnetContextTagOctetString) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagOctetString) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagOctetString) GetPayload() *BACnetTagPayloadOctetString // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagOctetString(payload *BACnetTagPayloadOctetString, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagOctetString factory function for BACnetContextTagOctetString +func NewBACnetContextTagOctetString(payload *BACnetTagPayloadOctetString, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagOctetString{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagOctetString) GetTypeName() string { return "BACnetContextTagOctetString" } -func (m *BACnetContextTagOctetString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagOctetString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagOctetString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagOctetString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagOctetString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagOctetString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagOctetStringParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -136,7 +138,7 @@ func BACnetContextTagOctetStringParse(readBuffer utils.ReadBuffer, tagNumberArgu if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadOctetStringParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadOctetStringParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go index 44f5ae5cd37..c47a02aa443 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go @@ -31,7 +31,11 @@ type BACnetContextTagPropertyIdentifier struct { *BACnetContextTag PropertyIdentifier BACnetPropertyIdentifier ProprietaryValue uint32 - IsProprietary bool + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool + ActualLength uint32 } // The corresponding interface @@ -42,10 +46,10 @@ type IBACnetContextTagPropertyIdentifier interface { GetProprietaryValue() uint32 // GetIsProprietary returns IsProprietary GetIsProprietary() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,11 +65,8 @@ func (m *BACnetContextTagPropertyIdentifier) GetDataType() BACnetDataType { return BACnetDataType_BACNET_PROPERTY_IDENTIFIER } -func (m *BACnetContextTagPropertyIdentifier) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagPropertyIdentifier) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -83,16 +84,15 @@ func (m *BACnetContextTagPropertyIdentifier) GetProprietaryValue() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagPropertyIdentifier) GetIsProprietary() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsProprietary + return bool((m.GetPropertyIdentifier()) == (BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE)) } -func NewBACnetContextTagPropertyIdentifier(propertyIdentifier BACnetPropertyIdentifier, proprietaryValue uint32, isProprietary bool, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagPropertyIdentifier factory function for BACnetContextTagPropertyIdentifier +func NewBACnetContextTagPropertyIdentifier(propertyIdentifier BACnetPropertyIdentifier, proprietaryValue uint32, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool, actualLength uint32) *BACnetContextTag { child := &BACnetContextTagPropertyIdentifier{ PropertyIdentifier: propertyIdentifier, ProprietaryValue: proprietaryValue, - IsProprietary: isProprietary, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -121,15 +121,15 @@ func (m *BACnetContextTagPropertyIdentifier) GetTypeName() string { return "BACnetContextTagPropertyIdentifier" } -func (m *BACnetContextTagPropertyIdentifier) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagPropertyIdentifier) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagPropertyIdentifier) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagPropertyIdentifier) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Manual Field (propertyIdentifier) - lengthInBits += uint16(int32(m.ActualLength) * int32(int32(8))) + lengthInBits += uint16(int32(m.GetActualLength()) * int32(int32(8))) // Manual Field (proprietaryValue) lengthInBits += uint16(int32(0)) @@ -139,8 +139,8 @@ func (m *BACnetContextTagPropertyIdentifier) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *BACnetContextTagPropertyIdentifier) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagPropertyIdentifier) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagPropertyIdentifierParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, actualLength uint32) (*BACnetContextTag, error) { @@ -168,6 +168,7 @@ func BACnetContextTagPropertyIdentifierParse(readBuffer utils.ReadBuffer, tagNum // Virtual field _isProprietary := bool((propertyIdentifier) == (BACnetPropertyIdentifier_VENDOR_PROPRIETARY_VALUE)) isProprietary := bool(_isProprietary) + _ = isProprietary if closeErr := readBuffer.CloseContext("BACnetContextTagPropertyIdentifier"); closeErr != nil { return nil, closeErr @@ -177,7 +178,6 @@ func BACnetContextTagPropertyIdentifierParse(readBuffer utils.ReadBuffer, tagNum _child := &BACnetContextTagPropertyIdentifier{ PropertyIdentifier: propertyIdentifier, ProprietaryValue: proprietaryValue, - IsProprietary: isProprietary, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -191,18 +191,18 @@ func (m *BACnetContextTagPropertyIdentifier) Serialize(writeBuffer utils.WriteBu } // Manual Field (propertyIdentifier) - _propertyIdentifierErr := WritePropertyIdentifier(writeBuffer, m.PropertyIdentifier) + _propertyIdentifierErr := WritePropertyIdentifier(writeBuffer, m.GetPropertyIdentifier()) if _propertyIdentifierErr != nil { return errors.Wrap(_propertyIdentifierErr, "Error serializing 'propertyIdentifier' field") } // Manual Field (proprietaryValue) - _proprietaryValueErr := WriteProprietaryPropertyIdentifier(writeBuffer, m.PropertyIdentifier, m.ProprietaryValue) + _proprietaryValueErr := WriteProprietaryPropertyIdentifier(writeBuffer, m.GetPropertyIdentifier(), m.GetProprietaryValue()) if _proprietaryValueErr != nil { return errors.Wrap(_proprietaryValueErr, "Error serializing 'proprietaryValue' field") } // Virtual field - if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.IsProprietary); _isProprietaryErr != nil { + if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.GetIsProprietary()); _isProprietaryErr != nil { return errors.Wrap(_isProprietaryErr, "Error serializing 'isProprietary' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go index 2dbe2962b0a..c50229ecdc0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go @@ -29,8 +29,11 @@ import ( // The data-structure of this message type BACnetContextTagReal struct { *BACnetContextTag - Payload *BACnetTagPayloadReal - ActualValue float32 + Payload *BACnetTagPayloadReal + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface @@ -39,10 +42,10 @@ type IBACnetContextTagReal interface { GetPayload() *BACnetTagPayloadReal // GetActualValue returns ActualValue GetActualValue() float32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,11 +61,8 @@ func (m *BACnetContextTagReal) GetDataType() BACnetDataType { return BACnetDataType_REAL } -func (m *BACnetContextTagReal) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagReal) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -76,15 +76,14 @@ func (m *BACnetContextTagReal) GetPayload() *BACnetTagPayloadReal { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetContextTagReal) GetActualValue() float32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return m.GetPayload().GetValue() } -func NewBACnetContextTagReal(payload *BACnetTagPayloadReal, actualValue float32, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagReal factory function for BACnetContextTagReal +func NewBACnetContextTagReal(payload *BACnetTagPayloadReal, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagReal{ Payload: payload, - ActualValue: actualValue, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -113,23 +112,23 @@ func (m *BACnetContextTagReal) GetTypeName() string { return "BACnetContextTagReal" } -func (m *BACnetContextTagReal) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagReal) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagReal) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagReal) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() // A virtual field doesn't have any in- or output. return lengthInBits } -func (m *BACnetContextTagReal) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagReal) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagRealParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool) (*BACnetContextTag, error) { @@ -156,8 +155,9 @@ func BACnetContextTagRealParse(readBuffer utils.ReadBuffer, tagNumberArgument ui } // Virtual field - _actualValue := payload.Value + _actualValue := payload.GetValue() actualValue := float32(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetContextTagReal"); closeErr != nil { return nil, closeErr @@ -166,7 +166,6 @@ func BACnetContextTagRealParse(readBuffer utils.ReadBuffer, tagNumberArgument ui // Create a partially initialized instance _child := &BACnetContextTagReal{ Payload: CastBACnetTagPayloadReal(payload), - ActualValue: actualValue, BACnetContextTag: &BACnetContextTag{}, } _child.BACnetContextTag.Child = _child @@ -191,7 +190,7 @@ func (m *BACnetContextTagReal) Serialize(writeBuffer utils.WriteBuffer) error { return errors.Wrap(_payloadErr, "Error serializing 'payload' field") } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go index 7783cc4b206..3800d93fbc3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagSignedInteger struct { *BACnetContextTag Payload *BACnetTagPayloadSignedInteger + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagSignedInteger interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadSignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagSignedInteger) GetDataType() BACnetDataType { return BACnetDataType_SIGNED_INTEGER } -func (m *BACnetContextTagSignedInteger) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagSignedInteger) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagSignedInteger) GetPayload() *BACnetTagPayloadSignedInte // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagSignedInteger(payload *BACnetTagPayloadSignedInteger, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagSignedInteger factory function for BACnetContextTagSignedInteger +func NewBACnetContextTagSignedInteger(payload *BACnetTagPayloadSignedInteger, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagSignedInteger{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagSignedInteger) GetTypeName() string { return "BACnetContextTagSignedInteger" } -func (m *BACnetContextTagSignedInteger) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagSignedInteger) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagSignedInteger) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagSignedInteger) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagSignedInteger) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagSignedInteger) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagSignedIntegerParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -136,7 +138,7 @@ func BACnetContextTagSignedIntegerParse(readBuffer utils.ReadBuffer, tagNumberAr if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadSignedIntegerParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadSignedIntegerParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go index 4af4610e26c..b2e5f2b3530 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagTime struct { *BACnetContextTag Payload *BACnetTagPayloadTime + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagTime interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagTime) GetDataType() BACnetDataType { return BACnetDataType_TIME } -func (m *BACnetContextTagTime) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagTime) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagTime) GetPayload() *BACnetTagPayloadTime { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagTime(payload *BACnetTagPayloadTime, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagTime factory function for BACnetContextTagTime +func NewBACnetContextTagTime(payload *BACnetTagPayloadTime, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagTime{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagTime) GetTypeName() string { return "BACnetContextTagTime" } -func (m *BACnetContextTagTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagTime) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagTime) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagTimeParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go index bc439376e36..a0eee158ae6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go @@ -30,16 +30,20 @@ import ( type BACnetContextTagUnsignedInteger struct { *BACnetContextTag Payload *BACnetTagPayloadUnsignedInteger + + // Arguments. + TagNumberArgument uint8 + IsNotOpeningOrClosingTag bool } // The corresponding interface type IBACnetContextTagUnsignedInteger interface { // GetPayload returns Payload GetPayload() *BACnetTagPayloadUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,8 @@ func (m *BACnetContextTagUnsignedInteger) GetDataType() BACnetDataType { return BACnetDataType_UNSIGNED_INTEGER } -func (m *BACnetContextTagUnsignedInteger) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetContextTagUnsignedInteger) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -73,10 +74,11 @@ func (m *BACnetContextTagUnsignedInteger) GetPayload() *BACnetTagPayloadUnsigned // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetContextTagUnsignedInteger(payload *BACnetTagPayloadUnsignedInteger, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetContextTagUnsignedInteger factory function for BACnetContextTagUnsignedInteger +func NewBACnetContextTagUnsignedInteger(payload *BACnetTagPayloadUnsignedInteger, header *BACnetTagHeader, tagNumberArgument uint8, isNotOpeningOrClosingTag bool) *BACnetContextTag { child := &BACnetContextTagUnsignedInteger{ Payload: payload, - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -105,21 +107,21 @@ func (m *BACnetContextTagUnsignedInteger) GetTypeName() string { return "BACnetContextTagUnsignedInteger" } -func (m *BACnetContextTagUnsignedInteger) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetContextTagUnsignedInteger) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetContextTagUnsignedInteger) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetContextTagUnsignedInteger) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *BACnetContextTagUnsignedInteger) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetContextTagUnsignedInteger) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetContextTagUnsignedIntegerParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, isNotOpeningOrClosingTag bool, header *BACnetTagHeader) (*BACnetContextTag, error) { @@ -136,7 +138,7 @@ func BACnetContextTagUnsignedIntegerParse(readBuffer utils.ReadBuffer, tagNumber if pullErr := readBuffer.PullContext("payload"); pullErr != nil { return nil, pullErr } - _payload, _payloadErr := BACnetTagPayloadUnsignedIntegerParse(readBuffer, uint32(header.ActualLength)) + _payload, _payloadErr := BACnetTagPayloadUnsignedIntegerParse(readBuffer, uint32(header.GetActualLength())) if _payloadErr != nil { return nil, errors.Wrap(_payloadErr, "Error parsing 'payload' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDataType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDataType.go index da7e7596d3c..73c25144fbb 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDataType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDataType.go @@ -194,12 +194,12 @@ func CastBACnetDataType(structType interface{}) BACnetDataType { return castFunc(structType) } -func (m BACnetDataType) LengthInBits() uint16 { +func (m BACnetDataType) GetLengthInBits() uint16 { return 8 } -func (m BACnetDataType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetDataType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetDataTypeParse(readBuffer utils.ReadBuffer) (BACnetDataType, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go index ec60809f907..e3a6e5c1da3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go @@ -32,6 +32,9 @@ type BACnetDateTime struct { DateValue *BACnetApplicationTagDate TimeValue *BACnetApplicationTagTime ClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -44,10 +47,10 @@ type IBACnetDateTime interface { GetTimeValue() *BACnetApplicationTagTime // GetClosingTag returns ClosingTag GetClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,8 +78,9 @@ func (m *BACnetDateTime) GetClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetDateTime(openingTag *BACnetOpeningTag, dateValue *BACnetApplicationTagDate, timeValue *BACnetApplicationTagTime, closingTag *BACnetClosingTag) *BACnetDateTime { - return &BACnetDateTime{OpeningTag: openingTag, DateValue: dateValue, TimeValue: timeValue, ClosingTag: closingTag} +// NewBACnetDateTime factory function for BACnetDateTime +func NewBACnetDateTime(openingTag *BACnetOpeningTag, dateValue *BACnetApplicationTagDate, timeValue *BACnetApplicationTagTime, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetDateTime { + return &BACnetDateTime{OpeningTag: openingTag, DateValue: dateValue, TimeValue: timeValue, ClosingTag: closingTag, TagNumber: tagNumber} } func CastBACnetDateTime(structType interface{}) *BACnetDateTime { @@ -96,30 +100,30 @@ func (m *BACnetDateTime) GetTypeName() string { return "BACnetDateTime" } -func (m *BACnetDateTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetDateTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetDateTime) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetDateTime) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // Simple field (dateValue) - lengthInBits += m.DateValue.LengthInBits() + lengthInBits += m.DateValue.GetLengthInBits() // Simple field (timeValue) - lengthInBits += m.TimeValue.LengthInBits() + lengthInBits += m.TimeValue.GetLengthInBits() // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetDateTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetDateTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetDateTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetDateTime, error) { @@ -184,7 +188,7 @@ func BACnetDateTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetD } // Create the instance - return NewBACnetDateTime(openingTag, dateValue, timeValue, closingTag), nil + return NewBACnetDateTime(openingTag, dateValue, timeValue, closingTag, tagNumber), nil } func (m *BACnetDateTime) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go index 95b55f453db..67ebffb1721 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go @@ -35,6 +35,9 @@ type BACnetDeviceObjectPropertyReference struct { ArrayIndex *BACnetContextTagUnsignedInteger DeviceIdentifier *BACnetContextTagObjectIdentifier ClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -51,10 +54,10 @@ type IBACnetDeviceObjectPropertyReference interface { GetDeviceIdentifier() *BACnetContextTagObjectIdentifier // GetClosingTag returns ClosingTag GetClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,8 +93,9 @@ func (m *BACnetDeviceObjectPropertyReference) GetClosingTag() *BACnetClosingTag // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetDeviceObjectPropertyReference(openingTag *BACnetOpeningTag, objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, deviceIdentifier *BACnetContextTagObjectIdentifier, closingTag *BACnetClosingTag) *BACnetDeviceObjectPropertyReference { - return &BACnetDeviceObjectPropertyReference{OpeningTag: openingTag, ObjectIdentifier: objectIdentifier, PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, DeviceIdentifier: deviceIdentifier, ClosingTag: closingTag} +// NewBACnetDeviceObjectPropertyReference factory function for BACnetDeviceObjectPropertyReference +func NewBACnetDeviceObjectPropertyReference(openingTag *BACnetOpeningTag, objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, deviceIdentifier *BACnetContextTagObjectIdentifier, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetDeviceObjectPropertyReference { + return &BACnetDeviceObjectPropertyReference{OpeningTag: openingTag, ObjectIdentifier: objectIdentifier, PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex, DeviceIdentifier: deviceIdentifier, ClosingTag: closingTag, TagNumber: tagNumber} } func CastBACnetDeviceObjectPropertyReference(structType interface{}) *BACnetDeviceObjectPropertyReference { @@ -111,40 +115,40 @@ func (m *BACnetDeviceObjectPropertyReference) GetTypeName() string { return "BACnetDeviceObjectPropertyReference" } -func (m *BACnetDeviceObjectPropertyReference) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetDeviceObjectPropertyReference) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetDeviceObjectPropertyReference) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetDeviceObjectPropertyReference) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (arrayIndex) if m.ArrayIndex != nil { - lengthInBits += (*m.ArrayIndex).LengthInBits() + lengthInBits += (*m.ArrayIndex).GetLengthInBits() } // Optional Field (deviceIdentifier) if m.DeviceIdentifier != nil { - lengthInBits += (*m.DeviceIdentifier).LengthInBits() + lengthInBits += (*m.DeviceIdentifier).GetLengthInBits() } // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetDeviceObjectPropertyReference) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetDeviceObjectPropertyReference) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetDeviceObjectPropertyReference, error) { @@ -251,7 +255,7 @@ func BACnetDeviceObjectPropertyReferenceParse(readBuffer utils.ReadBuffer, tagNu } // Create the instance - return NewBACnetDeviceObjectPropertyReference(openingTag, objectIdentifier, propertyIdentifier, arrayIndex, deviceIdentifier, closingTag), nil + return NewBACnetDeviceObjectPropertyReference(openingTag, objectIdentifier, propertyIdentifier, arrayIndex, deviceIdentifier, closingTag, tagNumber), nil } func (m *BACnetDeviceObjectPropertyReference) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceState.go index 702d014390b..5b34a443036 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceState.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceState.go @@ -122,12 +122,12 @@ func CastBACnetDeviceState(structType interface{}) BACnetDeviceState { return castFunc(structType) } -func (m BACnetDeviceState) LengthInBits() uint16 { +func (m BACnetDeviceState) GetLengthInBits() uint16 { return 8 } -func (m BACnetDeviceState) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetDeviceState) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetDeviceStateParse(readBuffer utils.ReadBuffer) (BACnetDeviceState, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go index a776654746f..f2f8d6248ed 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go @@ -41,10 +41,10 @@ type IBACnetError interface { GetErrorClass() *BACnetApplicationTagEnumerated // GetErrorCode returns ErrorCode GetErrorCode() *BACnetApplicationTagEnumerated - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *BACnetError) GetErrorCode() *BACnetApplicationTagEnumerated { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetError factory function for BACnetError func NewBACnetError(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { return &BACnetError{ErrorClass: errorClass, ErrorCode: errorCode} } @@ -97,30 +98,30 @@ func (m *BACnetError) GetTypeName() string { return "BACnetError" } -func (m *BACnetError) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetError) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetError) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetError) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetError) ParentLengthInBits() uint16 { +func (m *BACnetError) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (serviceChoice) lengthInBits += 8 // Simple field (errorClass) - lengthInBits += m.ErrorClass.LengthInBits() + lengthInBits += m.ErrorClass.GetLengthInBits() // Simple field (errorCode) - lengthInBits += m.ErrorCode.LengthInBits() + lengthInBits += m.ErrorCode.GetLengthInBits() return lengthInBits } -func (m *BACnetError) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetError) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go index 20ee09db21f..e0f98b5d61a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go @@ -32,10 +32,10 @@ type BACnetErrorAcknowledgeAlarm struct { // The corresponding interface type IBACnetErrorAcknowledgeAlarm interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorAcknowledgeAlarm) InitializeParent(parent *BACnetError, erro // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorAcknowledgeAlarm factory function for BACnetErrorAcknowledgeAlarm func NewBACnetErrorAcknowledgeAlarm(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorAcknowledgeAlarm{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorAcknowledgeAlarm) GetTypeName() string { return "BACnetErrorAcknowledgeAlarm" } -func (m *BACnetErrorAcknowledgeAlarm) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorAcknowledgeAlarm) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorAcknowledgeAlarm) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorAcknowledgeAlarm) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorAcknowledgeAlarm) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorAcknowledgeAlarm) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorAcknowledgeAlarmParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go index 2ba8bb89f9e..e9336de4a62 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go @@ -32,10 +32,10 @@ type BACnetErrorAtomicReadFile struct { // The corresponding interface type IBACnetErrorAtomicReadFile interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorAtomicReadFile) InitializeParent(parent *BACnetError, errorC // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorAtomicReadFile factory function for BACnetErrorAtomicReadFile func NewBACnetErrorAtomicReadFile(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorAtomicReadFile{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorAtomicReadFile) GetTypeName() string { return "BACnetErrorAtomicReadFile" } -func (m *BACnetErrorAtomicReadFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorAtomicReadFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorAtomicReadFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorAtomicReadFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorAtomicReadFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorAtomicReadFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorAtomicReadFileParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go index ad6afdde523..e7320bad7f3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go @@ -32,10 +32,10 @@ type BACnetErrorAtomicWriteFile struct { // The corresponding interface type IBACnetErrorAtomicWriteFile interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorAtomicWriteFile) InitializeParent(parent *BACnetError, error // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorAtomicWriteFile factory function for BACnetErrorAtomicWriteFile func NewBACnetErrorAtomicWriteFile(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorAtomicWriteFile{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorAtomicWriteFile) GetTypeName() string { return "BACnetErrorAtomicWriteFile" } -func (m *BACnetErrorAtomicWriteFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorAtomicWriteFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorAtomicWriteFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorAtomicWriteFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorAtomicWriteFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorAtomicWriteFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorAtomicWriteFileParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go index a32580f4e33..dcae4a35d46 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go @@ -32,10 +32,10 @@ type BACnetErrorConfirmedEventNotification struct { // The corresponding interface type IBACnetErrorConfirmedEventNotification interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorConfirmedEventNotification) InitializeParent(parent *BACnetE // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorConfirmedEventNotification factory function for BACnetErrorConfirmedEventNotification func NewBACnetErrorConfirmedEventNotification(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorConfirmedEventNotification{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorConfirmedEventNotification) GetTypeName() string { return "BACnetErrorConfirmedEventNotification" } -func (m *BACnetErrorConfirmedEventNotification) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorConfirmedEventNotification) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorConfirmedEventNotification) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorConfirmedEventNotification) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorConfirmedEventNotification) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorConfirmedEventNotification) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorConfirmedEventNotificationParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go index bbab7924221..d5cbc673fd8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go @@ -32,10 +32,10 @@ type BACnetErrorConfirmedPrivateTransfer struct { // The corresponding interface type IBACnetErrorConfirmedPrivateTransfer interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorConfirmedPrivateTransfer) InitializeParent(parent *BACnetErr // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorConfirmedPrivateTransfer factory function for BACnetErrorConfirmedPrivateTransfer func NewBACnetErrorConfirmedPrivateTransfer(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorConfirmedPrivateTransfer{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorConfirmedPrivateTransfer) GetTypeName() string { return "BACnetErrorConfirmedPrivateTransfer" } -func (m *BACnetErrorConfirmedPrivateTransfer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorConfirmedPrivateTransfer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorConfirmedPrivateTransfer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorConfirmedPrivateTransfer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorConfirmedPrivateTransfer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorConfirmedPrivateTransfer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorConfirmedPrivateTransferParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go index 4743cb3b826..f8ea0d26792 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go @@ -32,10 +32,10 @@ type BACnetErrorCreateObject struct { // The corresponding interface type IBACnetErrorCreateObject interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorCreateObject) InitializeParent(parent *BACnetError, errorCla // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorCreateObject factory function for BACnetErrorCreateObject func NewBACnetErrorCreateObject(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorCreateObject{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorCreateObject) GetTypeName() string { return "BACnetErrorCreateObject" } -func (m *BACnetErrorCreateObject) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorCreateObject) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorCreateObject) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorCreateObject) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorCreateObject) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorCreateObject) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorCreateObjectParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go index 8e44c54ae94..981289487ac 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go @@ -32,10 +32,10 @@ type BACnetErrorDeviceCommunicationProtocol struct { // The corresponding interface type IBACnetErrorDeviceCommunicationProtocol interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorDeviceCommunicationProtocol) InitializeParent(parent *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorDeviceCommunicationProtocol factory function for BACnetErrorDeviceCommunicationProtocol func NewBACnetErrorDeviceCommunicationProtocol(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorDeviceCommunicationProtocol{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorDeviceCommunicationProtocol) GetTypeName() string { return "BACnetErrorDeviceCommunicationProtocol" } -func (m *BACnetErrorDeviceCommunicationProtocol) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorDeviceCommunicationProtocol) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorDeviceCommunicationProtocol) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorDeviceCommunicationProtocol) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorDeviceCommunicationProtocol) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorDeviceCommunicationProtocol) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorDeviceCommunicationProtocolParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go index 61f519c6af0..27cfbfdd1a5 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go @@ -32,10 +32,10 @@ type BACnetErrorGetAlarmSummary struct { // The corresponding interface type IBACnetErrorGetAlarmSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorGetAlarmSummary) InitializeParent(parent *BACnetError, error // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorGetAlarmSummary factory function for BACnetErrorGetAlarmSummary func NewBACnetErrorGetAlarmSummary(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorGetAlarmSummary{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorGetAlarmSummary) GetTypeName() string { return "BACnetErrorGetAlarmSummary" } -func (m *BACnetErrorGetAlarmSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorGetAlarmSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorGetAlarmSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorGetAlarmSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorGetAlarmSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorGetAlarmSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorGetAlarmSummaryParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go index 127ebe6c957..77565b9e264 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go @@ -32,10 +32,10 @@ type BACnetErrorGetEnrollmentSummary struct { // The corresponding interface type IBACnetErrorGetEnrollmentSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorGetEnrollmentSummary) InitializeParent(parent *BACnetError, // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorGetEnrollmentSummary factory function for BACnetErrorGetEnrollmentSummary func NewBACnetErrorGetEnrollmentSummary(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorGetEnrollmentSummary{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorGetEnrollmentSummary) GetTypeName() string { return "BACnetErrorGetEnrollmentSummary" } -func (m *BACnetErrorGetEnrollmentSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorGetEnrollmentSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorGetEnrollmentSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorGetEnrollmentSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorGetEnrollmentSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorGetEnrollmentSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorGetEnrollmentSummaryParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go index 448f9d865ce..13adfe02ae7 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go @@ -32,10 +32,10 @@ type BACnetErrorGetEventInformation struct { // The corresponding interface type IBACnetErrorGetEventInformation interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorGetEventInformation) InitializeParent(parent *BACnetError, e // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorGetEventInformation factory function for BACnetErrorGetEventInformation func NewBACnetErrorGetEventInformation(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorGetEventInformation{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorGetEventInformation) GetTypeName() string { return "BACnetErrorGetEventInformation" } -func (m *BACnetErrorGetEventInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorGetEventInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorGetEventInformation) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorGetEventInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorGetEventInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorGetEventInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorGetEventInformationParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go index a5aebdc7b62..1c04e8a6f6f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go @@ -32,10 +32,10 @@ type BACnetErrorPasswordFailure struct { // The corresponding interface type IBACnetErrorPasswordFailure interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorPasswordFailure) InitializeParent(parent *BACnetError, error // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorPasswordFailure factory function for BACnetErrorPasswordFailure func NewBACnetErrorPasswordFailure(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorPasswordFailure{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorPasswordFailure) GetTypeName() string { return "BACnetErrorPasswordFailure" } -func (m *BACnetErrorPasswordFailure) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorPasswordFailure) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorPasswordFailure) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorPasswordFailure) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorPasswordFailure) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorPasswordFailure) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorPasswordFailureParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go index 4fcc182d322..9886b436409 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go @@ -32,10 +32,10 @@ type BACnetErrorReadProperty struct { // The corresponding interface type IBACnetErrorReadProperty interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorReadProperty) InitializeParent(parent *BACnetError, errorCla // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorReadProperty factory function for BACnetErrorReadProperty func NewBACnetErrorReadProperty(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorReadProperty{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorReadProperty) GetTypeName() string { return "BACnetErrorReadProperty" } -func (m *BACnetErrorReadProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorReadProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorReadProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorReadProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorReadProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorReadProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorReadPropertyParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go index 5aa6a49882a..f0896583832 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go @@ -32,10 +32,10 @@ type BACnetErrorReadPropertyMultiple struct { // The corresponding interface type IBACnetErrorReadPropertyMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorReadPropertyMultiple) InitializeParent(parent *BACnetError, // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorReadPropertyMultiple factory function for BACnetErrorReadPropertyMultiple func NewBACnetErrorReadPropertyMultiple(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorReadPropertyMultiple{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorReadPropertyMultiple) GetTypeName() string { return "BACnetErrorReadPropertyMultiple" } -func (m *BACnetErrorReadPropertyMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorReadPropertyMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorReadPropertyMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorReadPropertyMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorReadPropertyMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorReadPropertyMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorReadPropertyMultipleParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go index 9918fceae0b..e9e3635bf78 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go @@ -32,10 +32,10 @@ type BACnetErrorReadRange struct { // The corresponding interface type IBACnetErrorReadRange interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorReadRange) InitializeParent(parent *BACnetError, errorClass // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorReadRange factory function for BACnetErrorReadRange func NewBACnetErrorReadRange(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorReadRange{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorReadRange) GetTypeName() string { return "BACnetErrorReadRange" } -func (m *BACnetErrorReadRange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorReadRange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorReadRange) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorReadRange) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorReadRange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorReadRange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorReadRangeParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go index 8220a5a573b..b09017428eb 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go @@ -32,10 +32,10 @@ type BACnetErrorRemovedAuthenticate struct { // The corresponding interface type IBACnetErrorRemovedAuthenticate interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorRemovedAuthenticate) InitializeParent(parent *BACnetError, e // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorRemovedAuthenticate factory function for BACnetErrorRemovedAuthenticate func NewBACnetErrorRemovedAuthenticate(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorRemovedAuthenticate{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorRemovedAuthenticate) GetTypeName() string { return "BACnetErrorRemovedAuthenticate" } -func (m *BACnetErrorRemovedAuthenticate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorRemovedAuthenticate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorRemovedAuthenticate) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorRemovedAuthenticate) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorRemovedAuthenticate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorRemovedAuthenticate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorRemovedAuthenticateParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go index 7f34b013cea..ceb0fe869b1 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go @@ -32,10 +32,10 @@ type BACnetErrorRemovedReadPropertyConditional struct { // The corresponding interface type IBACnetErrorRemovedReadPropertyConditional interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorRemovedReadPropertyConditional) InitializeParent(parent *BAC // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorRemovedReadPropertyConditional factory function for BACnetErrorRemovedReadPropertyConditional func NewBACnetErrorRemovedReadPropertyConditional(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorRemovedReadPropertyConditional{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorRemovedReadPropertyConditional) GetTypeName() string { return "BACnetErrorRemovedReadPropertyConditional" } -func (m *BACnetErrorRemovedReadPropertyConditional) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorRemovedReadPropertyConditional) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorRemovedReadPropertyConditional) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorRemovedReadPropertyConditional) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorRemovedReadPropertyConditional) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorRemovedReadPropertyConditional) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorRemovedReadPropertyConditionalParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go index fcea92fbaed..3122b0c108b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go @@ -32,10 +32,10 @@ type BACnetErrorUnknown struct { // The corresponding interface type IBACnetErrorUnknown interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorUnknown) InitializeParent(parent *BACnetError, errorClass *B // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorUnknown factory function for BACnetErrorUnknown func NewBACnetErrorUnknown(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorUnknown{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorUnknown) GetTypeName() string { return "BACnetErrorUnknown" } -func (m *BACnetErrorUnknown) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorUnknown) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorUnknown) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorUnknown) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorUnknown) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorUnknown) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorUnknownParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go index 233ef4c7f8d..4f661f60c78 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go @@ -32,10 +32,10 @@ type BACnetErrorVTData struct { // The corresponding interface type IBACnetErrorVTData interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorVTData) InitializeParent(parent *BACnetError, errorClass *BA // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorVTData factory function for BACnetErrorVTData func NewBACnetErrorVTData(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorVTData{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorVTData) GetTypeName() string { return "BACnetErrorVTData" } -func (m *BACnetErrorVTData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorVTData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorVTData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorVTData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorVTData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorVTData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorVTDataParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go index 80fc0b0b093..2aa96126472 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go @@ -32,10 +32,10 @@ type BACnetErrorVTOpen struct { // The corresponding interface type IBACnetErrorVTOpen interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorVTOpen) InitializeParent(parent *BACnetError, errorClass *BA // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorVTOpen factory function for BACnetErrorVTOpen func NewBACnetErrorVTOpen(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorVTOpen{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorVTOpen) GetTypeName() string { return "BACnetErrorVTOpen" } -func (m *BACnetErrorVTOpen) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorVTOpen) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorVTOpen) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorVTOpen) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorVTOpen) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorVTOpen) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorVTOpenParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go index 4039a2b7f0a..09b898f9799 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go @@ -32,10 +32,10 @@ type BACnetErrorWriteProperty struct { // The corresponding interface type IBACnetErrorWriteProperty interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,6 +64,7 @@ func (m *BACnetErrorWriteProperty) InitializeParent(parent *BACnetError, errorCl // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetErrorWriteProperty factory function for BACnetErrorWriteProperty func NewBACnetErrorWriteProperty(errorClass *BACnetApplicationTagEnumerated, errorCode *BACnetApplicationTagEnumerated) *BACnetError { child := &BACnetErrorWriteProperty{ BACnetError: NewBACnetError(errorClass, errorCode), @@ -95,18 +96,18 @@ func (m *BACnetErrorWriteProperty) GetTypeName() string { return "BACnetErrorWriteProperty" } -func (m *BACnetErrorWriteProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetErrorWriteProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetErrorWriteProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetErrorWriteProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetErrorWriteProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetErrorWriteProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetErrorWritePropertyParse(readBuffer utils.ReadBuffer) (*BACnetError, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventState.go index 59f53b76d82..9a5e71908c3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventState.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventState.go @@ -116,12 +116,12 @@ func CastBACnetEventState(structType interface{}) BACnetEventState { return castFunc(structType) } -func (m BACnetEventState) LengthInBits() uint16 { +func (m BACnetEventState) GetLengthInBits() uint16 { return 9 } -func (m BACnetEventState) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetEventState) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetEventStateParse(readBuffer utils.ReadBuffer) (BACnetEventState, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventType.go index 2bf570d5ed7..f4754904999 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetEventType.go @@ -200,12 +200,12 @@ func CastBACnetEventType(structType interface{}) BACnetEventType { return castFunc(structType) } -func (m BACnetEventType) LengthInBits() uint16 { +func (m BACnetEventType) GetLengthInBits() uint16 { return 9 } -func (m BACnetEventType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetEventType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetEventTypeParse(readBuffer utils.ReadBuffer) (BACnetEventType, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNetworkType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNetworkType.go index 90522696fc7..2d4ced4e928 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNetworkType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNetworkType.go @@ -140,12 +140,12 @@ func CastBACnetNetworkType(structType interface{}) BACnetNetworkType { return castFunc(structType) } -func (m BACnetNetworkType) LengthInBits() uint16 { +func (m BACnetNetworkType) GetLengthInBits() uint16 { return 4 } -func (m BACnetNetworkType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetNetworkType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNetworkTypeParse(readBuffer utils.ReadBuffer) (BACnetNetworkType, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNodeType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNodeType.go index e9c39ddc9c2..345571fe743 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNodeType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNodeType.go @@ -206,12 +206,12 @@ func CastBACnetNodeType(structType interface{}) BACnetNodeType { return castFunc(structType) } -func (m BACnetNodeType) LengthInBits() uint16 { +func (m BACnetNodeType) GetLengthInBits() uint16 { return 8 } -func (m BACnetNodeType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetNodeType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNodeTypeParse(readBuffer utils.ReadBuffer) (BACnetNodeType, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go index 0d8ef9732f8..d7df4fb6001 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go @@ -31,8 +31,11 @@ type BACnetNotificationParameters struct { OpeningTag *BACnetOpeningTag PeekedTagHeader *BACnetTagHeader ClosingTag *BACnetClosingTag - PeekedTagNumber uint8 - Child IBACnetNotificationParametersChild + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType + Child IBACnetNotificationParametersChild } // The corresponding interface @@ -47,10 +50,10 @@ type IBACnetNotificationParameters interface { GetClosingTag() *BACnetClosingTag // GetPeekedTagNumber returns PeekedTagNumber GetPeekedTagNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +65,7 @@ type IBACnetNotificationParametersParent interface { type IBACnetNotificationParametersChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) + InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) GetTypeName() string IBACnetNotificationParameters } @@ -86,12 +89,12 @@ func (m *BACnetNotificationParameters) GetClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetNotificationParameters) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + return m.GetPeekedTagHeader().GetActualTagNumber() } -func NewBACnetNotificationParameters(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { - return &BACnetNotificationParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, PeekedTagNumber: peekedTagNumber} +// NewBACnetNotificationParameters factory function for BACnetNotificationParameters +func NewBACnetNotificationParameters(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { + return &BACnetNotificationParameters{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber, ObjectType: objectType} } func CastBACnetNotificationParameters(structType interface{}) *BACnetNotificationParameters { @@ -111,30 +114,30 @@ func (m *BACnetNotificationParameters) GetTypeName() string { return "BACnetNotificationParameters" } -func (m *BACnetNotificationParameters) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParameters) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParameters) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetNotificationParameters) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetNotificationParameters) ParentLengthInBits() uint16 { +func (m *BACnetNotificationParameters) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParameters) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParameters) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType) (*BACnetNotificationParameters, error) { @@ -164,8 +167,9 @@ func BACnetNotificationParametersParse(readBuffer utils.ReadBuffer, tagNumber ui readBuffer.Reset(currentPos) // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetNotificationParameters @@ -215,7 +219,7 @@ func BACnetNotificationParametersParse(readBuffer utils.ReadBuffer, tagNumber ui } // Finish initializing - _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag, peekedTagNumber) + _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag) return _parent, nil } @@ -240,7 +244,7 @@ func (m *BACnetNotificationParameters) SerializeParent(writeBuffer utils.WriteBu return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go index 0453933293a..880fe581b8b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go @@ -34,6 +34,10 @@ type BACnetNotificationParametersBufferReady struct { PreviousNotification *BACnetContextTagUnsignedInteger CurrentNotification *BACnetContextTagUnsignedInteger InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -48,10 +52,10 @@ type IBACnetNotificationParametersBufferReady interface { GetCurrentNotification() *BACnetContextTagUnsignedInteger // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -67,11 +71,10 @@ func (m *BACnetNotificationParametersBufferReady) GetPeekedTagNumber() uint8 { return uint8(10) } -func (m *BACnetNotificationParametersBufferReady) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersBufferReady) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -101,14 +104,15 @@ func (m *BACnetNotificationParametersBufferReady) GetInnerClosingTag() *BACnetCl // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersBufferReady(innerOpeningTag *BACnetOpeningTag, bufferProperty *BACnetDeviceObjectPropertyReference, previousNotification *BACnetContextTagUnsignedInteger, currentNotification *BACnetContextTagUnsignedInteger, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersBufferReady factory function for BACnetNotificationParametersBufferReady +func NewBACnetNotificationParametersBufferReady(innerOpeningTag *BACnetOpeningTag, bufferProperty *BACnetDeviceObjectPropertyReference, previousNotification *BACnetContextTagUnsignedInteger, currentNotification *BACnetContextTagUnsignedInteger, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersBufferReady{ InnerOpeningTag: innerOpeningTag, BufferProperty: bufferProperty, PreviousNotification: previousNotification, CurrentNotification: currentNotification, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -137,33 +141,33 @@ func (m *BACnetNotificationParametersBufferReady) GetTypeName() string { return "BACnetNotificationParametersBufferReady" } -func (m *BACnetNotificationParametersBufferReady) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersBufferReady) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersBufferReady) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersBufferReady) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (bufferProperty) - lengthInBits += m.BufferProperty.LengthInBits() + lengthInBits += m.BufferProperty.GetLengthInBits() // Simple field (previousNotification) - lengthInBits += m.PreviousNotification.LengthInBits() + lengthInBits += m.PreviousNotification.GetLengthInBits() // Simple field (currentNotification) - lengthInBits += m.CurrentNotification.LengthInBits() + lengthInBits += m.CurrentNotification.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersBufferReady) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersBufferReady) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersBufferReadyParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go index 5cbc3e813c0..d1e1ae147cc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go @@ -33,6 +33,10 @@ type BACnetNotificationParametersChangeOfBitString struct { ChangeOfBitString *BACnetContextTagBitString StatusFlags *BACnetStatusFlags InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -45,10 +49,10 @@ type IBACnetNotificationParametersChangeOfBitString interface { GetStatusFlags() *BACnetStatusFlags // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,11 +68,10 @@ func (m *BACnetNotificationParametersChangeOfBitString) GetPeekedTagNumber() uin return uint8(0) } -func (m *BACnetNotificationParametersChangeOfBitString) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersChangeOfBitString) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -94,13 +97,14 @@ func (m *BACnetNotificationParametersChangeOfBitString) GetInnerClosingTag() *BA // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersChangeOfBitString(innerOpeningTag *BACnetOpeningTag, changeOfBitString *BACnetContextTagBitString, statusFlags *BACnetStatusFlags, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersChangeOfBitString factory function for BACnetNotificationParametersChangeOfBitString +func NewBACnetNotificationParametersChangeOfBitString(innerOpeningTag *BACnetOpeningTag, changeOfBitString *BACnetContextTagBitString, statusFlags *BACnetStatusFlags, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersChangeOfBitString{ InnerOpeningTag: innerOpeningTag, ChangeOfBitString: changeOfBitString, StatusFlags: statusFlags, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -129,30 +133,30 @@ func (m *BACnetNotificationParametersChangeOfBitString) GetTypeName() string { return "BACnetNotificationParametersChangeOfBitString" } -func (m *BACnetNotificationParametersChangeOfBitString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersChangeOfBitString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersChangeOfBitString) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersChangeOfBitString) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (changeOfBitString) - lengthInBits += m.ChangeOfBitString.LengthInBits() + lengthInBits += m.ChangeOfBitString.GetLengthInBits() // Simple field (statusFlags) - lengthInBits += m.StatusFlags.LengthInBits() + lengthInBits += m.StatusFlags.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersChangeOfBitString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersChangeOfBitString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersChangeOfBitStringParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go index 007f6874f58..439a0663fec 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go @@ -33,6 +33,10 @@ type BACnetNotificationParametersChangeOfState struct { ChangeOfState *BACnetPropertyStates StatusFlags *BACnetStatusFlags InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -45,10 +49,10 @@ type IBACnetNotificationParametersChangeOfState interface { GetStatusFlags() *BACnetStatusFlags // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,11 +68,10 @@ func (m *BACnetNotificationParametersChangeOfState) GetPeekedTagNumber() uint8 { return uint8(1) } -func (m *BACnetNotificationParametersChangeOfState) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersChangeOfState) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -94,13 +97,14 @@ func (m *BACnetNotificationParametersChangeOfState) GetInnerClosingTag() *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersChangeOfState(innerOpeningTag *BACnetOpeningTag, changeOfState *BACnetPropertyStates, statusFlags *BACnetStatusFlags, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersChangeOfState factory function for BACnetNotificationParametersChangeOfState +func NewBACnetNotificationParametersChangeOfState(innerOpeningTag *BACnetOpeningTag, changeOfState *BACnetPropertyStates, statusFlags *BACnetStatusFlags, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersChangeOfState{ InnerOpeningTag: innerOpeningTag, ChangeOfState: changeOfState, StatusFlags: statusFlags, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -129,30 +133,30 @@ func (m *BACnetNotificationParametersChangeOfState) GetTypeName() string { return "BACnetNotificationParametersChangeOfState" } -func (m *BACnetNotificationParametersChangeOfState) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersChangeOfState) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersChangeOfState) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersChangeOfState) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (changeOfState) - lengthInBits += m.ChangeOfState.LengthInBits() + lengthInBits += m.ChangeOfState.GetLengthInBits() // Simple field (statusFlags) - lengthInBits += m.StatusFlags.LengthInBits() + lengthInBits += m.StatusFlags.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersChangeOfState) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersChangeOfState) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersChangeOfStateParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go index 089066e2e86..32e76fcc87e 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go @@ -33,6 +33,10 @@ type BACnetNotificationParametersChangeOfValue struct { NewValue *BACnetNotificationParametersChangeOfValueNewValue StatusFlags *BACnetStatusFlags InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -45,10 +49,10 @@ type IBACnetNotificationParametersChangeOfValue interface { GetStatusFlags() *BACnetStatusFlags // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,11 +68,10 @@ func (m *BACnetNotificationParametersChangeOfValue) GetPeekedTagNumber() uint8 { return uint8(2) } -func (m *BACnetNotificationParametersChangeOfValue) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersChangeOfValue) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -94,13 +97,14 @@ func (m *BACnetNotificationParametersChangeOfValue) GetInnerClosingTag() *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersChangeOfValue(innerOpeningTag *BACnetOpeningTag, newValue *BACnetNotificationParametersChangeOfValueNewValue, statusFlags *BACnetStatusFlags, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersChangeOfValue factory function for BACnetNotificationParametersChangeOfValue +func NewBACnetNotificationParametersChangeOfValue(innerOpeningTag *BACnetOpeningTag, newValue *BACnetNotificationParametersChangeOfValueNewValue, statusFlags *BACnetStatusFlags, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersChangeOfValue{ InnerOpeningTag: innerOpeningTag, NewValue: newValue, StatusFlags: statusFlags, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -129,30 +133,30 @@ func (m *BACnetNotificationParametersChangeOfValue) GetTypeName() string { return "BACnetNotificationParametersChangeOfValue" } -func (m *BACnetNotificationParametersChangeOfValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersChangeOfValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersChangeOfValue) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersChangeOfValue) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (newValue) - lengthInBits += m.NewValue.LengthInBits() + lengthInBits += m.NewValue.GetLengthInBits() // Simple field (statusFlags) - lengthInBits += m.StatusFlags.LengthInBits() + lengthInBits += m.StatusFlags.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersChangeOfValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersChangeOfValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersChangeOfValueParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go index 2229dfac837..e81d4591882 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go @@ -31,8 +31,10 @@ type BACnetNotificationParametersChangeOfValueNewValue struct { OpeningTag *BACnetOpeningTag PeekedTagHeader *BACnetTagHeader ClosingTag *BACnetClosingTag - PeekedTagNumber uint8 - Child IBACnetNotificationParametersChangeOfValueNewValueChild + + // Arguments. + TagNumber uint8 + Child IBACnetNotificationParametersChangeOfValueNewValueChild } // The corresponding interface @@ -47,10 +49,10 @@ type IBACnetNotificationParametersChangeOfValueNewValue interface { GetClosingTag() *BACnetClosingTag // GetPeekedTagNumber returns PeekedTagNumber GetPeekedTagNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +64,7 @@ type IBACnetNotificationParametersChangeOfValueNewValueParent interface { type IBACnetNotificationParametersChangeOfValueNewValueChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) + InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) GetTypeName() string IBACnetNotificationParametersChangeOfValueNewValue } @@ -86,12 +88,12 @@ func (m *BACnetNotificationParametersChangeOfValueNewValue) GetClosingTag() *BAC // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetNotificationParametersChangeOfValueNewValue) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + return m.GetPeekedTagHeader().GetActualTagNumber() } -func NewBACnetNotificationParametersChangeOfValueNewValue(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParametersChangeOfValueNewValue { - return &BACnetNotificationParametersChangeOfValueNewValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, PeekedTagNumber: peekedTagNumber} +// NewBACnetNotificationParametersChangeOfValueNewValue factory function for BACnetNotificationParametersChangeOfValueNewValue +func NewBACnetNotificationParametersChangeOfValueNewValue(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetNotificationParametersChangeOfValueNewValue { + return &BACnetNotificationParametersChangeOfValueNewValue{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber} } func CastBACnetNotificationParametersChangeOfValueNewValue(structType interface{}) *BACnetNotificationParametersChangeOfValueNewValue { @@ -111,30 +113,30 @@ func (m *BACnetNotificationParametersChangeOfValueNewValue) GetTypeName() string return "BACnetNotificationParametersChangeOfValueNewValue" } -func (m *BACnetNotificationParametersChangeOfValueNewValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersChangeOfValueNewValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersChangeOfValueNewValue) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetNotificationParametersChangeOfValueNewValue) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetNotificationParametersChangeOfValueNewValue) ParentLengthInBits() uint16 { +func (m *BACnetNotificationParametersChangeOfValueNewValue) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersChangeOfValueNewValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersChangeOfValueNewValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersChangeOfValueNewValueParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetNotificationParametersChangeOfValueNewValue, error) { @@ -164,8 +166,9 @@ func BACnetNotificationParametersChangeOfValueNewValueParse(readBuffer utils.Rea readBuffer.Reset(currentPos) // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetNotificationParametersChangeOfValueNewValue @@ -201,7 +204,7 @@ func BACnetNotificationParametersChangeOfValueNewValueParse(readBuffer utils.Rea } // Finish initializing - _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag, peekedTagNumber) + _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag) return _parent, nil } @@ -226,7 +229,7 @@ func (m *BACnetNotificationParametersChangeOfValueNewValue) SerializeParent(writ return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go index 49ba97611ca..56e59c64148 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go @@ -30,16 +30,19 @@ import ( type BACnetNotificationParametersChangeOfValueNewValueChangedBits struct { *BACnetNotificationParametersChangeOfValueNewValue ChangedBits *BACnetContextTagBitString + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetNotificationParametersChangeOfValueNewValueChangedBits interface { // GetChangedBits returns ChangedBits GetChangedBits() *BACnetContextTagBitString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +58,10 @@ func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetPeeked return uint8(0) } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParametersChangeOfValueNewValue.OpeningTag = openingTag m.BACnetNotificationParametersChangeOfValueNewValue.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParametersChangeOfValueNewValue.ClosingTag = closingTag - m.BACnetNotificationParametersChangeOfValueNewValue.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -73,10 +75,11 @@ func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetChange // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersChangeOfValueNewValueChangedBits(changedBits *BACnetContextTagBitString, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParametersChangeOfValueNewValue { +// NewBACnetNotificationParametersChangeOfValueNewValueChangedBits factory function for BACnetNotificationParametersChangeOfValueNewValueChangedBits +func NewBACnetNotificationParametersChangeOfValueNewValueChangedBits(changedBits *BACnetContextTagBitString, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetNotificationParametersChangeOfValueNewValue { child := &BACnetNotificationParametersChangeOfValueNewValueChangedBits{ ChangedBits: changedBits, - BACnetNotificationParametersChangeOfValueNewValue: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParametersChangeOfValueNewValue: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetNotificationParametersChangeOfValueNewValue @@ -105,21 +108,21 @@ func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetTypeNa return "BACnetNotificationParametersChangeOfValueNewValueChangedBits" } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (changedBits) - lengthInBits += m.ChangedBits.LengthInBits() + lengthInBits += m.ChangedBits.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersChangeOfValueNewValueChangedBitsParse(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (*BACnetNotificationParametersChangeOfValueNewValue, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go index 2b5b02d4532..f4ed48127bc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go @@ -30,16 +30,19 @@ import ( type BACnetNotificationParametersChangeOfValueNewValueChangedValue struct { *BACnetNotificationParametersChangeOfValueNewValue ChangedValue *BACnetContextTagReal + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetNotificationParametersChangeOfValueNewValueChangedValue interface { // GetChangedValue returns ChangedValue GetChangedValue() *BACnetContextTagReal - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +58,10 @@ func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetPeeke return uint8(1) } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParametersChangeOfValueNewValue.OpeningTag = openingTag m.BACnetNotificationParametersChangeOfValueNewValue.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParametersChangeOfValueNewValue.ClosingTag = closingTag - m.BACnetNotificationParametersChangeOfValueNewValue.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -73,10 +75,11 @@ func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetChang // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersChangeOfValueNewValueChangedValue(changedValue *BACnetContextTagReal, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParametersChangeOfValueNewValue { +// NewBACnetNotificationParametersChangeOfValueNewValueChangedValue factory function for BACnetNotificationParametersChangeOfValueNewValueChangedValue +func NewBACnetNotificationParametersChangeOfValueNewValueChangedValue(changedValue *BACnetContextTagReal, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetNotificationParametersChangeOfValueNewValue { child := &BACnetNotificationParametersChangeOfValueNewValueChangedValue{ ChangedValue: changedValue, - BACnetNotificationParametersChangeOfValueNewValue: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParametersChangeOfValueNewValue: NewBACnetNotificationParametersChangeOfValueNewValue(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetNotificationParametersChangeOfValueNewValue @@ -105,21 +108,21 @@ func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetTypeN return "BACnetNotificationParametersChangeOfValueNewValueChangedValue" } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (changedValue) - lengthInBits += m.ChangedValue.LengthInBits() + lengthInBits += m.ChangedValue.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersChangeOfValueNewValueChangedValueParse(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (*BACnetNotificationParametersChangeOfValueNewValue, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go index ed53290d5d4..2bc9aa47b7e 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go @@ -30,16 +30,20 @@ import ( type BACnetNotificationParametersComplexEventType struct { *BACnetNotificationParameters ListOfValues *BACnetPropertyValues + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface type IBACnetNotificationParametersComplexEventType interface { // GetListOfValues returns ListOfValues GetListOfValues() *BACnetPropertyValues - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +59,10 @@ func (m *BACnetNotificationParametersComplexEventType) GetPeekedTagNumber() uint return uint8(6) } -func (m *BACnetNotificationParametersComplexEventType) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersComplexEventType) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -73,10 +76,11 @@ func (m *BACnetNotificationParametersComplexEventType) GetListOfValues() *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersComplexEventType(listOfValues *BACnetPropertyValues, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersComplexEventType factory function for BACnetNotificationParametersComplexEventType +func NewBACnetNotificationParametersComplexEventType(listOfValues *BACnetPropertyValues, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersComplexEventType{ ListOfValues: listOfValues, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -105,21 +109,21 @@ func (m *BACnetNotificationParametersComplexEventType) GetTypeName() string { return "BACnetNotificationParametersComplexEventType" } -func (m *BACnetNotificationParametersComplexEventType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersComplexEventType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersComplexEventType) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersComplexEventType) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (listOfValues) - lengthInBits += m.ListOfValues.LengthInBits() + lengthInBits += m.ListOfValues.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersComplexEventType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersComplexEventType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersComplexEventTypeParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go index b4ce4ad82e0..ed8942d5f06 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go @@ -34,6 +34,10 @@ type BACnetNotificationParametersExtended struct { ExtendedEventType *BACnetContextTagUnsignedInteger Parameters *BACnetNotificationParametersExtendedParameters InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -48,10 +52,10 @@ type IBACnetNotificationParametersExtended interface { GetParameters() *BACnetNotificationParametersExtendedParameters // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -67,11 +71,10 @@ func (m *BACnetNotificationParametersExtended) GetPeekedTagNumber() uint8 { return uint8(9) } -func (m *BACnetNotificationParametersExtended) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersExtended) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -101,14 +104,15 @@ func (m *BACnetNotificationParametersExtended) GetInnerClosingTag() *BACnetClosi // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersExtended(innerOpeningTag *BACnetOpeningTag, vendorId *BACnetContextTagUnsignedInteger, extendedEventType *BACnetContextTagUnsignedInteger, parameters *BACnetNotificationParametersExtendedParameters, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersExtended factory function for BACnetNotificationParametersExtended +func NewBACnetNotificationParametersExtended(innerOpeningTag *BACnetOpeningTag, vendorId *BACnetContextTagUnsignedInteger, extendedEventType *BACnetContextTagUnsignedInteger, parameters *BACnetNotificationParametersExtendedParameters, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersExtended{ InnerOpeningTag: innerOpeningTag, VendorId: vendorId, ExtendedEventType: extendedEventType, Parameters: parameters, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -137,33 +141,33 @@ func (m *BACnetNotificationParametersExtended) GetTypeName() string { return "BACnetNotificationParametersExtended" } -func (m *BACnetNotificationParametersExtended) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersExtended) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersExtended) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersExtended) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (vendorId) - lengthInBits += m.VendorId.LengthInBits() + lengthInBits += m.VendorId.GetLengthInBits() // Simple field (extendedEventType) - lengthInBits += m.ExtendedEventType.LengthInBits() + lengthInBits += m.ExtendedEventType.GetLengthInBits() // Simple field (parameters) - lengthInBits += m.Parameters.LengthInBits() + lengthInBits += m.Parameters.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersExtended) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersExtended) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersExtendedParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go index 6661942eeed..cad82269f4a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go @@ -45,6 +45,9 @@ type BACnetNotificationParametersExtendedParameters struct { ObjectIdentifier *BACnetApplicationTagObjectIdentifier Reference *BACnetDeviceObjectPropertyReference ClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -81,10 +84,10 @@ type IBACnetNotificationParametersExtendedParameters interface { GetReference() *BACnetDeviceObjectPropertyReference // GetClosingTag returns ClosingTag GetClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -160,8 +163,9 @@ func (m *BACnetNotificationParametersExtendedParameters) GetClosingTag() *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersExtendedParameters(openingTag *BACnetOpeningTag, nullValue *BACnetApplicationTagNull, realValue *BACnetApplicationTagReal, unsignedValue *BACnetApplicationTagUnsignedInteger, booleanValue *BACnetApplicationTagBoolean, integerValue *BACnetApplicationTagSignedInteger, doubleValue *BACnetApplicationTagDouble, octetStringValue *BACnetApplicationTagOctetString, characterStringValue *BACnetApplicationTagCharacterString, bitStringValue *BACnetApplicationTagBitString, enumeratedValue *BACnetApplicationTagEnumerated, dateValue *BACnetApplicationTagDate, timeValue *BACnetApplicationTagTime, objectIdentifier *BACnetApplicationTagObjectIdentifier, reference *BACnetDeviceObjectPropertyReference, closingTag *BACnetClosingTag) *BACnetNotificationParametersExtendedParameters { - return &BACnetNotificationParametersExtendedParameters{OpeningTag: openingTag, NullValue: nullValue, RealValue: realValue, UnsignedValue: unsignedValue, BooleanValue: booleanValue, IntegerValue: integerValue, DoubleValue: doubleValue, OctetStringValue: octetStringValue, CharacterStringValue: characterStringValue, BitStringValue: bitStringValue, EnumeratedValue: enumeratedValue, DateValue: dateValue, TimeValue: timeValue, ObjectIdentifier: objectIdentifier, Reference: reference, ClosingTag: closingTag} +// NewBACnetNotificationParametersExtendedParameters factory function for BACnetNotificationParametersExtendedParameters +func NewBACnetNotificationParametersExtendedParameters(openingTag *BACnetOpeningTag, nullValue *BACnetApplicationTagNull, realValue *BACnetApplicationTagReal, unsignedValue *BACnetApplicationTagUnsignedInteger, booleanValue *BACnetApplicationTagBoolean, integerValue *BACnetApplicationTagSignedInteger, doubleValue *BACnetApplicationTagDouble, octetStringValue *BACnetApplicationTagOctetString, characterStringValue *BACnetApplicationTagCharacterString, bitStringValue *BACnetApplicationTagBitString, enumeratedValue *BACnetApplicationTagEnumerated, dateValue *BACnetApplicationTagDate, timeValue *BACnetApplicationTagTime, objectIdentifier *BACnetApplicationTagObjectIdentifier, reference *BACnetDeviceObjectPropertyReference, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetNotificationParametersExtendedParameters { + return &BACnetNotificationParametersExtendedParameters{OpeningTag: openingTag, NullValue: nullValue, RealValue: realValue, UnsignedValue: unsignedValue, BooleanValue: booleanValue, IntegerValue: integerValue, DoubleValue: doubleValue, OctetStringValue: octetStringValue, CharacterStringValue: characterStringValue, BitStringValue: bitStringValue, EnumeratedValue: enumeratedValue, DateValue: dateValue, TimeValue: timeValue, ObjectIdentifier: objectIdentifier, Reference: reference, ClosingTag: closingTag, TagNumber: tagNumber} } func CastBACnetNotificationParametersExtendedParameters(structType interface{}) *BACnetNotificationParametersExtendedParameters { @@ -181,94 +185,94 @@ func (m *BACnetNotificationParametersExtendedParameters) GetTypeName() string { return "BACnetNotificationParametersExtendedParameters" } -func (m *BACnetNotificationParametersExtendedParameters) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersExtendedParameters) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersExtendedParameters) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetNotificationParametersExtendedParameters) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // Optional Field (nullValue) if m.NullValue != nil { - lengthInBits += (*m.NullValue).LengthInBits() + lengthInBits += (*m.NullValue).GetLengthInBits() } // Optional Field (realValue) if m.RealValue != nil { - lengthInBits += (*m.RealValue).LengthInBits() + lengthInBits += (*m.RealValue).GetLengthInBits() } // Optional Field (unsignedValue) if m.UnsignedValue != nil { - lengthInBits += (*m.UnsignedValue).LengthInBits() + lengthInBits += (*m.UnsignedValue).GetLengthInBits() } // Optional Field (booleanValue) if m.BooleanValue != nil { - lengthInBits += (*m.BooleanValue).LengthInBits() + lengthInBits += (*m.BooleanValue).GetLengthInBits() } // Optional Field (integerValue) if m.IntegerValue != nil { - lengthInBits += (*m.IntegerValue).LengthInBits() + lengthInBits += (*m.IntegerValue).GetLengthInBits() } // Optional Field (doubleValue) if m.DoubleValue != nil { - lengthInBits += (*m.DoubleValue).LengthInBits() + lengthInBits += (*m.DoubleValue).GetLengthInBits() } // Optional Field (octetStringValue) if m.OctetStringValue != nil { - lengthInBits += (*m.OctetStringValue).LengthInBits() + lengthInBits += (*m.OctetStringValue).GetLengthInBits() } // Optional Field (characterStringValue) if m.CharacterStringValue != nil { - lengthInBits += (*m.CharacterStringValue).LengthInBits() + lengthInBits += (*m.CharacterStringValue).GetLengthInBits() } // Optional Field (bitStringValue) if m.BitStringValue != nil { - lengthInBits += (*m.BitStringValue).LengthInBits() + lengthInBits += (*m.BitStringValue).GetLengthInBits() } // Optional Field (enumeratedValue) if m.EnumeratedValue != nil { - lengthInBits += (*m.EnumeratedValue).LengthInBits() + lengthInBits += (*m.EnumeratedValue).GetLengthInBits() } // Optional Field (dateValue) if m.DateValue != nil { - lengthInBits += (*m.DateValue).LengthInBits() + lengthInBits += (*m.DateValue).GetLengthInBits() } // Optional Field (timeValue) if m.TimeValue != nil { - lengthInBits += (*m.TimeValue).LengthInBits() + lengthInBits += (*m.TimeValue).GetLengthInBits() } // Optional Field (objectIdentifier) if m.ObjectIdentifier != nil { - lengthInBits += (*m.ObjectIdentifier).LengthInBits() + lengthInBits += (*m.ObjectIdentifier).GetLengthInBits() } // Optional Field (reference) if m.Reference != nil { - lengthInBits += (*m.Reference).LengthInBits() + lengthInBits += (*m.Reference).GetLengthInBits() } // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersExtendedParameters) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersExtendedParameters) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetNotificationParametersExtendedParameters, error) { @@ -601,7 +605,7 @@ func BACnetNotificationParametersExtendedParametersParse(readBuffer utils.ReadBu } // Create the instance - return NewBACnetNotificationParametersExtendedParameters(openingTag, nullValue, realValue, unsignedValue, booleanValue, integerValue, doubleValue, octetStringValue, characterStringValue, bitStringValue, enumeratedValue, dateValue, timeValue, objectIdentifier, reference, closingTag), nil + return NewBACnetNotificationParametersExtendedParameters(openingTag, nullValue, realValue, unsignedValue, booleanValue, integerValue, doubleValue, octetStringValue, characterStringValue, bitStringValue, enumeratedValue, dateValue, timeValue, objectIdentifier, reference, closingTag, tagNumber), nil } func (m *BACnetNotificationParametersExtendedParameters) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go index 8441148dd3f..a9fb1ff9e92 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go @@ -35,6 +35,10 @@ type BACnetNotificationParametersFloatingLimit struct { SetPointValue *BACnetContextTagReal ErrorLimit *BACnetContextTagReal InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -51,10 +55,10 @@ type IBACnetNotificationParametersFloatingLimit interface { GetErrorLimit() *BACnetContextTagReal // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,11 +74,10 @@ func (m *BACnetNotificationParametersFloatingLimit) GetPeekedTagNumber() uint8 { return uint8(4) } -func (m *BACnetNotificationParametersFloatingLimit) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersFloatingLimit) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -108,7 +111,8 @@ func (m *BACnetNotificationParametersFloatingLimit) GetInnerClosingTag() *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersFloatingLimit(innerOpeningTag *BACnetOpeningTag, referenceValue *BACnetContextTagReal, statusFlags *BACnetStatusFlags, setPointValue *BACnetContextTagReal, errorLimit *BACnetContextTagReal, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersFloatingLimit factory function for BACnetNotificationParametersFloatingLimit +func NewBACnetNotificationParametersFloatingLimit(innerOpeningTag *BACnetOpeningTag, referenceValue *BACnetContextTagReal, statusFlags *BACnetStatusFlags, setPointValue *BACnetContextTagReal, errorLimit *BACnetContextTagReal, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersFloatingLimit{ InnerOpeningTag: innerOpeningTag, ReferenceValue: referenceValue, @@ -116,7 +120,7 @@ func NewBACnetNotificationParametersFloatingLimit(innerOpeningTag *BACnetOpening SetPointValue: setPointValue, ErrorLimit: errorLimit, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -145,36 +149,36 @@ func (m *BACnetNotificationParametersFloatingLimit) GetTypeName() string { return "BACnetNotificationParametersFloatingLimit" } -func (m *BACnetNotificationParametersFloatingLimit) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersFloatingLimit) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersFloatingLimit) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersFloatingLimit) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (referenceValue) - lengthInBits += m.ReferenceValue.LengthInBits() + lengthInBits += m.ReferenceValue.GetLengthInBits() // Simple field (statusFlags) - lengthInBits += m.StatusFlags.LengthInBits() + lengthInBits += m.StatusFlags.GetLengthInBits() // Simple field (setPointValue) - lengthInBits += m.SetPointValue.LengthInBits() + lengthInBits += m.SetPointValue.GetLengthInBits() // Simple field (errorLimit) - lengthInBits += m.ErrorLimit.LengthInBits() + lengthInBits += m.ErrorLimit.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersFloatingLimit) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersFloatingLimit) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersFloatingLimitParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go index a102e037de6..46f0654d93c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go @@ -35,6 +35,10 @@ type BACnetNotificationParametersOutOfRange struct { Deadband *BACnetContextTagReal ExceededLimit *BACnetContextTagReal InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -51,10 +55,10 @@ type IBACnetNotificationParametersOutOfRange interface { GetExceededLimit() *BACnetContextTagReal // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,11 +74,10 @@ func (m *BACnetNotificationParametersOutOfRange) GetPeekedTagNumber() uint8 { return uint8(5) } -func (m *BACnetNotificationParametersOutOfRange) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersOutOfRange) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -108,7 +111,8 @@ func (m *BACnetNotificationParametersOutOfRange) GetInnerClosingTag() *BACnetClo // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersOutOfRange(innerOpeningTag *BACnetOpeningTag, exceedingValue *BACnetContextTagReal, statusFlags *BACnetStatusFlags, deadband *BACnetContextTagReal, exceededLimit *BACnetContextTagReal, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersOutOfRange factory function for BACnetNotificationParametersOutOfRange +func NewBACnetNotificationParametersOutOfRange(innerOpeningTag *BACnetOpeningTag, exceedingValue *BACnetContextTagReal, statusFlags *BACnetStatusFlags, deadband *BACnetContextTagReal, exceededLimit *BACnetContextTagReal, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersOutOfRange{ InnerOpeningTag: innerOpeningTag, ExceedingValue: exceedingValue, @@ -116,7 +120,7 @@ func NewBACnetNotificationParametersOutOfRange(innerOpeningTag *BACnetOpeningTag Deadband: deadband, ExceededLimit: exceededLimit, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -145,36 +149,36 @@ func (m *BACnetNotificationParametersOutOfRange) GetTypeName() string { return "BACnetNotificationParametersOutOfRange" } -func (m *BACnetNotificationParametersOutOfRange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersOutOfRange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersOutOfRange) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersOutOfRange) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (exceedingValue) - lengthInBits += m.ExceedingValue.LengthInBits() + lengthInBits += m.ExceedingValue.GetLengthInBits() // Simple field (statusFlags) - lengthInBits += m.StatusFlags.LengthInBits() + lengthInBits += m.StatusFlags.GetLengthInBits() // Simple field (deadband) - lengthInBits += m.Deadband.LengthInBits() + lengthInBits += m.Deadband.GetLengthInBits() // Simple field (exceededLimit) - lengthInBits += m.ExceededLimit.LengthInBits() + lengthInBits += m.ExceededLimit.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersOutOfRange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersOutOfRange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersOutOfRangeParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go index d4d44902967..bc53f5fc68a 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go @@ -34,6 +34,10 @@ type BACnetNotificationParametersUnsignedRange struct { StatusFlags *BACnetStatusFlags ExceededLimit *BACnetContextTagUnsignedInteger InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -48,10 +52,10 @@ type IBACnetNotificationParametersUnsignedRange interface { GetExceededLimit() *BACnetContextTagUnsignedInteger // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -67,11 +71,10 @@ func (m *BACnetNotificationParametersUnsignedRange) GetPeekedTagNumber() uint8 { return uint8(11) } -func (m *BACnetNotificationParametersUnsignedRange) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetNotificationParametersUnsignedRange) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetNotificationParameters.OpeningTag = openingTag m.BACnetNotificationParameters.PeekedTagHeader = peekedTagHeader m.BACnetNotificationParameters.ClosingTag = closingTag - m.BACnetNotificationParameters.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -101,14 +104,15 @@ func (m *BACnetNotificationParametersUnsignedRange) GetInnerClosingTag() *BACnet // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetNotificationParametersUnsignedRange(innerOpeningTag *BACnetOpeningTag, sequenceNumber *BACnetContextTagUnsignedInteger, statusFlags *BACnetStatusFlags, exceededLimit *BACnetContextTagUnsignedInteger, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetNotificationParameters { +// NewBACnetNotificationParametersUnsignedRange factory function for BACnetNotificationParametersUnsignedRange +func NewBACnetNotificationParametersUnsignedRange(innerOpeningTag *BACnetOpeningTag, sequenceNumber *BACnetContextTagUnsignedInteger, statusFlags *BACnetStatusFlags, exceededLimit *BACnetContextTagUnsignedInteger, innerClosingTag *BACnetClosingTag, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetNotificationParameters { child := &BACnetNotificationParametersUnsignedRange{ InnerOpeningTag: innerOpeningTag, SequenceNumber: sequenceNumber, StatusFlags: statusFlags, ExceededLimit: exceededLimit, InnerClosingTag: innerClosingTag, - BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetNotificationParameters: NewBACnetNotificationParameters(openingTag, peekedTagHeader, closingTag, tagNumber, objectType), } child.Child = child return child.BACnetNotificationParameters @@ -137,33 +141,33 @@ func (m *BACnetNotificationParametersUnsignedRange) GetTypeName() string { return "BACnetNotificationParametersUnsignedRange" } -func (m *BACnetNotificationParametersUnsignedRange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetNotificationParametersUnsignedRange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetNotificationParametersUnsignedRange) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetNotificationParametersUnsignedRange) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Simple field (sequenceNumber) - lengthInBits += m.SequenceNumber.LengthInBits() + lengthInBits += m.SequenceNumber.GetLengthInBits() // Simple field (statusFlags) - lengthInBits += m.StatusFlags.LengthInBits() + lengthInBits += m.StatusFlags.GetLengthInBits() // Simple field (exceededLimit) - lengthInBits += m.ExceededLimit.LengthInBits() + lengthInBits += m.ExceededLimit.GetLengthInBits() // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetNotificationParametersUnsignedRange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetNotificationParametersUnsignedRange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotificationParametersUnsignedRangeParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType, peekedTagNumber uint8) (*BACnetNotificationParameters, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotifyType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotifyType.go index 3c1455fabf3..46a426d2488 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotifyType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotifyType.go @@ -92,12 +92,12 @@ func CastBACnetNotifyType(structType interface{}) BACnetNotifyType { return castFunc(structType) } -func (m BACnetNotifyType) LengthInBits() uint16 { +func (m BACnetNotifyType) GetLengthInBits() uint16 { return 8 } -func (m BACnetNotifyType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetNotifyType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetNotifyTypeParse(readBuffer utils.ReadBuffer) (BACnetNotifyType, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetObjectType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetObjectType.go index 3024629c9c0..fc41311ed20 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetObjectType.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetObjectType.go @@ -440,12 +440,12 @@ func CastBACnetObjectType(structType interface{}) BACnetObjectType { return castFunc(structType) } -func (m BACnetObjectType) LengthInBits() uint16 { +func (m BACnetObjectType) GetLengthInBits() uint16 { return 10 } -func (m BACnetObjectType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetObjectType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetObjectTypeParse(readBuffer utils.ReadBuffer) (BACnetObjectType, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go index 1c238c40795..fe0e9ad87e8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go @@ -28,14 +28,18 @@ import ( // The data-structure of this message type BACnetOpeningTag struct { *BACnetContextTag + + // Arguments. + TagNumberArgument uint8 + ActualLength uint32 } // The corresponding interface type IBACnetOpeningTag interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,11 +55,8 @@ func (m *BACnetOpeningTag) GetDataType() BACnetDataType { return BACnetDataType_OPENING_TAG } -func (m *BACnetOpeningTag) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) { +func (m *BACnetOpeningTag) InitializeParent(parent *BACnetContextTag, header *BACnetTagHeader) { m.BACnetContextTag.Header = header - m.BACnetContextTag.TagNumber = tagNumber - m.BACnetContextTag.ActualLength = actualLength - m.BACnetContextTag.IsNotOpeningOrClosingTag = isNotOpeningOrClosingTag } /////////////////////////////////////////////////////////// @@ -66,9 +67,10 @@ func (m *BACnetOpeningTag) InitializeParent(parent *BACnetContextTag, header *BA // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetOpeningTag(header *BACnetTagHeader, tagNumber uint8, actualLength uint32, isNotOpeningOrClosingTag bool) *BACnetContextTag { +// NewBACnetOpeningTag factory function for BACnetOpeningTag +func NewBACnetOpeningTag(header *BACnetTagHeader, tagNumberArgument uint8, actualLength uint32) *BACnetContextTag { child := &BACnetOpeningTag{ - BACnetContextTag: NewBACnetContextTag(header, tagNumber, actualLength, isNotOpeningOrClosingTag), + BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument), } child.Child = child return child.BACnetContextTag @@ -97,18 +99,18 @@ func (m *BACnetOpeningTag) GetTypeName() string { return "BACnetOpeningTag" } -func (m *BACnetOpeningTag) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetOpeningTag) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetOpeningTag) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetOpeningTag) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetOpeningTag) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetOpeningTag) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetOpeningTagParse(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, actualLength uint32) (*BACnetContextTag, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyIdentifier.go index 612496a9d16..f89dd72f6ee 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyIdentifier.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyIdentifier.go @@ -2822,12 +2822,12 @@ func CastBACnetPropertyIdentifier(structType interface{}) BACnetPropertyIdentifi return castFunc(structType) } -func (m BACnetPropertyIdentifier) LengthInBits() uint16 { +func (m BACnetPropertyIdentifier) GetLengthInBits() uint16 { return 32 } -func (m BACnetPropertyIdentifier) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BACnetPropertyIdentifier) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyIdentifierParse(readBuffer utils.ReadBuffer) (BACnetPropertyIdentifier, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go index ea56e20017e..e510931a310 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go @@ -39,10 +39,10 @@ type IBACnetPropertyReference interface { GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier // GetArrayIndex returns ArrayIndex GetArrayIndex() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *BACnetPropertyReference) GetArrayIndex() *BACnetContextTagUnsignedInteg // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetPropertyReference factory function for BACnetPropertyReference func NewBACnetPropertyReference(propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger) *BACnetPropertyReference { return &BACnetPropertyReference{PropertyIdentifier: propertyIdentifier, ArrayIndex: arrayIndex} } @@ -83,26 +84,26 @@ func (m *BACnetPropertyReference) GetTypeName() string { return "BACnetPropertyReference" } -func (m *BACnetPropertyReference) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyReference) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyReference) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetPropertyReference) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (arrayIndex) if m.ArrayIndex != nil { - lengthInBits += (*m.ArrayIndex).LengthInBits() + lengthInBits += (*m.ArrayIndex).GetLengthInBits() } return lengthInBits } -func (m *BACnetPropertyReference) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyReference) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyReferenceParse(readBuffer utils.ReadBuffer) (*BACnetPropertyReference, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go index 6298ec2d16e..598dfedd2b0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go @@ -31,8 +31,10 @@ type BACnetPropertyStates struct { OpeningTag *BACnetOpeningTag PeekedTagHeader *BACnetTagHeader ClosingTag *BACnetClosingTag - PeekedTagNumber uint8 - Child IBACnetPropertyStatesChild + + // Arguments. + TagNumber uint8 + Child IBACnetPropertyStatesChild } // The corresponding interface @@ -47,10 +49,10 @@ type IBACnetPropertyStates interface { GetClosingTag() *BACnetClosingTag // GetPeekedTagNumber returns PeekedTagNumber GetPeekedTagNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +64,7 @@ type IBACnetPropertyStatesParent interface { type IBACnetPropertyStatesChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) + InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) GetTypeName() string IBACnetPropertyStates } @@ -86,12 +88,12 @@ func (m *BACnetPropertyStates) GetClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetPropertyStates) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + return m.GetPeekedTagHeader().GetActualTagNumber() } -func NewBACnetPropertyStates(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetPropertyStates { - return &BACnetPropertyStates{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, PeekedTagNumber: peekedTagNumber} +// NewBACnetPropertyStates factory function for BACnetPropertyStates +func NewBACnetPropertyStates(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetPropertyStates { + return &BACnetPropertyStates{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber} } func CastBACnetPropertyStates(structType interface{}) *BACnetPropertyStates { @@ -111,30 +113,30 @@ func (m *BACnetPropertyStates) GetTypeName() string { return "BACnetPropertyStates" } -func (m *BACnetPropertyStates) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyStates) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyStates) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetPropertyStates) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetPropertyStates) ParentLengthInBits() uint16 { +func (m *BACnetPropertyStates) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetPropertyStates) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyStates) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyStatesParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetPropertyStates, error) { @@ -164,8 +166,9 @@ func BACnetPropertyStatesParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*B readBuffer.Reset(currentPos) // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetPropertyStates @@ -203,7 +206,7 @@ func BACnetPropertyStatesParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*B } // Finish initializing - _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag, peekedTagNumber) + _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag) return _parent, nil } @@ -228,7 +231,7 @@ func (m *BACnetPropertyStates) SerializeParent(writeBuffer utils.WriteBuffer, ch return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go index 151427d2740..ec210c73367 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go @@ -31,16 +31,19 @@ import ( type BACnetPropertyStatesAction struct { *BACnetPropertyStates Action *BACnetAction + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetPropertyStatesAction interface { // GetAction returns Action GetAction() *BACnetAction - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -56,11 +59,10 @@ func (m *BACnetPropertyStatesAction) GetPeekedTagNumber() uint8 { return uint8(16) } -func (m *BACnetPropertyStatesAction) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetPropertyStatesAction) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetPropertyStates.OpeningTag = openingTag m.BACnetPropertyStates.PeekedTagHeader = peekedTagHeader m.BACnetPropertyStates.ClosingTag = closingTag - m.BACnetPropertyStates.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -74,10 +76,11 @@ func (m *BACnetPropertyStatesAction) GetAction() *BACnetAction { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetPropertyStatesAction(action *BACnetAction, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetPropertyStates { +// NewBACnetPropertyStatesAction factory function for BACnetPropertyStatesAction +func NewBACnetPropertyStatesAction(action *BACnetAction, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetPropertyStates { child := &BACnetPropertyStatesAction{ Action: action, - BACnetPropertyStates: NewBACnetPropertyStates(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetPropertyStates: NewBACnetPropertyStates(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetPropertyStates @@ -106,23 +109,23 @@ func (m *BACnetPropertyStatesAction) GetTypeName() string { return "BACnetPropertyStatesAction" } -func (m *BACnetPropertyStatesAction) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyStatesAction) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyStatesAction) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetPropertyStatesAction) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Optional Field (action) if m.Action != nil { - lengthInBits += (*m.Action).LengthInBits() + lengthInBits += (*m.Action).GetLengthInBits() } return lengthInBits } -func (m *BACnetPropertyStatesAction) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyStatesAction) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyStatesActionParse(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (*BACnetPropertyStates, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go index 4cd9553483e..4ed972b51de 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go @@ -31,16 +31,19 @@ import ( type BACnetPropertyStatesBinaryValue struct { *BACnetPropertyStates BinaryValue *BACnetBinaryPV + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetPropertyStatesBinaryValue interface { // GetBinaryValue returns BinaryValue GetBinaryValue() *BACnetBinaryPV - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -56,11 +59,10 @@ func (m *BACnetPropertyStatesBinaryValue) GetPeekedTagNumber() uint8 { return uint8(1) } -func (m *BACnetPropertyStatesBinaryValue) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetPropertyStatesBinaryValue) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetPropertyStates.OpeningTag = openingTag m.BACnetPropertyStates.PeekedTagHeader = peekedTagHeader m.BACnetPropertyStates.ClosingTag = closingTag - m.BACnetPropertyStates.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -74,10 +76,11 @@ func (m *BACnetPropertyStatesBinaryValue) GetBinaryValue() *BACnetBinaryPV { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetPropertyStatesBinaryValue(binaryValue *BACnetBinaryPV, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetPropertyStates { +// NewBACnetPropertyStatesBinaryValue factory function for BACnetPropertyStatesBinaryValue +func NewBACnetPropertyStatesBinaryValue(binaryValue *BACnetBinaryPV, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetPropertyStates { child := &BACnetPropertyStatesBinaryValue{ BinaryValue: binaryValue, - BACnetPropertyStates: NewBACnetPropertyStates(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetPropertyStates: NewBACnetPropertyStates(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetPropertyStates @@ -106,23 +109,23 @@ func (m *BACnetPropertyStatesBinaryValue) GetTypeName() string { return "BACnetPropertyStatesBinaryValue" } -func (m *BACnetPropertyStatesBinaryValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyStatesBinaryValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyStatesBinaryValue) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetPropertyStatesBinaryValue) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Optional Field (binaryValue) if m.BinaryValue != nil { - lengthInBits += (*m.BinaryValue).LengthInBits() + lengthInBits += (*m.BinaryValue).GetLengthInBits() } return lengthInBits } -func (m *BACnetPropertyStatesBinaryValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyStatesBinaryValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyStatesBinaryValueParse(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (*BACnetPropertyStates, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go index 54c1f8418cd..0914e2ac578 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go @@ -31,16 +31,19 @@ import ( type BACnetPropertyStatesBoolean struct { *BACnetPropertyStates BooleanValue *BACnetContextTagBoolean + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetPropertyStatesBoolean interface { // GetBooleanValue returns BooleanValue GetBooleanValue() *BACnetContextTagBoolean - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -56,11 +59,10 @@ func (m *BACnetPropertyStatesBoolean) GetPeekedTagNumber() uint8 { return uint8(0) } -func (m *BACnetPropertyStatesBoolean) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetPropertyStatesBoolean) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetPropertyStates.OpeningTag = openingTag m.BACnetPropertyStates.PeekedTagHeader = peekedTagHeader m.BACnetPropertyStates.ClosingTag = closingTag - m.BACnetPropertyStates.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -74,10 +76,11 @@ func (m *BACnetPropertyStatesBoolean) GetBooleanValue() *BACnetContextTagBoolean // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetPropertyStatesBoolean(booleanValue *BACnetContextTagBoolean, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetPropertyStates { +// NewBACnetPropertyStatesBoolean factory function for BACnetPropertyStatesBoolean +func NewBACnetPropertyStatesBoolean(booleanValue *BACnetContextTagBoolean, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetPropertyStates { child := &BACnetPropertyStatesBoolean{ BooleanValue: booleanValue, - BACnetPropertyStates: NewBACnetPropertyStates(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetPropertyStates: NewBACnetPropertyStates(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetPropertyStates @@ -106,23 +109,23 @@ func (m *BACnetPropertyStatesBoolean) GetTypeName() string { return "BACnetPropertyStatesBoolean" } -func (m *BACnetPropertyStatesBoolean) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyStatesBoolean) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyStatesBoolean) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetPropertyStatesBoolean) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Optional Field (booleanValue) if m.BooleanValue != nil { - lengthInBits += (*m.BooleanValue).LengthInBits() + lengthInBits += (*m.BooleanValue).GetLengthInBits() } return lengthInBits } -func (m *BACnetPropertyStatesBoolean) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyStatesBoolean) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyStatesBooleanParse(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (*BACnetPropertyStates, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go index 8aa329aba67..582ce2a1072 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go @@ -33,6 +33,9 @@ type BACnetPropertyValue struct { PropertyArrayIndex *BACnetContextTagUnsignedInteger PropertyValue *BACnetConstructedDataElement Priority *BACnetContextTagUnsignedInteger + + // Arguments. + ObjectType BACnetObjectType } // The corresponding interface @@ -45,10 +48,10 @@ type IBACnetPropertyValue interface { GetPropertyValue() *BACnetConstructedDataElement // GetPriority returns Priority GetPriority() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,8 +79,9 @@ func (m *BACnetPropertyValue) GetPriority() *BACnetContextTagUnsignedInteger { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetPropertyValue(propertyIdentifier *BACnetContextTagPropertyIdentifier, propertyArrayIndex *BACnetContextTagUnsignedInteger, propertyValue *BACnetConstructedDataElement, priority *BACnetContextTagUnsignedInteger) *BACnetPropertyValue { - return &BACnetPropertyValue{PropertyIdentifier: propertyIdentifier, PropertyArrayIndex: propertyArrayIndex, PropertyValue: propertyValue, Priority: priority} +// NewBACnetPropertyValue factory function for BACnetPropertyValue +func NewBACnetPropertyValue(propertyIdentifier *BACnetContextTagPropertyIdentifier, propertyArrayIndex *BACnetContextTagUnsignedInteger, propertyValue *BACnetConstructedDataElement, priority *BACnetContextTagUnsignedInteger, objectType BACnetObjectType) *BACnetPropertyValue { + return &BACnetPropertyValue{PropertyIdentifier: propertyIdentifier, PropertyArrayIndex: propertyArrayIndex, PropertyValue: propertyValue, Priority: priority, ObjectType: objectType} } func CastBACnetPropertyValue(structType interface{}) *BACnetPropertyValue { @@ -97,36 +101,36 @@ func (m *BACnetPropertyValue) GetTypeName() string { return "BACnetPropertyValue" } -func (m *BACnetPropertyValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyValue) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetPropertyValue) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (propertyArrayIndex) if m.PropertyArrayIndex != nil { - lengthInBits += (*m.PropertyArrayIndex).LengthInBits() + lengthInBits += (*m.PropertyArrayIndex).GetLengthInBits() } // Optional Field (propertyValue) if m.PropertyValue != nil { - lengthInBits += (*m.PropertyValue).LengthInBits() + lengthInBits += (*m.PropertyValue).GetLengthInBits() } // Optional Field (priority) if m.Priority != nil { - lengthInBits += (*m.Priority).LengthInBits() + lengthInBits += (*m.Priority).GetLengthInBits() } return lengthInBits } -func (m *BACnetPropertyValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyValueParse(readBuffer utils.ReadBuffer, objectType BACnetObjectType) (*BACnetPropertyValue, error) { @@ -215,7 +219,7 @@ func BACnetPropertyValueParse(readBuffer utils.ReadBuffer, objectType BACnetObje } // Create the instance - return NewBACnetPropertyValue(propertyIdentifier, propertyArrayIndex, propertyValue, priority), nil + return NewBACnetPropertyValue(propertyIdentifier, propertyArrayIndex, propertyValue, priority, objectType), nil } func (m *BACnetPropertyValue) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go index 4f4fad1d63a..ac14537b349 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go @@ -31,6 +31,10 @@ type BACnetPropertyValues struct { InnerOpeningTag *BACnetOpeningTag Data []*BACnetPropertyValue InnerClosingTag *BACnetClosingTag + + // Arguments. + TagNumber uint8 + ObjectType BACnetObjectType } // The corresponding interface @@ -41,10 +45,10 @@ type IBACnetPropertyValues interface { GetData() []*BACnetPropertyValue // GetInnerClosingTag returns InnerClosingTag GetInnerClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,8 +72,9 @@ func (m *BACnetPropertyValues) GetInnerClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetPropertyValues(innerOpeningTag *BACnetOpeningTag, data []*BACnetPropertyValue, innerClosingTag *BACnetClosingTag) *BACnetPropertyValues { - return &BACnetPropertyValues{InnerOpeningTag: innerOpeningTag, Data: data, InnerClosingTag: innerClosingTag} +// NewBACnetPropertyValues factory function for BACnetPropertyValues +func NewBACnetPropertyValues(innerOpeningTag *BACnetOpeningTag, data []*BACnetPropertyValue, innerClosingTag *BACnetClosingTag, tagNumber uint8, objectType BACnetObjectType) *BACnetPropertyValues { + return &BACnetPropertyValues{InnerOpeningTag: innerOpeningTag, Data: data, InnerClosingTag: innerClosingTag, TagNumber: tagNumber, ObjectType: objectType} } func CastBACnetPropertyValues(structType interface{}) *BACnetPropertyValues { @@ -89,31 +94,31 @@ func (m *BACnetPropertyValues) GetTypeName() string { return "BACnetPropertyValues" } -func (m *BACnetPropertyValues) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetPropertyValues) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetPropertyValues) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetPropertyValues) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (innerOpeningTag) - lengthInBits += m.InnerOpeningTag.LengthInBits() + lengthInBits += m.InnerOpeningTag.GetLengthInBits() // Array field if len(m.Data) > 0 { for _, element := range m.Data { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (innerClosingTag) - lengthInBits += m.InnerClosingTag.LengthInBits() + lengthInBits += m.InnerClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetPropertyValues) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetPropertyValues) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetPropertyValuesParse(readBuffer utils.ReadBuffer, tagNumber uint8, objectType BACnetObjectType) (*BACnetPropertyValues, error) { @@ -172,7 +177,7 @@ func BACnetPropertyValuesParse(readBuffer utils.ReadBuffer, tagNumber uint8, obj } // Create the instance - return NewBACnetPropertyValues(innerOpeningTag, data, innerClosingTag), nil + return NewBACnetPropertyValues(innerOpeningTag, data, innerClosingTag, tagNumber, objectType), nil } func (m *BACnetPropertyValues) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go index 21a74e701a1..9cd25322294 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go @@ -44,10 +44,10 @@ type IBACnetReadAccessSpecification interface { GetListOfPropertyReferences() []*BACnetPropertyReference // GetClosingTag returns ClosingTag GetClosingTag() *BACnetClosingTag - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *BACnetReadAccessSpecification) GetClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetReadAccessSpecification factory function for BACnetReadAccessSpecification func NewBACnetReadAccessSpecification(objectIdentifier *BACnetContextTagObjectIdentifier, openingTag *BACnetOpeningTag, listOfPropertyReferences []*BACnetPropertyReference, closingTag *BACnetClosingTag) *BACnetReadAccessSpecification { return &BACnetReadAccessSpecification{ObjectIdentifier: objectIdentifier, OpeningTag: openingTag, ListOfPropertyReferences: listOfPropertyReferences, ClosingTag: closingTag} } @@ -96,34 +97,34 @@ func (m *BACnetReadAccessSpecification) GetTypeName() string { return "BACnetReadAccessSpecification" } -func (m *BACnetReadAccessSpecification) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetReadAccessSpecification) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetReadAccessSpecification) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetReadAccessSpecification) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // Array field if len(m.ListOfPropertyReferences) > 0 { for _, element := range m.ListOfPropertyReferences { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetReadAccessSpecification) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetReadAccessSpecification) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetReadAccessSpecificationParse(readBuffer utils.ReadBuffer) (*BACnetReadAccessSpecification, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go index 7123cc18129..3d7242f891b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go @@ -28,11 +28,7 @@ import ( // The data-structure of this message type BACnetSegmentation struct { - RawData *BACnetApplicationTagEnumerated - IsSegmentedBoth bool - IsSegmentedTransmit bool - IsSegmentedReceive bool - IsNoSegmentation bool + RawData *BACnetApplicationTagEnumerated } // The corresponding interface @@ -47,10 +43,10 @@ type IBACnetSegmentation interface { GetIsSegmentedReceive() bool // GetIsNoSegmentation returns IsNoSegmentation GetIsNoSegmentation() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -66,27 +62,24 @@ func (m *BACnetSegmentation) GetRawData() *BACnetApplicationTagEnumerated { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetSegmentation) GetIsSegmentedBoth() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsSegmentedBoth + return bool(bool((m.GetRawData()) != (nil))) && bool(bool((m.GetRawData().GetPayload().GetActualValue()) == (0))) } func (m *BACnetSegmentation) GetIsSegmentedTransmit() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsSegmentedTransmit + return bool(bool((m.GetRawData()) != (nil))) && bool(bool((m.GetRawData().GetPayload().GetActualValue()) == (1))) } func (m *BACnetSegmentation) GetIsSegmentedReceive() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsSegmentedReceive + return bool(bool((m.GetRawData()) != (nil))) && bool(bool((m.GetRawData().GetPayload().GetActualValue()) == (3))) } func (m *BACnetSegmentation) GetIsNoSegmentation() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsNoSegmentation + return bool(bool((m.GetRawData()) != (nil))) && bool(bool((m.GetRawData().GetPayload().GetActualValue()) == (4))) } -func NewBACnetSegmentation(rawData *BACnetApplicationTagEnumerated, isSegmentedBoth bool, isSegmentedTransmit bool, isSegmentedReceive bool, isNoSegmentation bool) *BACnetSegmentation { - return &BACnetSegmentation{RawData: rawData, IsSegmentedBoth: isSegmentedBoth, IsSegmentedTransmit: isSegmentedTransmit, IsSegmentedReceive: isSegmentedReceive, IsNoSegmentation: isNoSegmentation} +// NewBACnetSegmentation factory function for BACnetSegmentation +func NewBACnetSegmentation(rawData *BACnetApplicationTagEnumerated) *BACnetSegmentation { + return &BACnetSegmentation{RawData: rawData} } func CastBACnetSegmentation(structType interface{}) *BACnetSegmentation { @@ -106,15 +99,15 @@ func (m *BACnetSegmentation) GetTypeName() string { return "BACnetSegmentation" } -func (m *BACnetSegmentation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetSegmentation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetSegmentation) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetSegmentation) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (rawData) - lengthInBits += m.RawData.LengthInBits() + lengthInBits += m.RawData.GetLengthInBits() // A virtual field doesn't have any in- or output. @@ -127,8 +120,8 @@ func (m *BACnetSegmentation) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetSegmentation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetSegmentation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetSegmentationParse(readBuffer utils.ReadBuffer) (*BACnetSegmentation, error) { @@ -150,27 +143,31 @@ func BACnetSegmentationParse(readBuffer utils.ReadBuffer) (*BACnetSegmentation, } // Virtual field - _isSegmentedBoth := bool(bool((rawData) != (nil))) && bool(bool((rawData.Payload.ActualValue) == (0))) + _isSegmentedBoth := bool(bool((rawData) != (nil))) && bool(bool((rawData.GetPayload().GetActualValue()) == (0))) isSegmentedBoth := bool(_isSegmentedBoth) + _ = isSegmentedBoth // Virtual field - _isSegmentedTransmit := bool(bool((rawData) != (nil))) && bool(bool((rawData.Payload.ActualValue) == (1))) + _isSegmentedTransmit := bool(bool((rawData) != (nil))) && bool(bool((rawData.GetPayload().GetActualValue()) == (1))) isSegmentedTransmit := bool(_isSegmentedTransmit) + _ = isSegmentedTransmit // Virtual field - _isSegmentedReceive := bool(bool((rawData) != (nil))) && bool(bool((rawData.Payload.ActualValue) == (3))) + _isSegmentedReceive := bool(bool((rawData) != (nil))) && bool(bool((rawData.GetPayload().GetActualValue()) == (3))) isSegmentedReceive := bool(_isSegmentedReceive) + _ = isSegmentedReceive // Virtual field - _isNoSegmentation := bool(bool((rawData) != (nil))) && bool(bool((rawData.Payload.ActualValue) == (4))) + _isNoSegmentation := bool(bool((rawData) != (nil))) && bool(bool((rawData.GetPayload().GetActualValue()) == (4))) isNoSegmentation := bool(_isNoSegmentation) + _ = isNoSegmentation if closeErr := readBuffer.CloseContext("BACnetSegmentation"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetSegmentation(rawData, isSegmentedBoth, isSegmentedTransmit, isSegmentedReceive, isNoSegmentation), nil + return NewBACnetSegmentation(rawData), nil } func (m *BACnetSegmentation) Serialize(writeBuffer utils.WriteBuffer) error { @@ -190,19 +187,19 @@ func (m *BACnetSegmentation) Serialize(writeBuffer utils.WriteBuffer) error { return errors.Wrap(_rawDataErr, "Error serializing 'rawData' field") } // Virtual field - if _isSegmentedBothErr := writeBuffer.WriteVirtual("isSegmentedBoth", m.IsSegmentedBoth); _isSegmentedBothErr != nil { + if _isSegmentedBothErr := writeBuffer.WriteVirtual("isSegmentedBoth", m.GetIsSegmentedBoth()); _isSegmentedBothErr != nil { return errors.Wrap(_isSegmentedBothErr, "Error serializing 'isSegmentedBoth' field") } // Virtual field - if _isSegmentedTransmitErr := writeBuffer.WriteVirtual("isSegmentedTransmit", m.IsSegmentedTransmit); _isSegmentedTransmitErr != nil { + if _isSegmentedTransmitErr := writeBuffer.WriteVirtual("isSegmentedTransmit", m.GetIsSegmentedTransmit()); _isSegmentedTransmitErr != nil { return errors.Wrap(_isSegmentedTransmitErr, "Error serializing 'isSegmentedTransmit' field") } // Virtual field - if _isSegmentedReceiveErr := writeBuffer.WriteVirtual("isSegmentedReceive", m.IsSegmentedReceive); _isSegmentedReceiveErr != nil { + if _isSegmentedReceiveErr := writeBuffer.WriteVirtual("isSegmentedReceive", m.GetIsSegmentedReceive()); _isSegmentedReceiveErr != nil { return errors.Wrap(_isSegmentedReceiveErr, "Error serializing 'isSegmentedReceive' field") } // Virtual field - if _isNoSegmentationErr := writeBuffer.WriteVirtual("isNoSegmentation", m.IsNoSegmentation); _isNoSegmentationErr != nil { + if _isNoSegmentationErr := writeBuffer.WriteVirtual("isNoSegmentation", m.GetIsNoSegmentation()); _isNoSegmentationErr != nil { return errors.Wrap(_isNoSegmentationErr, "Error serializing 'isNoSegmentation' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go index 127f4c71cc4..0bc809c5e56 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go @@ -35,10 +35,10 @@ type BACnetServiceAck struct { type IBACnetServiceAck interface { // ServiceChoice returns ServiceChoice ServiceChoice() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IBACnetServiceAckChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAck factory function for BACnetServiceAck func NewBACnetServiceAck() *BACnetServiceAck { return &BACnetServiceAck{} } @@ -84,15 +85,15 @@ func (m *BACnetServiceAck) GetTypeName() string { return "BACnetServiceAck" } -func (m *BACnetServiceAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAck) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetServiceAck) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetServiceAck) ParentLengthInBits() uint16 { +func (m *BACnetServiceAck) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (serviceChoice) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *BACnetServiceAck) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BACnetServiceAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go index dbe65cdb25c..284af2b0765 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go @@ -39,10 +39,10 @@ type IBACnetServiceAckAtomicReadFile interface { GetEndOfFile() *BACnetApplicationTagBoolean // GetAccessMethod returns AccessMethod GetAccessMethod() *BACnetServiceAckAtomicReadFileStreamOrRecord - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *BACnetServiceAckAtomicReadFile) GetAccessMethod() *BACnetServiceAckAtom // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckAtomicReadFile factory function for BACnetServiceAckAtomicReadFile func NewBACnetServiceAckAtomicReadFile(endOfFile *BACnetApplicationTagBoolean, accessMethod *BACnetServiceAckAtomicReadFileStreamOrRecord) *BACnetServiceAck { child := &BACnetServiceAckAtomicReadFile{ EndOfFile: endOfFile, @@ -108,24 +109,24 @@ func (m *BACnetServiceAckAtomicReadFile) GetTypeName() string { return "BACnetServiceAckAtomicReadFile" } -func (m *BACnetServiceAckAtomicReadFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckAtomicReadFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckAtomicReadFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckAtomicReadFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (endOfFile) - lengthInBits += m.EndOfFile.LengthInBits() + lengthInBits += m.EndOfFile.GetLengthInBits() // Simple field (accessMethod) - lengthInBits += m.AccessMethod.LengthInBits() + lengthInBits += m.AccessMethod.GetLengthInBits() return lengthInBits } -func (m *BACnetServiceAckAtomicReadFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckAtomicReadFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckAtomicReadFileParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go index 666e1ab382f..d35a8f45c7b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go @@ -42,10 +42,10 @@ type IBACnetServiceAckAtomicReadFileRecord interface { GetReturnedRecordCount() *BACnetApplicationTagUnsignedInteger // GetFileRecordData returns FileRecordData GetFileRecordData() []*BACnetApplicationTagOctetString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,11 +61,10 @@ func (m *BACnetServiceAckAtomicReadFileRecord) GetPeekedTagNumber() uint8 { return 0x1 } -func (m *BACnetServiceAckAtomicReadFileRecord) InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetServiceAckAtomicReadFileRecord) InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetServiceAckAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader m.BACnetServiceAckAtomicReadFileStreamOrRecord.OpeningTag = openingTag m.BACnetServiceAckAtomicReadFileStreamOrRecord.ClosingTag = closingTag - m.BACnetServiceAckAtomicReadFileStreamOrRecord.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -87,12 +86,13 @@ func (m *BACnetServiceAckAtomicReadFileRecord) GetFileRecordData() []*BACnetAppl // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetServiceAckAtomicReadFileRecord(fileStartRecord *BACnetApplicationTagSignedInteger, returnedRecordCount *BACnetApplicationTagUnsignedInteger, fileRecordData []*BACnetApplicationTagOctetString, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetServiceAckAtomicReadFileStreamOrRecord { +// NewBACnetServiceAckAtomicReadFileRecord factory function for BACnetServiceAckAtomicReadFileRecord +func NewBACnetServiceAckAtomicReadFileRecord(fileStartRecord *BACnetApplicationTagSignedInteger, returnedRecordCount *BACnetApplicationTagUnsignedInteger, fileRecordData []*BACnetApplicationTagOctetString, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) *BACnetServiceAckAtomicReadFileStreamOrRecord { child := &BACnetServiceAckAtomicReadFileRecord{ FileStartRecord: fileStartRecord, ReturnedRecordCount: returnedRecordCount, FileRecordData: fileRecordData, - BACnetServiceAckAtomicReadFileStreamOrRecord: NewBACnetServiceAckAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag, peekedTagNumber), + BACnetServiceAckAtomicReadFileStreamOrRecord: NewBACnetServiceAckAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag), } child.Child = child return child.BACnetServiceAckAtomicReadFileStreamOrRecord @@ -121,32 +121,32 @@ func (m *BACnetServiceAckAtomicReadFileRecord) GetTypeName() string { return "BACnetServiceAckAtomicReadFileRecord" } -func (m *BACnetServiceAckAtomicReadFileRecord) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckAtomicReadFileRecord) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckAtomicReadFileRecord) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckAtomicReadFileRecord) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fileStartRecord) - lengthInBits += m.FileStartRecord.LengthInBits() + lengthInBits += m.FileStartRecord.GetLengthInBits() // Simple field (returnedRecordCount) - lengthInBits += m.ReturnedRecordCount.LengthInBits() + lengthInBits += m.ReturnedRecordCount.GetLengthInBits() // Array field if len(m.FileRecordData) > 0 { for i, element := range m.FileRecordData { last := i == len(m.FileRecordData)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *BACnetServiceAckAtomicReadFileRecord) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckAtomicReadFileRecord) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckAtomicReadFileRecordParse(readBuffer utils.ReadBuffer) (*BACnetServiceAckAtomicReadFileStreamOrRecord, error) { @@ -185,9 +185,9 @@ func BACnetServiceAckAtomicReadFileRecordParse(readBuffer utils.ReadBuffer) (*BA return nil, pullErr } // Count array - fileRecordData := make([]*BACnetApplicationTagOctetString, returnedRecordCount.Payload.ActualValue) + fileRecordData := make([]*BACnetApplicationTagOctetString, returnedRecordCount.GetPayload().GetActualValue()) { - for curItem := uint16(0); curItem < uint16(returnedRecordCount.Payload.ActualValue); curItem++ { + for curItem := uint16(0); curItem < uint16(returnedRecordCount.GetPayload().GetActualValue()); curItem++ { _item, _err := BACnetApplicationTagParse(readBuffer) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'fileRecordData' field") diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go index a6bb7ff2452..e558eefd400 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go @@ -39,10 +39,10 @@ type IBACnetServiceAckAtomicReadFileStream interface { GetFileStartPosition() *BACnetApplicationTagSignedInteger // GetFileData returns FileData GetFileData() *BACnetApplicationTagOctetString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -58,11 +58,10 @@ func (m *BACnetServiceAckAtomicReadFileStream) GetPeekedTagNumber() uint8 { return 0x0 } -func (m *BACnetServiceAckAtomicReadFileStream) InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetServiceAckAtomicReadFileStream) InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) { m.BACnetServiceAckAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader m.BACnetServiceAckAtomicReadFileStreamOrRecord.OpeningTag = openingTag m.BACnetServiceAckAtomicReadFileStreamOrRecord.ClosingTag = closingTag - m.BACnetServiceAckAtomicReadFileStreamOrRecord.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -80,11 +79,12 @@ func (m *BACnetServiceAckAtomicReadFileStream) GetFileData() *BACnetApplicationT // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetServiceAckAtomicReadFileStream(fileStartPosition *BACnetApplicationTagSignedInteger, fileData *BACnetApplicationTagOctetString, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetServiceAckAtomicReadFileStreamOrRecord { +// NewBACnetServiceAckAtomicReadFileStream factory function for BACnetServiceAckAtomicReadFileStream +func NewBACnetServiceAckAtomicReadFileStream(fileStartPosition *BACnetApplicationTagSignedInteger, fileData *BACnetApplicationTagOctetString, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) *BACnetServiceAckAtomicReadFileStreamOrRecord { child := &BACnetServiceAckAtomicReadFileStream{ FileStartPosition: fileStartPosition, FileData: fileData, - BACnetServiceAckAtomicReadFileStreamOrRecord: NewBACnetServiceAckAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag, peekedTagNumber), + BACnetServiceAckAtomicReadFileStreamOrRecord: NewBACnetServiceAckAtomicReadFileStreamOrRecord(peekedTagHeader, openingTag, closingTag), } child.Child = child return child.BACnetServiceAckAtomicReadFileStreamOrRecord @@ -113,24 +113,24 @@ func (m *BACnetServiceAckAtomicReadFileStream) GetTypeName() string { return "BACnetServiceAckAtomicReadFileStream" } -func (m *BACnetServiceAckAtomicReadFileStream) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckAtomicReadFileStream) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckAtomicReadFileStream) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckAtomicReadFileStream) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fileStartPosition) - lengthInBits += m.FileStartPosition.LengthInBits() + lengthInBits += m.FileStartPosition.GetLengthInBits() // Simple field (fileData) - lengthInBits += m.FileData.LengthInBits() + lengthInBits += m.FileData.GetLengthInBits() return lengthInBits } -func (m *BACnetServiceAckAtomicReadFileStream) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckAtomicReadFileStream) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckAtomicReadFileStreamParse(readBuffer utils.ReadBuffer) (*BACnetServiceAckAtomicReadFileStreamOrRecord, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go index 9cce3ad72d8..8544a053a09 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go @@ -31,7 +31,6 @@ type BACnetServiceAckAtomicReadFileStreamOrRecord struct { PeekedTagHeader *BACnetTagHeader OpeningTag *BACnetOpeningTag ClosingTag *BACnetClosingTag - PeekedTagNumber uint8 Child IBACnetServiceAckAtomicReadFileStreamOrRecordChild } @@ -47,10 +46,10 @@ type IBACnetServiceAckAtomicReadFileStreamOrRecord interface { GetClosingTag() *BACnetClosingTag // GetPeekedTagNumber returns PeekedTagNumber GetPeekedTagNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +61,7 @@ type IBACnetServiceAckAtomicReadFileStreamOrRecordParent interface { type IBACnetServiceAckAtomicReadFileStreamOrRecordChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) + InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) GetTypeName() string IBACnetServiceAckAtomicReadFileStreamOrRecord } @@ -86,12 +85,12 @@ func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetClosingTag() *BACnetCl // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + return m.GetPeekedTagHeader().GetActualTagNumber() } -func NewBACnetServiceAckAtomicReadFileStreamOrRecord(peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetServiceAckAtomicReadFileStreamOrRecord { - return &BACnetServiceAckAtomicReadFileStreamOrRecord{PeekedTagHeader: peekedTagHeader, OpeningTag: openingTag, ClosingTag: closingTag, PeekedTagNumber: peekedTagNumber} +// NewBACnetServiceAckAtomicReadFileStreamOrRecord factory function for BACnetServiceAckAtomicReadFileStreamOrRecord +func NewBACnetServiceAckAtomicReadFileStreamOrRecord(peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) *BACnetServiceAckAtomicReadFileStreamOrRecord { + return &BACnetServiceAckAtomicReadFileStreamOrRecord{PeekedTagHeader: peekedTagHeader, OpeningTag: openingTag, ClosingTag: closingTag} } func CastBACnetServiceAckAtomicReadFileStreamOrRecord(structType interface{}) *BACnetServiceAckAtomicReadFileStreamOrRecord { @@ -111,30 +110,30 @@ func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetTypeName() string { return "BACnetServiceAckAtomicReadFileStreamOrRecord" } -func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) ParentLengthInBits() uint16 { +func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuffer) (*BACnetServiceAckAtomicReadFileStreamOrRecord, error) { @@ -154,7 +153,7 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuff if pullErr := readBuffer.PullContext("openingTag"); pullErr != nil { return nil, pullErr } - _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.ActualTagNumber), BACnetDataType_OPENING_TAG) + _openingTag, _openingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_OPENING_TAG) if _openingTagErr != nil { return nil, errors.Wrap(_openingTagErr, "Error parsing 'openingTag' field") } @@ -164,8 +163,9 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuff } // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetServiceAckAtomicReadFileStreamOrRecord @@ -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.ActualTagNumber), BACnetDataType_CLOSING_TAG) + _closingTag, _closingTagErr := BACnetContextTagParse(readBuffer, uint8(peekedTagHeader.GetActualTagNumber()), BACnetDataType_CLOSING_TAG) if _closingTagErr != nil { return nil, errors.Wrap(_closingTagErr, "Error parsing 'closingTag' field") } @@ -201,7 +201,7 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParse(readBuffer utils.ReadBuff } // Finish initializing - _parent.Child.InitializeParent(_parent, peekedTagHeader, openingTag, closingTag, peekedTagNumber) + _parent.Child.InitializeParent(_parent, peekedTagHeader, openingTag, closingTag) return _parent, nil } @@ -226,7 +226,7 @@ func (m *BACnetServiceAckAtomicReadFileStreamOrRecord) SerializeParent(writeBuff return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go index 7871805ae95..9f3ba7c47d7 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go @@ -36,10 +36,10 @@ type BACnetServiceAckAtomicWriteFile struct { type IBACnetServiceAckAtomicWriteFile interface { // GetFileStartPosition returns FileStartPosition GetFileStartPosition() *BACnetContextTagSignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *BACnetServiceAckAtomicWriteFile) GetFileStartPosition() *BACnetContextT // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckAtomicWriteFile factory function for BACnetServiceAckAtomicWriteFile func NewBACnetServiceAckAtomicWriteFile(fileStartPosition *BACnetContextTagSignedInteger) *BACnetServiceAck { child := &BACnetServiceAckAtomicWriteFile{ FileStartPosition: fileStartPosition, @@ -100,21 +101,21 @@ func (m *BACnetServiceAckAtomicWriteFile) GetTypeName() string { return "BACnetServiceAckAtomicWriteFile" } -func (m *BACnetServiceAckAtomicWriteFile) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckAtomicWriteFile) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckAtomicWriteFile) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckAtomicWriteFile) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fileStartPosition) - lengthInBits += m.FileStartPosition.LengthInBits() + lengthInBits += m.FileStartPosition.GetLengthInBits() return lengthInBits } -func (m *BACnetServiceAckAtomicWriteFile) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckAtomicWriteFile) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckAtomicWriteFileParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go index 67249d6333b..8bbf7c56c83 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go @@ -32,10 +32,10 @@ type BACnetServiceAckConfirmedPrivateTransfer struct { // The corresponding interface type IBACnetServiceAckConfirmedPrivateTransfer interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckConfirmedPrivateTransfer) InitializeParent(parent *BACn // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckConfirmedPrivateTransfer factory function for BACnetServiceAckConfirmedPrivateTransfer func NewBACnetServiceAckConfirmedPrivateTransfer() *BACnetServiceAck { child := &BACnetServiceAckConfirmedPrivateTransfer{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckConfirmedPrivateTransfer) GetTypeName() string { return "BACnetServiceAckConfirmedPrivateTransfer" } -func (m *BACnetServiceAckConfirmedPrivateTransfer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckConfirmedPrivateTransfer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckConfirmedPrivateTransfer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckConfirmedPrivateTransfer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckConfirmedPrivateTransfer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckConfirmedPrivateTransfer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckConfirmedPrivateTransferParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go index 2bc0d698a1e..1dd5e3f4cf9 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go @@ -32,10 +32,10 @@ type BACnetServiceAckCreateObject struct { // The corresponding interface type IBACnetServiceAckCreateObject interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckCreateObject) InitializeParent(parent *BACnetServiceAck // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckCreateObject factory function for BACnetServiceAckCreateObject func NewBACnetServiceAckCreateObject() *BACnetServiceAck { child := &BACnetServiceAckCreateObject{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckCreateObject) GetTypeName() string { return "BACnetServiceAckCreateObject" } -func (m *BACnetServiceAckCreateObject) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckCreateObject) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckCreateObject) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckCreateObject) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckCreateObject) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckCreateObject) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckCreateObjectParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go index 274cfc13143..894dbe82879 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go @@ -32,10 +32,10 @@ type BACnetServiceAckGetAlarmSummary struct { // The corresponding interface type IBACnetServiceAckGetAlarmSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckGetAlarmSummary) InitializeParent(parent *BACnetService // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckGetAlarmSummary factory function for BACnetServiceAckGetAlarmSummary func NewBACnetServiceAckGetAlarmSummary() *BACnetServiceAck { child := &BACnetServiceAckGetAlarmSummary{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckGetAlarmSummary) GetTypeName() string { return "BACnetServiceAckGetAlarmSummary" } -func (m *BACnetServiceAckGetAlarmSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckGetAlarmSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckGetAlarmSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckGetAlarmSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckGetAlarmSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckGetAlarmSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckGetAlarmSummaryParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go index c4d437e4a49..8089ec4f3ee 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go @@ -32,10 +32,10 @@ type BACnetServiceAckGetEnrollmentSummary struct { // The corresponding interface type IBACnetServiceAckGetEnrollmentSummary interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckGetEnrollmentSummary) InitializeParent(parent *BACnetSe // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckGetEnrollmentSummary factory function for BACnetServiceAckGetEnrollmentSummary func NewBACnetServiceAckGetEnrollmentSummary() *BACnetServiceAck { child := &BACnetServiceAckGetEnrollmentSummary{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckGetEnrollmentSummary) GetTypeName() string { return "BACnetServiceAckGetEnrollmentSummary" } -func (m *BACnetServiceAckGetEnrollmentSummary) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckGetEnrollmentSummary) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckGetEnrollmentSummary) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckGetEnrollmentSummary) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckGetEnrollmentSummary) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckGetEnrollmentSummary) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckGetEnrollmentSummaryParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go index 88711e25d98..7c3486cff1c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go @@ -32,10 +32,10 @@ type BACnetServiceAckGetEventInformation struct { // The corresponding interface type IBACnetServiceAckGetEventInformation interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckGetEventInformation) InitializeParent(parent *BACnetSer // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckGetEventInformation factory function for BACnetServiceAckGetEventInformation func NewBACnetServiceAckGetEventInformation() *BACnetServiceAck { child := &BACnetServiceAckGetEventInformation{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckGetEventInformation) GetTypeName() string { return "BACnetServiceAckGetEventInformation" } -func (m *BACnetServiceAckGetEventInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckGetEventInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckGetEventInformation) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckGetEventInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckGetEventInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckGetEventInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckGetEventInformationParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go index 7e67c505c39..3258317482c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go @@ -46,10 +46,10 @@ type IBACnetServiceAckReadProperty interface { GetArrayIndex() *BACnetContextTagUnsignedInteger // GetValues returns Values GetValues() *BACnetConstructedData - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *BACnetServiceAckReadProperty) GetValues() *BACnetConstructedData { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckReadProperty factory function for BACnetServiceAckReadProperty func NewBACnetServiceAckReadProperty(objectIdentifier *BACnetContextTagObjectIdentifier, propertyIdentifier *BACnetContextTagPropertyIdentifier, arrayIndex *BACnetContextTagUnsignedInteger, values *BACnetConstructedData) *BACnetServiceAck { child := &BACnetServiceAckReadProperty{ ObjectIdentifier: objectIdentifier, @@ -125,34 +126,34 @@ func (m *BACnetServiceAckReadProperty) GetTypeName() string { return "BACnetServiceAckReadProperty" } -func (m *BACnetServiceAckReadProperty) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckReadProperty) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckReadProperty) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckReadProperty) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (propertyIdentifier) - lengthInBits += m.PropertyIdentifier.LengthInBits() + lengthInBits += m.PropertyIdentifier.GetLengthInBits() // Optional Field (arrayIndex) if m.ArrayIndex != nil { - lengthInBits += (*m.ArrayIndex).LengthInBits() + lengthInBits += (*m.ArrayIndex).GetLengthInBits() } // Optional Field (values) if m.Values != nil { - lengthInBits += (*m.Values).LengthInBits() + lengthInBits += (*m.Values).GetLengthInBits() } return lengthInBits } -func (m *BACnetServiceAckReadProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckReadProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckReadPropertyParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { @@ -214,7 +215,7 @@ func BACnetServiceAckReadPropertyParse(readBuffer utils.ReadBuffer) (*BACnetServ if pullErr := readBuffer.PullContext("values"); pullErr != nil { return nil, pullErr } - _val, _err := BACnetConstructedDataParse(readBuffer, uint8(3), objectIdentifier.ObjectType, propertyIdentifier) + _val, _err := BACnetConstructedDataParse(readBuffer, uint8(3), objectIdentifier.GetObjectType(), propertyIdentifier) switch { case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF): readBuffer.Reset(currentPos) diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go index 0022bda852c..fc41dda02f3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go @@ -32,10 +32,10 @@ type BACnetServiceAckReadPropertyMultiple struct { // The corresponding interface type IBACnetServiceAckReadPropertyMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckReadPropertyMultiple) InitializeParent(parent *BACnetSe // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckReadPropertyMultiple factory function for BACnetServiceAckReadPropertyMultiple func NewBACnetServiceAckReadPropertyMultiple() *BACnetServiceAck { child := &BACnetServiceAckReadPropertyMultiple{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckReadPropertyMultiple) GetTypeName() string { return "BACnetServiceAckReadPropertyMultiple" } -func (m *BACnetServiceAckReadPropertyMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckReadPropertyMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckReadPropertyMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckReadPropertyMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckReadPropertyMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckReadPropertyMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckReadPropertyMultipleParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go index 37f8408e697..6f33f8534ca 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go @@ -32,10 +32,10 @@ type BACnetServiceAckReadRange struct { // The corresponding interface type IBACnetServiceAckReadRange interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckReadRange) InitializeParent(parent *BACnetServiceAck) { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckReadRange factory function for BACnetServiceAckReadRange func NewBACnetServiceAckReadRange() *BACnetServiceAck { child := &BACnetServiceAckReadRange{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckReadRange) GetTypeName() string { return "BACnetServiceAckReadRange" } -func (m *BACnetServiceAckReadRange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckReadRange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckReadRange) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckReadRange) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckReadRange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckReadRange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckReadRangeParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go index 9f37977103a..ad8c3aeee0b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go @@ -32,10 +32,10 @@ type BACnetServiceAckRemovedAuthenticate struct { // The corresponding interface type IBACnetServiceAckRemovedAuthenticate interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckRemovedAuthenticate) InitializeParent(parent *BACnetSer // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckRemovedAuthenticate factory function for BACnetServiceAckRemovedAuthenticate func NewBACnetServiceAckRemovedAuthenticate() *BACnetServiceAck { child := &BACnetServiceAckRemovedAuthenticate{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckRemovedAuthenticate) GetTypeName() string { return "BACnetServiceAckRemovedAuthenticate" } -func (m *BACnetServiceAckRemovedAuthenticate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckRemovedAuthenticate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckRemovedAuthenticate) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckRemovedAuthenticate) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckRemovedAuthenticate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckRemovedAuthenticate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckRemovedAuthenticateParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go index 421715cf695..a4f0e5f7968 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go @@ -32,10 +32,10 @@ type BACnetServiceAckRemovedReadPropertyConditional struct { // The corresponding interface type IBACnetServiceAckRemovedReadPropertyConditional interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckRemovedReadPropertyConditional) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckRemovedReadPropertyConditional factory function for BACnetServiceAckRemovedReadPropertyConditional func NewBACnetServiceAckRemovedReadPropertyConditional() *BACnetServiceAck { child := &BACnetServiceAckRemovedReadPropertyConditional{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckRemovedReadPropertyConditional) GetTypeName() string { return "BACnetServiceAckRemovedReadPropertyConditional" } -func (m *BACnetServiceAckRemovedReadPropertyConditional) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckRemovedReadPropertyConditional) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckRemovedReadPropertyConditional) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckRemovedReadPropertyConditional) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckRemovedReadPropertyConditional) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckRemovedReadPropertyConditional) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckRemovedReadPropertyConditionalParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go index 25be99b7c06..a7e14839b46 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go @@ -32,10 +32,10 @@ type BACnetServiceAckVTData struct { // The corresponding interface type IBACnetServiceAckVTData interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckVTData) InitializeParent(parent *BACnetServiceAck) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckVTData factory function for BACnetServiceAckVTData func NewBACnetServiceAckVTData() *BACnetServiceAck { child := &BACnetServiceAckVTData{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckVTData) GetTypeName() string { return "BACnetServiceAckVTData" } -func (m *BACnetServiceAckVTData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckVTData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckVTData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckVTData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckVTData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckVTData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckVTDataParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go index 48448451189..9e20c83fb37 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go @@ -32,10 +32,10 @@ type BACnetServiceAckVTOpen struct { // The corresponding interface type IBACnetServiceAckVTOpen interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *BACnetServiceAckVTOpen) InitializeParent(parent *BACnetServiceAck) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetServiceAckVTOpen factory function for BACnetServiceAckVTOpen func NewBACnetServiceAckVTOpen() *BACnetServiceAck { child := &BACnetServiceAckVTOpen{ BACnetServiceAck: NewBACnetServiceAck(), @@ -92,18 +93,18 @@ func (m *BACnetServiceAckVTOpen) GetTypeName() string { return "BACnetServiceAckVTOpen" } -func (m *BACnetServiceAckVTOpen) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetServiceAckVTOpen) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetServiceAckVTOpen) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetServiceAckVTOpen) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetServiceAckVTOpen) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetServiceAckVTOpen) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetServiceAckVTOpenParse(readBuffer utils.ReadBuffer) (*BACnetServiceAck, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go index f1eda008c58..506de39c827 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go @@ -28,11 +28,10 @@ import ( // The data-structure of this message type BACnetStatusFlags struct { - RawBits *BACnetContextTagBitString - InAlarm bool - Fault bool - Overriden bool - OutOfService bool + RawBits *BACnetContextTagBitString + + // Arguments. + TagNumber uint8 } // The corresponding interface @@ -47,10 +46,10 @@ type IBACnetStatusFlags interface { GetOverriden() bool // GetOutOfService returns OutOfService GetOutOfService() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -66,27 +65,24 @@ func (m *BACnetStatusFlags) GetRawBits() *BACnetContextTagBitString { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetStatusFlags) GetInAlarm() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.InAlarm + return m.GetRawBits().GetPayload().GetData()[0] } func (m *BACnetStatusFlags) GetFault() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.Fault + return m.GetRawBits().GetPayload().GetData()[1] } func (m *BACnetStatusFlags) GetOverriden() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.Overriden + return m.GetRawBits().GetPayload().GetData()[2] } func (m *BACnetStatusFlags) GetOutOfService() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.OutOfService + return m.GetRawBits().GetPayload().GetData()[3] } -func NewBACnetStatusFlags(rawBits *BACnetContextTagBitString, inAlarm bool, fault bool, overriden bool, outOfService bool) *BACnetStatusFlags { - return &BACnetStatusFlags{RawBits: rawBits, InAlarm: inAlarm, Fault: fault, Overriden: overriden, OutOfService: outOfService} +// NewBACnetStatusFlags factory function for BACnetStatusFlags +func NewBACnetStatusFlags(rawBits *BACnetContextTagBitString, tagNumber uint8) *BACnetStatusFlags { + return &BACnetStatusFlags{RawBits: rawBits, TagNumber: tagNumber} } func CastBACnetStatusFlags(structType interface{}) *BACnetStatusFlags { @@ -106,15 +102,15 @@ func (m *BACnetStatusFlags) GetTypeName() string { return "BACnetStatusFlags" } -func (m *BACnetStatusFlags) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetStatusFlags) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetStatusFlags) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetStatusFlags) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (rawBits) - lengthInBits += m.RawBits.LengthInBits() + lengthInBits += m.RawBits.GetLengthInBits() // A virtual field doesn't have any in- or output. @@ -127,8 +123,8 @@ func (m *BACnetStatusFlags) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetStatusFlags) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetStatusFlags) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetStatusFlagsParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetStatusFlags, error) { @@ -150,27 +146,31 @@ func BACnetStatusFlagsParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACn } // Virtual field - _inAlarm := rawBits.Payload.Data[0] + _inAlarm := rawBits.GetPayload().GetData()[0] inAlarm := bool(_inAlarm) + _ = inAlarm // Virtual field - _fault := rawBits.Payload.Data[1] + _fault := rawBits.GetPayload().GetData()[1] fault := bool(_fault) + _ = fault // Virtual field - _overriden := rawBits.Payload.Data[2] + _overriden := rawBits.GetPayload().GetData()[2] overriden := bool(_overriden) + _ = overriden // Virtual field - _outOfService := rawBits.Payload.Data[3] + _outOfService := rawBits.GetPayload().GetData()[3] outOfService := bool(_outOfService) + _ = outOfService if closeErr := readBuffer.CloseContext("BACnetStatusFlags"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetStatusFlags(rawBits, inAlarm, fault, overriden, outOfService), nil + return NewBACnetStatusFlags(rawBits, tagNumber), nil } func (m *BACnetStatusFlags) Serialize(writeBuffer utils.WriteBuffer) error { @@ -190,19 +190,19 @@ func (m *BACnetStatusFlags) Serialize(writeBuffer utils.WriteBuffer) error { return errors.Wrap(_rawBitsErr, "Error serializing 'rawBits' field") } // Virtual field - if _inAlarmErr := writeBuffer.WriteVirtual("inAlarm", m.InAlarm); _inAlarmErr != nil { + if _inAlarmErr := writeBuffer.WriteVirtual("inAlarm", m.GetInAlarm()); _inAlarmErr != nil { return errors.Wrap(_inAlarmErr, "Error serializing 'inAlarm' field") } // Virtual field - if _faultErr := writeBuffer.WriteVirtual("fault", m.Fault); _faultErr != nil { + if _faultErr := writeBuffer.WriteVirtual("fault", m.GetFault()); _faultErr != nil { return errors.Wrap(_faultErr, "Error serializing 'fault' field") } // Virtual field - if _overridenErr := writeBuffer.WriteVirtual("overriden", m.Overriden); _overridenErr != nil { + if _overridenErr := writeBuffer.WriteVirtual("overriden", m.GetOverriden()); _overridenErr != nil { return errors.Wrap(_overridenErr, "Error serializing 'overriden' field") } // Virtual field - if _outOfServiceErr := writeBuffer.WriteVirtual("outOfService", m.OutOfService); _outOfServiceErr != nil { + if _outOfServiceErr := writeBuffer.WriteVirtual("outOfService", m.GetOutOfService()); _outOfServiceErr != nil { return errors.Wrap(_outOfServiceErr, "Error serializing 'outOfService' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go index 2276e2960af..ee5879a7dd6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go @@ -28,18 +28,13 @@ import ( // The data-structure of this message type BACnetTagHeader struct { - TagNumber uint8 - TagClass TagClass - LengthValueType uint8 - ExtTagNumber *uint8 - ExtLength *uint8 - ExtExtLength *uint16 - ExtExtExtLength *uint32 - ActualTagNumber uint8 - IsBoolean bool - IsConstructed bool - IsPrimitiveAndNotBoolean bool - ActualLength uint32 + TagNumber uint8 + TagClass TagClass + LengthValueType uint8 + ExtTagNumber *uint8 + ExtLength *uint8 + ExtExtLength *uint16 + ExtExtExtLength *uint32 } // The corresponding interface @@ -68,10 +63,10 @@ type IBACnetTagHeader interface { GetIsPrimitiveAndNotBoolean() bool // GetActualLength returns ActualLength GetActualLength() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -111,32 +106,72 @@ func (m *BACnetTagHeader) GetExtExtExtLength() *uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagHeader) GetActualTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualTagNumber + extTagNumber := m.ExtTagNumber + _ = extTagNumber + extLength := m.ExtLength + _ = extLength + extExtLength := m.ExtExtLength + _ = extExtLength + extExtExtLength := m.ExtExtExtLength + _ = extExtExtLength + return utils.InlineIf(bool((m.GetTagNumber()) < (15)), func() interface{} { return uint8(m.GetTagNumber()) }, func() interface{} { return uint8((*m.GetExtTagNumber())) }).(uint8) } func (m *BACnetTagHeader) GetIsBoolean() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsBoolean + extTagNumber := m.ExtTagNumber + _ = extTagNumber + extLength := m.ExtLength + _ = extLength + extExtLength := m.ExtExtLength + _ = extExtLength + extExtExtLength := m.ExtExtExtLength + _ = extExtExtLength + return bool(bool((m.GetTagNumber()) == (1))) && bool(bool((m.GetTagClass()) == (TagClass_APPLICATION_TAGS))) } func (m *BACnetTagHeader) GetIsConstructed() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsConstructed + extTagNumber := m.ExtTagNumber + _ = extTagNumber + extLength := m.ExtLength + _ = extLength + extExtLength := m.ExtExtLength + _ = extExtLength + extExtExtLength := m.ExtExtExtLength + _ = extExtExtLength + return bool(bool((m.GetTagClass()) == (TagClass_CONTEXT_SPECIFIC_TAGS))) && bool(bool((m.GetLengthValueType()) == (6))) } func (m *BACnetTagHeader) GetIsPrimitiveAndNotBoolean() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsPrimitiveAndNotBoolean + extTagNumber := m.ExtTagNumber + _ = extTagNumber + extLength := m.ExtLength + _ = extLength + extExtLength := m.ExtExtLength + _ = extExtLength + extExtExtLength := m.ExtExtExtLength + _ = extExtExtLength + return bool(!(m.GetIsConstructed())) && bool(!(m.GetIsBoolean())) } func (m *BACnetTagHeader) GetActualLength() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualLength + extTagNumber := m.ExtTagNumber + _ = extTagNumber + extLength := m.ExtLength + _ = extLength + extExtLength := m.ExtExtLength + _ = extExtLength + extExtExtLength := m.ExtExtExtLength + _ = extExtExtLength + return utils.InlineIf(bool(bool((m.GetLengthValueType()) == (5))) && bool(bool((*m.GetExtLength()) == (255))), func() interface{} { return uint32((*m.GetExtExtExtLength())) }, func() interface{} { + return uint32(uint32(utils.InlineIf(bool(bool((m.GetLengthValueType()) == (5))) && bool(bool((*m.GetExtLength()) == (254))), func() interface{} { return uint32((*m.GetExtExtLength())) }, func() interface{} { + return uint32(uint32(utils.InlineIf(bool((m.GetLengthValueType()) == (5)), func() interface{} { return uint32((*m.GetExtLength())) }, func() interface{} { return uint32(m.GetLengthValueType()) }).(uint32))) + }).(uint32))) + }).(uint32) } -func NewBACnetTagHeader(tagNumber uint8, tagClass TagClass, lengthValueType uint8, extTagNumber *uint8, extLength *uint8, extExtLength *uint16, extExtExtLength *uint32, actualTagNumber uint8, isBoolean bool, isConstructed bool, isPrimitiveAndNotBoolean bool, actualLength uint32) *BACnetTagHeader { - return &BACnetTagHeader{TagNumber: tagNumber, TagClass: tagClass, LengthValueType: lengthValueType, ExtTagNumber: extTagNumber, ExtLength: extLength, ExtExtLength: extExtLength, ExtExtExtLength: extExtExtLength, ActualTagNumber: actualTagNumber, IsBoolean: isBoolean, IsConstructed: isConstructed, IsPrimitiveAndNotBoolean: isPrimitiveAndNotBoolean, ActualLength: actualLength} +// NewBACnetTagHeader factory function for BACnetTagHeader +func NewBACnetTagHeader(tagNumber uint8, tagClass TagClass, lengthValueType uint8, extTagNumber *uint8, extLength *uint8, extExtLength *uint16, extExtExtLength *uint32) *BACnetTagHeader { + return &BACnetTagHeader{TagNumber: tagNumber, TagClass: tagClass, LengthValueType: lengthValueType, ExtTagNumber: extTagNumber, ExtLength: extLength, ExtExtLength: extExtLength, ExtExtExtLength: extExtExtLength} } func CastBACnetTagHeader(structType interface{}) *BACnetTagHeader { @@ -156,11 +191,11 @@ func (m *BACnetTagHeader) GetTypeName() string { return "BACnetTagHeader" } -func (m *BACnetTagHeader) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagHeader) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagHeader) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagHeader) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (tagNumber) @@ -205,8 +240,8 @@ func (m *BACnetTagHeader) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetTagHeader) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagHeader) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagHeaderParse(readBuffer utils.ReadBuffer) (*BACnetTagHeader, error) { @@ -254,18 +289,22 @@ func BACnetTagHeaderParse(readBuffer utils.ReadBuffer) (*BACnetTagHeader, error) // Virtual field _actualTagNumber := utils.InlineIf(bool((tagNumber) < (15)), func() interface{} { return uint8(tagNumber) }, func() interface{} { return uint8((*extTagNumber)) }).(uint8) actualTagNumber := uint8(_actualTagNumber) + _ = actualTagNumber // Virtual field _isBoolean := bool(bool((tagNumber) == (1))) && bool(bool((tagClass) == (TagClass_APPLICATION_TAGS))) isBoolean := bool(_isBoolean) + _ = isBoolean // Virtual field _isConstructed := bool(bool((tagClass) == (TagClass_CONTEXT_SPECIFIC_TAGS))) && bool(bool((lengthValueType) == (6))) isConstructed := bool(_isConstructed) + _ = isConstructed // Virtual field _isPrimitiveAndNotBoolean := bool(!(isConstructed)) && bool(!(isBoolean)) isPrimitiveAndNotBoolean := bool(_isPrimitiveAndNotBoolean) + _ = isPrimitiveAndNotBoolean // Optional Field (extLength) (Can be skipped, if a given expression evaluates to false) var extLength *uint8 = nil @@ -304,13 +343,14 @@ func BACnetTagHeaderParse(readBuffer utils.ReadBuffer) (*BACnetTagHeader, error) }).(uint32))) }).(uint32) actualLength := uint32(_actualLength) + _ = actualLength if closeErr := readBuffer.CloseContext("BACnetTagHeader"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagHeader(tagNumber, tagClass, lengthValueType, extTagNumber, extLength, extExtLength, extExtExtLength, actualTagNumber, isBoolean, isConstructed, isPrimitiveAndNotBoolean, actualLength), nil + return NewBACnetTagHeader(tagNumber, tagClass, lengthValueType, extTagNumber, extLength, extExtLength, extExtExtLength), nil } func (m *BACnetTagHeader) Serialize(writeBuffer utils.WriteBuffer) error { @@ -354,19 +394,19 @@ func (m *BACnetTagHeader) Serialize(writeBuffer utils.WriteBuffer) error { } } // Virtual field - if _actualTagNumberErr := writeBuffer.WriteVirtual("actualTagNumber", m.ActualTagNumber); _actualTagNumberErr != nil { + if _actualTagNumberErr := writeBuffer.WriteVirtual("actualTagNumber", m.GetActualTagNumber()); _actualTagNumberErr != nil { return errors.Wrap(_actualTagNumberErr, "Error serializing 'actualTagNumber' field") } // Virtual field - if _isBooleanErr := writeBuffer.WriteVirtual("isBoolean", m.IsBoolean); _isBooleanErr != nil { + if _isBooleanErr := writeBuffer.WriteVirtual("isBoolean", m.GetIsBoolean()); _isBooleanErr != nil { return errors.Wrap(_isBooleanErr, "Error serializing 'isBoolean' field") } // Virtual field - if _isConstructedErr := writeBuffer.WriteVirtual("isConstructed", m.IsConstructed); _isConstructedErr != nil { + if _isConstructedErr := writeBuffer.WriteVirtual("isConstructed", m.GetIsConstructed()); _isConstructedErr != nil { return errors.Wrap(_isConstructedErr, "Error serializing 'isConstructed' field") } // Virtual field - if _isPrimitiveAndNotBooleanErr := writeBuffer.WriteVirtual("isPrimitiveAndNotBoolean", m.IsPrimitiveAndNotBoolean); _isPrimitiveAndNotBooleanErr != nil { + if _isPrimitiveAndNotBooleanErr := writeBuffer.WriteVirtual("isPrimitiveAndNotBoolean", m.GetIsPrimitiveAndNotBoolean()); _isPrimitiveAndNotBooleanErr != nil { return errors.Wrap(_isPrimitiveAndNotBooleanErr, "Error serializing 'isPrimitiveAndNotBoolean' field") } @@ -400,7 +440,7 @@ func (m *BACnetTagHeader) Serialize(writeBuffer utils.WriteBuffer) error { } } // Virtual field - if _actualLengthErr := writeBuffer.WriteVirtual("actualLength", m.ActualLength); _actualLengthErr != nil { + if _actualLengthErr := writeBuffer.WriteVirtual("actualLength", m.GetActualLength()); _actualLengthErr != nil { return errors.Wrap(_actualLengthErr, "Error serializing 'actualLength' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go index db9fa271392..0daf8e1e393 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go @@ -31,6 +31,9 @@ type BACnetTagPayloadBitString struct { UnusedBits uint8 Data []bool Unused []bool + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -41,10 +44,10 @@ type IBACnetTagPayloadBitString interface { GetData() []bool // GetUnused returns Unused GetUnused() []bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,8 +71,9 @@ func (m *BACnetTagPayloadBitString) GetUnused() []bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetTagPayloadBitString(unusedBits uint8, data []bool, unused []bool) *BACnetTagPayloadBitString { - return &BACnetTagPayloadBitString{UnusedBits: unusedBits, Data: data, Unused: unused} +// NewBACnetTagPayloadBitString factory function for BACnetTagPayloadBitString +func NewBACnetTagPayloadBitString(unusedBits uint8, data []bool, unused []bool, actualLength uint32) *BACnetTagPayloadBitString { + return &BACnetTagPayloadBitString{UnusedBits: unusedBits, Data: data, Unused: unused, ActualLength: actualLength} } func CastBACnetTagPayloadBitString(structType interface{}) *BACnetTagPayloadBitString { @@ -89,11 +93,11 @@ func (m *BACnetTagPayloadBitString) GetTypeName() string { return "BACnetTagPayloadBitString" } -func (m *BACnetTagPayloadBitString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadBitString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadBitString) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadBitString) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (unusedBits) @@ -112,8 +116,8 @@ func (m *BACnetTagPayloadBitString) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *BACnetTagPayloadBitString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadBitString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadBitStringParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadBitString, error) { @@ -171,7 +175,7 @@ func BACnetTagPayloadBitStringParse(readBuffer utils.ReadBuffer, actualLength ui } // Create the instance - return NewBACnetTagPayloadBitString(unusedBits, data, unused), nil + return NewBACnetTagPayloadBitString(unusedBits, data, unused, actualLength), nil } func (m *BACnetTagPayloadBitString) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go index f4373957944..670164e470b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go @@ -28,9 +28,9 @@ import ( // The data-structure of this message type BACnetTagPayloadBoolean struct { - Value bool - IsTrue bool - IsFalse bool + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -41,10 +41,10 @@ type IBACnetTagPayloadBoolean interface { GetIsTrue() bool // GetIsFalse returns IsFalse GetIsFalse() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -57,22 +57,20 @@ type IBACnetTagPayloadBoolean interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadBoolean) GetValue() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.Value + return bool((m.ActualLength) == (1)) } func (m *BACnetTagPayloadBoolean) GetIsTrue() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsTrue + return m.GetValue() } func (m *BACnetTagPayloadBoolean) GetIsFalse() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsFalse + return !(m.GetValue()) } -func NewBACnetTagPayloadBoolean(value bool, isTrue bool, isFalse bool) *BACnetTagPayloadBoolean { - return &BACnetTagPayloadBoolean{Value: value, IsTrue: isTrue, IsFalse: isFalse} +// NewBACnetTagPayloadBoolean factory function for BACnetTagPayloadBoolean +func NewBACnetTagPayloadBoolean(actualLength uint32) *BACnetTagPayloadBoolean { + return &BACnetTagPayloadBoolean{ActualLength: actualLength} } func CastBACnetTagPayloadBoolean(structType interface{}) *BACnetTagPayloadBoolean { @@ -92,11 +90,11 @@ func (m *BACnetTagPayloadBoolean) GetTypeName() string { return "BACnetTagPayloadBoolean" } -func (m *BACnetTagPayloadBoolean) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadBoolean) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadBoolean) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadBoolean) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. @@ -108,8 +106,8 @@ func (m *BACnetTagPayloadBoolean) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *BACnetTagPayloadBoolean) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadBoolean) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadBooleanParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadBoolean, error) { @@ -120,21 +118,24 @@ func BACnetTagPayloadBooleanParse(readBuffer utils.ReadBuffer, actualLength uint // Virtual field _value := bool((actualLength) == (1)) value := bool(_value) + _ = value // Virtual field _isTrue := value isTrue := bool(_isTrue) + _ = isTrue // Virtual field _isFalse := !(value) isFalse := bool(_isFalse) + _ = isFalse if closeErr := readBuffer.CloseContext("BACnetTagPayloadBoolean"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagPayloadBoolean(value, isTrue, isFalse), nil + return NewBACnetTagPayloadBoolean(actualLength), nil } func (m *BACnetTagPayloadBoolean) Serialize(writeBuffer utils.WriteBuffer) error { @@ -142,15 +143,15 @@ func (m *BACnetTagPayloadBoolean) Serialize(writeBuffer utils.WriteBuffer) error return pushErr } // Virtual field - if _valueErr := writeBuffer.WriteVirtual("value", m.Value); _valueErr != nil { + if _valueErr := writeBuffer.WriteVirtual("value", m.GetValue()); _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } // Virtual field - if _isTrueErr := writeBuffer.WriteVirtual("isTrue", m.IsTrue); _isTrueErr != nil { + if _isTrueErr := writeBuffer.WriteVirtual("isTrue", m.GetIsTrue()); _isTrueErr != nil { return errors.Wrap(_isTrueErr, "Error serializing 'isTrue' field") } // Virtual field - if _isFalseErr := writeBuffer.WriteVirtual("isFalse", m.IsFalse); _isFalseErr != nil { + if _isFalseErr := writeBuffer.WriteVirtual("isFalse", m.GetIsFalse()); _isFalseErr != nil { return errors.Wrap(_isFalseErr, "Error serializing 'isFalse' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go index e9b4356c14b..79ef4a62c54 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go @@ -28,9 +28,11 @@ import ( // The data-structure of this message type BACnetTagPayloadCharacterString struct { - Encoding BACnetCharacterEncoding - Value string - ActualLengthInBit uint16 + Encoding BACnetCharacterEncoding + Value string + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -41,10 +43,10 @@ type IBACnetTagPayloadCharacterString interface { GetValue() string // GetActualLengthInBit returns ActualLengthInBit GetActualLengthInBit() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -64,12 +66,12 @@ func (m *BACnetTagPayloadCharacterString) GetValue() string { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadCharacterString) GetActualLengthInBit() uint16 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualLengthInBit + return uint16(uint16(m.ActualLength)*uint16(uint16(8))) - uint16(uint16(8)) } -func NewBACnetTagPayloadCharacterString(encoding BACnetCharacterEncoding, value string, actualLengthInBit uint16) *BACnetTagPayloadCharacterString { - return &BACnetTagPayloadCharacterString{Encoding: encoding, Value: value, ActualLengthInBit: actualLengthInBit} +// NewBACnetTagPayloadCharacterString factory function for BACnetTagPayloadCharacterString +func NewBACnetTagPayloadCharacterString(encoding BACnetCharacterEncoding, value string, actualLength uint32) *BACnetTagPayloadCharacterString { + return &BACnetTagPayloadCharacterString{Encoding: encoding, Value: value, ActualLength: actualLength} } func CastBACnetTagPayloadCharacterString(structType interface{}) *BACnetTagPayloadCharacterString { @@ -89,11 +91,11 @@ func (m *BACnetTagPayloadCharacterString) GetTypeName() string { return "BACnetTagPayloadCharacterString" } -func (m *BACnetTagPayloadCharacterString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadCharacterString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadCharacterString) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadCharacterString) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (encoding) @@ -102,13 +104,13 @@ func (m *BACnetTagPayloadCharacterString) LengthInBitsConditional(lastItem bool) // A virtual field doesn't have any in- or output. // Simple field (value) - lengthInBits += uint16(m.ActualLengthInBit) + lengthInBits += uint16(m.GetActualLengthInBit()) return lengthInBits } -func (m *BACnetTagPayloadCharacterString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadCharacterString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadCharacterStringParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadCharacterString, error) { @@ -132,6 +134,7 @@ func BACnetTagPayloadCharacterStringParse(readBuffer utils.ReadBuffer, actualLen // Virtual field _actualLengthInBit := uint16(uint16(actualLength)*uint16(uint16(8))) - uint16(uint16(8)) actualLengthInBit := uint16(_actualLengthInBit) + _ = actualLengthInBit // Simple Field (value) _value, _valueErr := readBuffer.ReadString("value", uint32(actualLengthInBit)) @@ -145,7 +148,7 @@ func BACnetTagPayloadCharacterStringParse(readBuffer utils.ReadBuffer, actualLen } // Create the instance - return NewBACnetTagPayloadCharacterString(encoding, value, actualLengthInBit), nil + return NewBACnetTagPayloadCharacterString(encoding, value, actualLength), nil } func (m *BACnetTagPayloadCharacterString) Serialize(writeBuffer utils.WriteBuffer) error { @@ -165,13 +168,13 @@ func (m *BACnetTagPayloadCharacterString) Serialize(writeBuffer utils.WriteBuffe return errors.Wrap(_encodingErr, "Error serializing 'encoding' field") } // Virtual field - if _actualLengthInBitErr := writeBuffer.WriteVirtual("actualLengthInBit", m.ActualLengthInBit); _actualLengthInBitErr != nil { + if _actualLengthInBitErr := writeBuffer.WriteVirtual("actualLengthInBit", m.GetActualLengthInBit()); _actualLengthInBitErr != nil { return errors.Wrap(_actualLengthInBitErr, "Error serializing 'actualLengthInBit' field") } // Simple Field (value) value := string(m.Value) - _valueErr := writeBuffer.WriteString("value", uint32(m.ActualLengthInBit), "UTF-8", (value)) + _valueErr := writeBuffer.WriteString("value", uint32(m.GetActualLengthInBit()), "UTF-8", (value)) if _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go index a7695997b4b..255dc971572 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go @@ -28,39 +28,28 @@ import ( // The data-structure of this message type BACnetTagPayloadDate struct { - YearMinus1900 int8 - Month int8 - DayOfMonth int8 - DayOfWeek int8 - Wildcard int8 - YearIsWildcard bool - Year int16 - MonthIsWildcard bool - OddMonthWildcard bool - EvenMonthWildcard bool - DayOfMonthIsWildcard bool - LastDayOfMonthWildcard bool - OddDayOfMonthWildcard bool - EvenDayOfMonthWildcard bool - DayOfWeekIsWildcard bool + YearMinus1900 uint8 + Month uint8 + DayOfMonth uint8 + DayOfWeek uint8 } // The corresponding interface type IBACnetTagPayloadDate interface { // GetYearMinus1900 returns YearMinus1900 - GetYearMinus1900() int8 + GetYearMinus1900() uint8 // GetMonth returns Month - GetMonth() int8 + GetMonth() uint8 // GetDayOfMonth returns DayOfMonth - GetDayOfMonth() int8 + GetDayOfMonth() uint8 // GetDayOfWeek returns DayOfWeek - GetDayOfWeek() int8 + GetDayOfWeek() uint8 // GetWildcard returns Wildcard - GetWildcard() int8 + GetWildcard() uint8 // GetYearIsWildcard returns YearIsWildcard GetYearIsWildcard() bool // GetYear returns Year - GetYear() int16 + GetYear() uint16 // GetMonthIsWildcard returns MonthIsWildcard GetMonthIsWildcard() bool // GetOddMonthWildcard returns OddMonthWildcard @@ -77,10 +66,10 @@ type IBACnetTagPayloadDate interface { GetEvenDayOfMonthWildcard() bool // GetDayOfWeekIsWildcard returns DayOfWeekIsWildcard GetDayOfWeekIsWildcard() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -88,82 +77,72 @@ type IBACnetTagPayloadDate interface { /////////////////////////////////////////////////////////// // Accessors for property fields. /////////////////////////////////////////////////////////// -func (m *BACnetTagPayloadDate) GetYearMinus1900() int8 { +func (m *BACnetTagPayloadDate) GetYearMinus1900() uint8 { return m.YearMinus1900 } -func (m *BACnetTagPayloadDate) GetMonth() int8 { +func (m *BACnetTagPayloadDate) GetMonth() uint8 { return m.Month } -func (m *BACnetTagPayloadDate) GetDayOfMonth() int8 { +func (m *BACnetTagPayloadDate) GetDayOfMonth() uint8 { return m.DayOfMonth } -func (m *BACnetTagPayloadDate) GetDayOfWeek() int8 { +func (m *BACnetTagPayloadDate) GetDayOfWeek() uint8 { return m.DayOfWeek } /////////////////////////////////////////////////////////// // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func (m *BACnetTagPayloadDate) GetWildcard() int8 { - // TODO: calculation should happen here instead accessing the stored field - return m.Wildcard +func (m *BACnetTagPayloadDate) GetWildcard() uint8 { + return 0xFF } func (m *BACnetTagPayloadDate) GetYearIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.YearIsWildcard + return bool((m.GetYearMinus1900()) == (m.GetWildcard())) } -func (m *BACnetTagPayloadDate) GetYear() int16 { - // TODO: calculation should happen here instead accessing the stored field - return m.Year +func (m *BACnetTagPayloadDate) GetYear() uint16 { + return uint16(m.GetYearMinus1900()) + uint16(uint16(1900)) } func (m *BACnetTagPayloadDate) GetMonthIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.MonthIsWildcard + return bool((m.GetMonth()) == (m.GetWildcard())) } func (m *BACnetTagPayloadDate) GetOddMonthWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.OddMonthWildcard + return bool((m.GetMonth()) == (13)) } func (m *BACnetTagPayloadDate) GetEvenMonthWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.EvenMonthWildcard + return bool((m.GetMonth()) == (14)) } func (m *BACnetTagPayloadDate) GetDayOfMonthIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.DayOfMonthIsWildcard + return bool((m.GetDayOfMonth()) == (m.GetWildcard())) } func (m *BACnetTagPayloadDate) GetLastDayOfMonthWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.LastDayOfMonthWildcard + return bool((m.GetDayOfMonth()) == (32)) } func (m *BACnetTagPayloadDate) GetOddDayOfMonthWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.OddDayOfMonthWildcard + return bool((m.GetDayOfMonth()) == (33)) } func (m *BACnetTagPayloadDate) GetEvenDayOfMonthWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.EvenDayOfMonthWildcard + return bool((m.GetDayOfMonth()) == (34)) } func (m *BACnetTagPayloadDate) GetDayOfWeekIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.DayOfWeekIsWildcard + return bool((m.GetDayOfWeek()) == (m.GetWildcard())) } -func NewBACnetTagPayloadDate(yearMinus1900 int8, month int8, dayOfMonth int8, dayOfWeek int8, wildcard int8, yearIsWildcard bool, year int16, monthIsWildcard bool, oddMonthWildcard bool, evenMonthWildcard bool, dayOfMonthIsWildcard bool, lastDayOfMonthWildcard bool, oddDayOfMonthWildcard bool, evenDayOfMonthWildcard bool, dayOfWeekIsWildcard bool) *BACnetTagPayloadDate { - return &BACnetTagPayloadDate{YearMinus1900: yearMinus1900, Month: month, DayOfMonth: dayOfMonth, DayOfWeek: dayOfWeek, Wildcard: wildcard, YearIsWildcard: yearIsWildcard, Year: year, MonthIsWildcard: monthIsWildcard, OddMonthWildcard: oddMonthWildcard, EvenMonthWildcard: evenMonthWildcard, DayOfMonthIsWildcard: dayOfMonthIsWildcard, LastDayOfMonthWildcard: lastDayOfMonthWildcard, OddDayOfMonthWildcard: oddDayOfMonthWildcard, EvenDayOfMonthWildcard: evenDayOfMonthWildcard, DayOfWeekIsWildcard: dayOfWeekIsWildcard} +// NewBACnetTagPayloadDate factory function for BACnetTagPayloadDate +func NewBACnetTagPayloadDate(yearMinus1900 uint8, month uint8, dayOfMonth uint8, dayOfWeek uint8) *BACnetTagPayloadDate { + return &BACnetTagPayloadDate{YearMinus1900: yearMinus1900, Month: month, DayOfMonth: dayOfMonth, DayOfWeek: dayOfWeek} } func CastBACnetTagPayloadDate(structType interface{}) *BACnetTagPayloadDate { @@ -183,11 +162,11 @@ func (m *BACnetTagPayloadDate) GetTypeName() string { return "BACnetTagPayloadDate" } -func (m *BACnetTagPayloadDate) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadDate) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadDate) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadDate) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. @@ -227,8 +206,8 @@ func (m *BACnetTagPayloadDate) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetTagPayloadDate) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadDate) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadDateParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDate, error) { @@ -238,10 +217,11 @@ func BACnetTagPayloadDateParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDa // Virtual field _wildcard := 0xFF - wildcard := int8(_wildcard) + wildcard := uint8(_wildcard) + _ = wildcard // Simple Field (yearMinus1900) - _yearMinus1900, _yearMinus1900Err := readBuffer.ReadInt8("yearMinus1900", 8) + _yearMinus1900, _yearMinus1900Err := readBuffer.ReadUint8("yearMinus1900", 8) if _yearMinus1900Err != nil { return nil, errors.Wrap(_yearMinus1900Err, "Error parsing 'yearMinus1900' field") } @@ -250,13 +230,15 @@ func BACnetTagPayloadDateParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDa // Virtual field _yearIsWildcard := bool((yearMinus1900) == (wildcard)) yearIsWildcard := bool(_yearIsWildcard) + _ = yearIsWildcard // Virtual field - _year := int16(yearMinus1900) + int16(int16(1900)) - year := int16(_year) + _year := uint16(yearMinus1900) + uint16(uint16(1900)) + year := uint16(_year) + _ = year // Simple Field (month) - _month, _monthErr := readBuffer.ReadInt8("month", 8) + _month, _monthErr := readBuffer.ReadUint8("month", 8) if _monthErr != nil { return nil, errors.Wrap(_monthErr, "Error parsing 'month' field") } @@ -265,17 +247,20 @@ func BACnetTagPayloadDateParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDa // Virtual field _monthIsWildcard := bool((month) == (wildcard)) monthIsWildcard := bool(_monthIsWildcard) + _ = monthIsWildcard // Virtual field _oddMonthWildcard := bool((month) == (13)) oddMonthWildcard := bool(_oddMonthWildcard) + _ = oddMonthWildcard // Virtual field _evenMonthWildcard := bool((month) == (14)) evenMonthWildcard := bool(_evenMonthWildcard) + _ = evenMonthWildcard // Simple Field (dayOfMonth) - _dayOfMonth, _dayOfMonthErr := readBuffer.ReadInt8("dayOfMonth", 8) + _dayOfMonth, _dayOfMonthErr := readBuffer.ReadUint8("dayOfMonth", 8) if _dayOfMonthErr != nil { return nil, errors.Wrap(_dayOfMonthErr, "Error parsing 'dayOfMonth' field") } @@ -284,21 +269,25 @@ func BACnetTagPayloadDateParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDa // Virtual field _dayOfMonthIsWildcard := bool((dayOfMonth) == (wildcard)) dayOfMonthIsWildcard := bool(_dayOfMonthIsWildcard) + _ = dayOfMonthIsWildcard // Virtual field _lastDayOfMonthWildcard := bool((dayOfMonth) == (32)) lastDayOfMonthWildcard := bool(_lastDayOfMonthWildcard) + _ = lastDayOfMonthWildcard // Virtual field _oddDayOfMonthWildcard := bool((dayOfMonth) == (33)) oddDayOfMonthWildcard := bool(_oddDayOfMonthWildcard) + _ = oddDayOfMonthWildcard // Virtual field _evenDayOfMonthWildcard := bool((dayOfMonth) == (34)) evenDayOfMonthWildcard := bool(_evenDayOfMonthWildcard) + _ = evenDayOfMonthWildcard // Simple Field (dayOfWeek) - _dayOfWeek, _dayOfWeekErr := readBuffer.ReadInt8("dayOfWeek", 8) + _dayOfWeek, _dayOfWeekErr := readBuffer.ReadUint8("dayOfWeek", 8) if _dayOfWeekErr != nil { return nil, errors.Wrap(_dayOfWeekErr, "Error parsing 'dayOfWeek' field") } @@ -307,13 +296,14 @@ func BACnetTagPayloadDateParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDa // Virtual field _dayOfWeekIsWildcard := bool((dayOfWeek) == (wildcard)) dayOfWeekIsWildcard := bool(_dayOfWeekIsWildcard) + _ = dayOfWeekIsWildcard if closeErr := readBuffer.CloseContext("BACnetTagPayloadDate"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagPayloadDate(yearMinus1900, month, dayOfMonth, dayOfWeek, wildcard, yearIsWildcard, year, monthIsWildcard, oddMonthWildcard, evenMonthWildcard, dayOfMonthIsWildcard, lastDayOfMonthWildcard, oddDayOfMonthWildcard, evenDayOfMonthWildcard, dayOfWeekIsWildcard), nil + return NewBACnetTagPayloadDate(yearMinus1900, month, dayOfMonth, dayOfWeek), nil } func (m *BACnetTagPayloadDate) Serialize(writeBuffer utils.WriteBuffer) error { @@ -321,75 +311,75 @@ func (m *BACnetTagPayloadDate) Serialize(writeBuffer utils.WriteBuffer) error { return pushErr } // Virtual field - if _wildcardErr := writeBuffer.WriteVirtual("wildcard", m.Wildcard); _wildcardErr != nil { + if _wildcardErr := writeBuffer.WriteVirtual("wildcard", m.GetWildcard()); _wildcardErr != nil { return errors.Wrap(_wildcardErr, "Error serializing 'wildcard' field") } // Simple Field (yearMinus1900) - yearMinus1900 := int8(m.YearMinus1900) - _yearMinus1900Err := writeBuffer.WriteInt8("yearMinus1900", 8, (yearMinus1900)) + yearMinus1900 := uint8(m.YearMinus1900) + _yearMinus1900Err := writeBuffer.WriteUint8("yearMinus1900", 8, (yearMinus1900)) if _yearMinus1900Err != nil { return errors.Wrap(_yearMinus1900Err, "Error serializing 'yearMinus1900' field") } // Virtual field - if _yearIsWildcardErr := writeBuffer.WriteVirtual("yearIsWildcard", m.YearIsWildcard); _yearIsWildcardErr != nil { + if _yearIsWildcardErr := writeBuffer.WriteVirtual("yearIsWildcard", m.GetYearIsWildcard()); _yearIsWildcardErr != nil { return errors.Wrap(_yearIsWildcardErr, "Error serializing 'yearIsWildcard' field") } // Virtual field - if _yearErr := writeBuffer.WriteVirtual("year", m.Year); _yearErr != nil { + if _yearErr := writeBuffer.WriteVirtual("year", m.GetYear()); _yearErr != nil { return errors.Wrap(_yearErr, "Error serializing 'year' field") } // Simple Field (month) - month := int8(m.Month) - _monthErr := writeBuffer.WriteInt8("month", 8, (month)) + month := uint8(m.Month) + _monthErr := writeBuffer.WriteUint8("month", 8, (month)) if _monthErr != nil { return errors.Wrap(_monthErr, "Error serializing 'month' field") } // Virtual field - if _monthIsWildcardErr := writeBuffer.WriteVirtual("monthIsWildcard", m.MonthIsWildcard); _monthIsWildcardErr != nil { + if _monthIsWildcardErr := writeBuffer.WriteVirtual("monthIsWildcard", m.GetMonthIsWildcard()); _monthIsWildcardErr != nil { return errors.Wrap(_monthIsWildcardErr, "Error serializing 'monthIsWildcard' field") } // Virtual field - if _oddMonthWildcardErr := writeBuffer.WriteVirtual("oddMonthWildcard", m.OddMonthWildcard); _oddMonthWildcardErr != nil { + if _oddMonthWildcardErr := writeBuffer.WriteVirtual("oddMonthWildcard", m.GetOddMonthWildcard()); _oddMonthWildcardErr != nil { return errors.Wrap(_oddMonthWildcardErr, "Error serializing 'oddMonthWildcard' field") } // Virtual field - if _evenMonthWildcardErr := writeBuffer.WriteVirtual("evenMonthWildcard", m.EvenMonthWildcard); _evenMonthWildcardErr != nil { + if _evenMonthWildcardErr := writeBuffer.WriteVirtual("evenMonthWildcard", m.GetEvenMonthWildcard()); _evenMonthWildcardErr != nil { return errors.Wrap(_evenMonthWildcardErr, "Error serializing 'evenMonthWildcard' field") } // Simple Field (dayOfMonth) - dayOfMonth := int8(m.DayOfMonth) - _dayOfMonthErr := writeBuffer.WriteInt8("dayOfMonth", 8, (dayOfMonth)) + dayOfMonth := uint8(m.DayOfMonth) + _dayOfMonthErr := writeBuffer.WriteUint8("dayOfMonth", 8, (dayOfMonth)) if _dayOfMonthErr != nil { return errors.Wrap(_dayOfMonthErr, "Error serializing 'dayOfMonth' field") } // Virtual field - if _dayOfMonthIsWildcardErr := writeBuffer.WriteVirtual("dayOfMonthIsWildcard", m.DayOfMonthIsWildcard); _dayOfMonthIsWildcardErr != nil { + if _dayOfMonthIsWildcardErr := writeBuffer.WriteVirtual("dayOfMonthIsWildcard", m.GetDayOfMonthIsWildcard()); _dayOfMonthIsWildcardErr != nil { return errors.Wrap(_dayOfMonthIsWildcardErr, "Error serializing 'dayOfMonthIsWildcard' field") } // Virtual field - if _lastDayOfMonthWildcardErr := writeBuffer.WriteVirtual("lastDayOfMonthWildcard", m.LastDayOfMonthWildcard); _lastDayOfMonthWildcardErr != nil { + if _lastDayOfMonthWildcardErr := writeBuffer.WriteVirtual("lastDayOfMonthWildcard", m.GetLastDayOfMonthWildcard()); _lastDayOfMonthWildcardErr != nil { return errors.Wrap(_lastDayOfMonthWildcardErr, "Error serializing 'lastDayOfMonthWildcard' field") } // Virtual field - if _oddDayOfMonthWildcardErr := writeBuffer.WriteVirtual("oddDayOfMonthWildcard", m.OddDayOfMonthWildcard); _oddDayOfMonthWildcardErr != nil { + if _oddDayOfMonthWildcardErr := writeBuffer.WriteVirtual("oddDayOfMonthWildcard", m.GetOddDayOfMonthWildcard()); _oddDayOfMonthWildcardErr != nil { return errors.Wrap(_oddDayOfMonthWildcardErr, "Error serializing 'oddDayOfMonthWildcard' field") } // Virtual field - if _evenDayOfMonthWildcardErr := writeBuffer.WriteVirtual("evenDayOfMonthWildcard", m.EvenDayOfMonthWildcard); _evenDayOfMonthWildcardErr != nil { + if _evenDayOfMonthWildcardErr := writeBuffer.WriteVirtual("evenDayOfMonthWildcard", m.GetEvenDayOfMonthWildcard()); _evenDayOfMonthWildcardErr != nil { return errors.Wrap(_evenDayOfMonthWildcardErr, "Error serializing 'evenDayOfMonthWildcard' field") } // Simple Field (dayOfWeek) - dayOfWeek := int8(m.DayOfWeek) - _dayOfWeekErr := writeBuffer.WriteInt8("dayOfWeek", 8, (dayOfWeek)) + dayOfWeek := uint8(m.DayOfWeek) + _dayOfWeekErr := writeBuffer.WriteUint8("dayOfWeek", 8, (dayOfWeek)) if _dayOfWeekErr != nil { return errors.Wrap(_dayOfWeekErr, "Error serializing 'dayOfWeek' field") } // Virtual field - if _dayOfWeekIsWildcardErr := writeBuffer.WriteVirtual("dayOfWeekIsWildcard", m.DayOfWeekIsWildcard); _dayOfWeekIsWildcardErr != nil { + if _dayOfWeekIsWildcardErr := writeBuffer.WriteVirtual("dayOfWeekIsWildcard", m.GetDayOfWeekIsWildcard()); _dayOfWeekIsWildcardErr != nil { return errors.Wrap(_dayOfWeekIsWildcardErr, "Error serializing 'dayOfWeekIsWildcard' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go index 13f828106ee..ed0a863441d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go @@ -35,10 +35,10 @@ type BACnetTagPayloadDouble struct { type IBACnetTagPayloadDouble interface { // GetValue returns Value GetValue() float64 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *BACnetTagPayloadDouble) GetValue() float64 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetTagPayloadDouble factory function for BACnetTagPayloadDouble func NewBACnetTagPayloadDouble(value float64) *BACnetTagPayloadDouble { return &BACnetTagPayloadDouble{Value: value} } @@ -75,11 +76,11 @@ func (m *BACnetTagPayloadDouble) GetTypeName() string { return "BACnetTagPayloadDouble" } -func (m *BACnetTagPayloadDouble) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadDouble) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadDouble) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadDouble) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (value) @@ -88,8 +89,8 @@ func (m *BACnetTagPayloadDouble) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetTagPayloadDouble) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadDouble) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadDoubleParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadDouble, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go index a0d0e6d676e..644e3dc4dfc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go @@ -28,8 +28,10 @@ import ( // The data-structure of this message type BACnetTagPayloadEnumerated struct { - Data []byte - ActualValue uint32 + Data []byte + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -38,10 +40,10 @@ type IBACnetTagPayloadEnumerated interface { GetData() []byte // GetActualValue returns ActualValue GetActualValue() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -57,12 +59,12 @@ func (m *BACnetTagPayloadEnumerated) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadEnumerated) GetActualValue() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + return ParseVarUint(m.GetData()) } -func NewBACnetTagPayloadEnumerated(data []byte, actualValue uint32) *BACnetTagPayloadEnumerated { - return &BACnetTagPayloadEnumerated{Data: data, ActualValue: actualValue} +// NewBACnetTagPayloadEnumerated factory function for BACnetTagPayloadEnumerated +func NewBACnetTagPayloadEnumerated(data []byte, actualLength uint32) *BACnetTagPayloadEnumerated { + return &BACnetTagPayloadEnumerated{Data: data, ActualLength: actualLength} } func CastBACnetTagPayloadEnumerated(structType interface{}) *BACnetTagPayloadEnumerated { @@ -82,11 +84,11 @@ func (m *BACnetTagPayloadEnumerated) GetTypeName() string { return "BACnetTagPayloadEnumerated" } -func (m *BACnetTagPayloadEnumerated) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadEnumerated) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadEnumerated) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadEnumerated) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Array field @@ -99,8 +101,8 @@ func (m *BACnetTagPayloadEnumerated) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *BACnetTagPayloadEnumerated) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadEnumerated) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadEnumeratedParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadEnumerated, error) { @@ -117,13 +119,14 @@ func BACnetTagPayloadEnumeratedParse(readBuffer utils.ReadBuffer, actualLength u // Virtual field _actualValue := ParseVarUint(data) actualValue := uint32(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetTagPayloadEnumerated"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagPayloadEnumerated(data, actualValue), nil + return NewBACnetTagPayloadEnumerated(data, actualLength), nil } func (m *BACnetTagPayloadEnumerated) Serialize(writeBuffer utils.WriteBuffer) error { @@ -140,7 +143,7 @@ func (m *BACnetTagPayloadEnumerated) Serialize(writeBuffer utils.WriteBuffer) er } } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go index 675058e5059..8e2a63c23b8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go @@ -31,7 +31,6 @@ type BACnetTagPayloadObjectIdentifier struct { ObjectType BACnetObjectType ProprietaryValue uint16 InstanceNumber uint32 - IsProprietary bool } // The corresponding interface @@ -44,10 +43,10 @@ type IBACnetTagPayloadObjectIdentifier interface { GetInstanceNumber() uint32 // GetIsProprietary returns IsProprietary GetIsProprietary() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -71,12 +70,12 @@ func (m *BACnetTagPayloadObjectIdentifier) GetInstanceNumber() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadObjectIdentifier) GetIsProprietary() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsProprietary + return bool((m.GetObjectType()) == (BACnetObjectType_VENDOR_PROPRIETARY_VALUE)) } -func NewBACnetTagPayloadObjectIdentifier(objectType BACnetObjectType, proprietaryValue uint16, instanceNumber uint32, isProprietary bool) *BACnetTagPayloadObjectIdentifier { - return &BACnetTagPayloadObjectIdentifier{ObjectType: objectType, ProprietaryValue: proprietaryValue, InstanceNumber: instanceNumber, IsProprietary: isProprietary} +// NewBACnetTagPayloadObjectIdentifier factory function for BACnetTagPayloadObjectIdentifier +func NewBACnetTagPayloadObjectIdentifier(objectType BACnetObjectType, proprietaryValue uint16, instanceNumber uint32) *BACnetTagPayloadObjectIdentifier { + return &BACnetTagPayloadObjectIdentifier{ObjectType: objectType, ProprietaryValue: proprietaryValue, InstanceNumber: instanceNumber} } func CastBACnetTagPayloadObjectIdentifier(structType interface{}) *BACnetTagPayloadObjectIdentifier { @@ -96,11 +95,11 @@ func (m *BACnetTagPayloadObjectIdentifier) GetTypeName() string { return "BACnetTagPayloadObjectIdentifier" } -func (m *BACnetTagPayloadObjectIdentifier) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadObjectIdentifier) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadObjectIdentifier) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadObjectIdentifier) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Manual Field (objectType) @@ -117,8 +116,8 @@ func (m *BACnetTagPayloadObjectIdentifier) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *BACnetTagPayloadObjectIdentifier) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadObjectIdentifier) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadObjectIdentifierParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadObjectIdentifier, error) { @@ -141,6 +140,7 @@ func BACnetTagPayloadObjectIdentifierParse(readBuffer utils.ReadBuffer) (*BACnet // Virtual field _isProprietary := bool((objectType) == (BACnetObjectType_VENDOR_PROPRIETARY_VALUE)) isProprietary := bool(_isProprietary) + _ = isProprietary // Simple Field (instanceNumber) _instanceNumber, _instanceNumberErr := readBuffer.ReadUint32("instanceNumber", 22) @@ -154,7 +154,7 @@ func BACnetTagPayloadObjectIdentifierParse(readBuffer utils.ReadBuffer) (*BACnet } // Create the instance - return NewBACnetTagPayloadObjectIdentifier(objectType, proprietaryValue, instanceNumber, isProprietary), nil + return NewBACnetTagPayloadObjectIdentifier(objectType, proprietaryValue, instanceNumber), nil } func (m *BACnetTagPayloadObjectIdentifier) Serialize(writeBuffer utils.WriteBuffer) error { @@ -163,18 +163,18 @@ func (m *BACnetTagPayloadObjectIdentifier) Serialize(writeBuffer utils.WriteBuff } // Manual Field (objectType) - _objectTypeErr := WriteObjectType(writeBuffer, m.ObjectType) + _objectTypeErr := WriteObjectType(writeBuffer, m.GetObjectType()) if _objectTypeErr != nil { return errors.Wrap(_objectTypeErr, "Error serializing 'objectType' field") } // Manual Field (proprietaryValue) - _proprietaryValueErr := WriteProprietaryObjectType(writeBuffer, m.ObjectType, m.ProprietaryValue) + _proprietaryValueErr := WriteProprietaryObjectType(writeBuffer, m.GetObjectType(), m.GetProprietaryValue()) if _proprietaryValueErr != nil { return errors.Wrap(_proprietaryValueErr, "Error serializing 'proprietaryValue' field") } // Virtual field - if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.IsProprietary); _isProprietaryErr != nil { + if _isProprietaryErr := writeBuffer.WriteVirtual("isProprietary", m.GetIsProprietary()); _isProprietaryErr != nil { return errors.Wrap(_isProprietaryErr, "Error serializing 'isProprietary' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go index c5954c68e7e..6fa33cecfde 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go @@ -28,8 +28,10 @@ import ( // The data-structure of this message type BACnetTagPayloadOctetString struct { - Value string - ActualLengthInBit uint16 + Value string + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -38,10 +40,10 @@ type IBACnetTagPayloadOctetString interface { GetValue() string // GetActualLengthInBit returns ActualLengthInBit GetActualLengthInBit() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -57,12 +59,12 @@ func (m *BACnetTagPayloadOctetString) GetValue() string { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadOctetString) GetActualLengthInBit() uint16 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualLengthInBit + return uint16(m.ActualLength) * uint16(uint16(8)) } -func NewBACnetTagPayloadOctetString(value string, actualLengthInBit uint16) *BACnetTagPayloadOctetString { - return &BACnetTagPayloadOctetString{Value: value, ActualLengthInBit: actualLengthInBit} +// NewBACnetTagPayloadOctetString factory function for BACnetTagPayloadOctetString +func NewBACnetTagPayloadOctetString(value string, actualLength uint32) *BACnetTagPayloadOctetString { + return &BACnetTagPayloadOctetString{Value: value, ActualLength: actualLength} } func CastBACnetTagPayloadOctetString(structType interface{}) *BACnetTagPayloadOctetString { @@ -82,23 +84,23 @@ func (m *BACnetTagPayloadOctetString) GetTypeName() string { return "BACnetTagPayloadOctetString" } -func (m *BACnetTagPayloadOctetString) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadOctetString) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadOctetString) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadOctetString) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. // Simple field (value) - lengthInBits += uint16(m.ActualLengthInBit) + lengthInBits += uint16(m.GetActualLengthInBit()) return lengthInBits } -func (m *BACnetTagPayloadOctetString) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadOctetString) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadOctetStringParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadOctetString, error) { @@ -109,6 +111,7 @@ func BACnetTagPayloadOctetStringParse(readBuffer utils.ReadBuffer, actualLength // Virtual field _actualLengthInBit := uint16(actualLength) * uint16(uint16(8)) actualLengthInBit := uint16(_actualLengthInBit) + _ = actualLengthInBit // Simple Field (value) _value, _valueErr := readBuffer.ReadString("value", uint32(actualLengthInBit)) @@ -122,7 +125,7 @@ func BACnetTagPayloadOctetStringParse(readBuffer utils.ReadBuffer, actualLength } // Create the instance - return NewBACnetTagPayloadOctetString(value, actualLengthInBit), nil + return NewBACnetTagPayloadOctetString(value, actualLength), nil } func (m *BACnetTagPayloadOctetString) Serialize(writeBuffer utils.WriteBuffer) error { @@ -130,13 +133,13 @@ func (m *BACnetTagPayloadOctetString) Serialize(writeBuffer utils.WriteBuffer) e return pushErr } // Virtual field - if _actualLengthInBitErr := writeBuffer.WriteVirtual("actualLengthInBit", m.ActualLengthInBit); _actualLengthInBitErr != nil { + if _actualLengthInBitErr := writeBuffer.WriteVirtual("actualLengthInBit", m.GetActualLengthInBit()); _actualLengthInBitErr != nil { return errors.Wrap(_actualLengthInBitErr, "Error serializing 'actualLengthInBit' field") } // Simple Field (value) value := string(m.Value) - _valueErr := writeBuffer.WriteString("value", uint32(m.ActualLengthInBit), "ASCII", (value)) + _valueErr := writeBuffer.WriteString("value", uint32(m.GetActualLengthInBit()), "ASCII", (value)) if _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go index 718a7361675..62a5d729571 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go @@ -35,10 +35,10 @@ type BACnetTagPayloadReal struct { type IBACnetTagPayloadReal interface { // GetValue returns Value GetValue() float32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *BACnetTagPayloadReal) GetValue() float32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBACnetTagPayloadReal factory function for BACnetTagPayloadReal func NewBACnetTagPayloadReal(value float32) *BACnetTagPayloadReal { return &BACnetTagPayloadReal{Value: value} } @@ -75,11 +76,11 @@ func (m *BACnetTagPayloadReal) GetTypeName() string { return "BACnetTagPayloadReal" } -func (m *BACnetTagPayloadReal) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadReal) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadReal) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadReal) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (value) @@ -88,8 +89,8 @@ func (m *BACnetTagPayloadReal) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetTagPayloadReal) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadReal) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadRealParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadReal, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go index d6f087fa79e..ef42b77a4ab 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go @@ -28,23 +28,17 @@ import ( // The data-structure of this message type BACnetTagPayloadSignedInteger struct { - ValueInt8 *int8 - ValueInt16 *int16 - ValueInt24 *int32 - ValueInt32 *int32 - ValueInt40 *int64 - ValueInt48 *int64 - ValueInt56 *int64 - ValueInt64 *int64 - IsInt8 bool - IsInt16 bool - IsInt24 bool - IsInt32 bool - IsInt40 bool - IsInt48 bool - IsInt56 bool - IsInt64 bool - ActualValue uint64 + ValueInt8 *int8 + ValueInt16 *int16 + ValueInt24 *int32 + ValueInt32 *int32 + ValueInt40 *int64 + ValueInt48 *int64 + ValueInt56 *int64 + ValueInt64 *int64 + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -83,10 +77,10 @@ type IBACnetTagPayloadSignedInteger interface { GetIsInt64() bool // GetActualValue returns ActualValue GetActualValue() uint64 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -130,52 +124,202 @@ func (m *BACnetTagPayloadSignedInteger) GetValueInt64() *int64 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadSignedInteger) GetIsInt8() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt8 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (1)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt16() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt16 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (2)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt24() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt24 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (3)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt32() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt32 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (4)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt40() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt40 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (5)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt48() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt48 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (6)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt56() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt56 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (7)) } func (m *BACnetTagPayloadSignedInteger) GetIsInt64() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsInt64 + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return bool((m.ActualLength) == (8)) } func (m *BACnetTagPayloadSignedInteger) GetActualValue() uint64 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + valueInt8 := m.ValueInt8 + _ = valueInt8 + valueInt16 := m.ValueInt16 + _ = valueInt16 + valueInt24 := m.ValueInt24 + _ = valueInt24 + valueInt32 := m.ValueInt32 + _ = valueInt32 + valueInt40 := m.ValueInt40 + _ = valueInt40 + valueInt48 := m.ValueInt48 + _ = valueInt48 + valueInt56 := m.ValueInt56 + _ = valueInt56 + valueInt64 := m.ValueInt64 + _ = valueInt64 + return utils.InlineIf(m.GetIsInt8(), func() interface{} { return uint64((*m.GetValueInt8())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt16(), func() interface{} { return uint64((*m.GetValueInt16())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt24(), func() interface{} { return uint64((*m.GetValueInt24())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt32(), func() interface{} { return uint64((*m.GetValueInt32())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt40(), func() interface{} { return uint64((*m.GetValueInt40())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt48(), func() interface{} { return uint64((*m.GetValueInt48())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt56(), func() interface{} { return uint64((*m.GetValueInt56())) }, func() interface{} { + return uint64(uint64(utils.InlineIf(m.GetIsInt64(), func() interface{} { return uint64((*m.GetValueInt64())) }, func() interface{} { return uint64(uint64(0)) }).(uint64))) + }).(uint64))) + }).(uint64))) + }).(uint64))) + }).(uint64))) + }).(uint64))) + }).(uint64))) + }).(uint64) } -func NewBACnetTagPayloadSignedInteger(valueInt8 *int8, valueInt16 *int16, valueInt24 *int32, valueInt32 *int32, valueInt40 *int64, valueInt48 *int64, valueInt56 *int64, valueInt64 *int64, isInt8 bool, isInt16 bool, isInt24 bool, isInt32 bool, isInt40 bool, isInt48 bool, isInt56 bool, isInt64 bool, actualValue uint64) *BACnetTagPayloadSignedInteger { - return &BACnetTagPayloadSignedInteger{ValueInt8: valueInt8, ValueInt16: valueInt16, ValueInt24: valueInt24, ValueInt32: valueInt32, ValueInt40: valueInt40, ValueInt48: valueInt48, ValueInt56: valueInt56, ValueInt64: valueInt64, IsInt8: isInt8, IsInt16: isInt16, IsInt24: isInt24, IsInt32: isInt32, IsInt40: isInt40, IsInt48: isInt48, IsInt56: isInt56, IsInt64: isInt64, ActualValue: actualValue} +// NewBACnetTagPayloadSignedInteger factory function for BACnetTagPayloadSignedInteger +func NewBACnetTagPayloadSignedInteger(valueInt8 *int8, valueInt16 *int16, valueInt24 *int32, valueInt32 *int32, valueInt40 *int64, valueInt48 *int64, valueInt56 *int64, valueInt64 *int64, actualLength uint32) *BACnetTagPayloadSignedInteger { + return &BACnetTagPayloadSignedInteger{ValueInt8: valueInt8, ValueInt16: valueInt16, ValueInt24: valueInt24, ValueInt32: valueInt32, ValueInt40: valueInt40, ValueInt48: valueInt48, ValueInt56: valueInt56, ValueInt64: valueInt64, ActualLength: actualLength} } func CastBACnetTagPayloadSignedInteger(structType interface{}) *BACnetTagPayloadSignedInteger { @@ -195,11 +339,11 @@ func (m *BACnetTagPayloadSignedInteger) GetTypeName() string { return "BACnetTagPayloadSignedInteger" } -func (m *BACnetTagPayloadSignedInteger) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadSignedInteger) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadSignedInteger) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadSignedInteger) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. @@ -263,8 +407,8 @@ func (m *BACnetTagPayloadSignedInteger) LengthInBitsConditional(lastItem bool) u return lengthInBits } -func (m *BACnetTagPayloadSignedInteger) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadSignedInteger) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadSignedInteger, error) { @@ -275,6 +419,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt8 := bool((actualLength) == (1)) isInt8 := bool(_isInt8) + _ = isInt8 // Optional Field (valueInt8) (Can be skipped, if a given expression evaluates to false) var valueInt8 *int8 = nil @@ -289,6 +434,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt16 := bool((actualLength) == (2)) isInt16 := bool(_isInt16) + _ = isInt16 // Optional Field (valueInt16) (Can be skipped, if a given expression evaluates to false) var valueInt16 *int16 = nil @@ -303,6 +449,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt24 := bool((actualLength) == (3)) isInt24 := bool(_isInt24) + _ = isInt24 // Optional Field (valueInt24) (Can be skipped, if a given expression evaluates to false) var valueInt24 *int32 = nil @@ -317,6 +464,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt32 := bool((actualLength) == (4)) isInt32 := bool(_isInt32) + _ = isInt32 // Optional Field (valueInt32) (Can be skipped, if a given expression evaluates to false) var valueInt32 *int32 = nil @@ -331,6 +479,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt40 := bool((actualLength) == (5)) isInt40 := bool(_isInt40) + _ = isInt40 // Optional Field (valueInt40) (Can be skipped, if a given expression evaluates to false) var valueInt40 *int64 = nil @@ -345,6 +494,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt48 := bool((actualLength) == (6)) isInt48 := bool(_isInt48) + _ = isInt48 // Optional Field (valueInt48) (Can be skipped, if a given expression evaluates to false) var valueInt48 *int64 = nil @@ -359,6 +509,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt56 := bool((actualLength) == (7)) isInt56 := bool(_isInt56) + _ = isInt56 // Optional Field (valueInt56) (Can be skipped, if a given expression evaluates to false) var valueInt56 *int64 = nil @@ -373,6 +524,7 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt // Virtual field _isInt64 := bool((actualLength) == (8)) isInt64 := bool(_isInt64) + _ = isInt64 // Optional Field (valueInt64) (Can be skipped, if a given expression evaluates to false) var valueInt64 *int64 = nil @@ -401,13 +553,14 @@ func BACnetTagPayloadSignedIntegerParse(readBuffer utils.ReadBuffer, actualLengt }).(uint64))) }).(uint64) actualValue := uint64(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetTagPayloadSignedInteger"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagPayloadSignedInteger(valueInt8, valueInt16, valueInt24, valueInt32, valueInt40, valueInt48, valueInt56, valueInt64, isInt8, isInt16, isInt24, isInt32, isInt40, isInt48, isInt56, isInt64, actualValue), nil + return NewBACnetTagPayloadSignedInteger(valueInt8, valueInt16, valueInt24, valueInt32, valueInt40, valueInt48, valueInt56, valueInt64, actualLength), nil } func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) error { @@ -415,7 +568,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) return pushErr } // Virtual field - if _isInt8Err := writeBuffer.WriteVirtual("isInt8", m.IsInt8); _isInt8Err != nil { + if _isInt8Err := writeBuffer.WriteVirtual("isInt8", m.GetIsInt8()); _isInt8Err != nil { return errors.Wrap(_isInt8Err, "Error serializing 'isInt8' field") } @@ -429,7 +582,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt16Err := writeBuffer.WriteVirtual("isInt16", m.IsInt16); _isInt16Err != nil { + if _isInt16Err := writeBuffer.WriteVirtual("isInt16", m.GetIsInt16()); _isInt16Err != nil { return errors.Wrap(_isInt16Err, "Error serializing 'isInt16' field") } @@ -443,7 +596,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt24Err := writeBuffer.WriteVirtual("isInt24", m.IsInt24); _isInt24Err != nil { + if _isInt24Err := writeBuffer.WriteVirtual("isInt24", m.GetIsInt24()); _isInt24Err != nil { return errors.Wrap(_isInt24Err, "Error serializing 'isInt24' field") } @@ -457,7 +610,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt32Err := writeBuffer.WriteVirtual("isInt32", m.IsInt32); _isInt32Err != nil { + if _isInt32Err := writeBuffer.WriteVirtual("isInt32", m.GetIsInt32()); _isInt32Err != nil { return errors.Wrap(_isInt32Err, "Error serializing 'isInt32' field") } @@ -471,7 +624,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt40Err := writeBuffer.WriteVirtual("isInt40", m.IsInt40); _isInt40Err != nil { + if _isInt40Err := writeBuffer.WriteVirtual("isInt40", m.GetIsInt40()); _isInt40Err != nil { return errors.Wrap(_isInt40Err, "Error serializing 'isInt40' field") } @@ -485,7 +638,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt48Err := writeBuffer.WriteVirtual("isInt48", m.IsInt48); _isInt48Err != nil { + if _isInt48Err := writeBuffer.WriteVirtual("isInt48", m.GetIsInt48()); _isInt48Err != nil { return errors.Wrap(_isInt48Err, "Error serializing 'isInt48' field") } @@ -499,7 +652,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt56Err := writeBuffer.WriteVirtual("isInt56", m.IsInt56); _isInt56Err != nil { + if _isInt56Err := writeBuffer.WriteVirtual("isInt56", m.GetIsInt56()); _isInt56Err != nil { return errors.Wrap(_isInt56Err, "Error serializing 'isInt56' field") } @@ -513,7 +666,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _isInt64Err := writeBuffer.WriteVirtual("isInt64", m.IsInt64); _isInt64Err != nil { + if _isInt64Err := writeBuffer.WriteVirtual("isInt64", m.GetIsInt64()); _isInt64Err != nil { return errors.Wrap(_isInt64Err, "Error serializing 'isInt64' field") } @@ -527,7 +680,7 @@ func (m *BACnetTagPayloadSignedInteger) Serialize(writeBuffer utils.WriteBuffer) } } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go index 73c1653c6a2..e2dce962292 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go @@ -28,29 +28,24 @@ import ( // The data-structure of this message type BACnetTagPayloadTime struct { - Hour int8 - Minute int8 - Second int8 - Fractional int8 - Wildcard int8 - HourIsWildcard bool - MinuteIsWildcard bool - SecondIsWildcard bool - FractionalIsWildcard bool + Hour uint8 + Minute uint8 + Second uint8 + Fractional uint8 } // The corresponding interface type IBACnetTagPayloadTime interface { // GetHour returns Hour - GetHour() int8 + GetHour() uint8 // GetMinute returns Minute - GetMinute() int8 + GetMinute() uint8 // GetSecond returns Second - GetSecond() int8 + GetSecond() uint8 // GetFractional returns Fractional - GetFractional() int8 + GetFractional() uint8 // GetWildcard returns Wildcard - GetWildcard() int8 + GetWildcard() uint8 // GetHourIsWildcard returns HourIsWildcard GetHourIsWildcard() bool // GetMinuteIsWildcard returns MinuteIsWildcard @@ -59,10 +54,10 @@ type IBACnetTagPayloadTime interface { GetSecondIsWildcard() bool // GetFractionalIsWildcard returns FractionalIsWildcard GetFractionalIsWildcard() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,52 +65,48 @@ type IBACnetTagPayloadTime interface { /////////////////////////////////////////////////////////// // Accessors for property fields. /////////////////////////////////////////////////////////// -func (m *BACnetTagPayloadTime) GetHour() int8 { +func (m *BACnetTagPayloadTime) GetHour() uint8 { return m.Hour } -func (m *BACnetTagPayloadTime) GetMinute() int8 { +func (m *BACnetTagPayloadTime) GetMinute() uint8 { return m.Minute } -func (m *BACnetTagPayloadTime) GetSecond() int8 { +func (m *BACnetTagPayloadTime) GetSecond() uint8 { return m.Second } -func (m *BACnetTagPayloadTime) GetFractional() int8 { +func (m *BACnetTagPayloadTime) GetFractional() uint8 { return m.Fractional } /////////////////////////////////////////////////////////// // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func (m *BACnetTagPayloadTime) GetWildcard() int8 { - // TODO: calculation should happen here instead accessing the stored field - return m.Wildcard +func (m *BACnetTagPayloadTime) GetWildcard() uint8 { + return 0xFF } func (m *BACnetTagPayloadTime) GetHourIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.HourIsWildcard + return bool((m.GetHour()) == (m.GetWildcard())) } func (m *BACnetTagPayloadTime) GetMinuteIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.MinuteIsWildcard + return bool((m.GetMinute()) == (m.GetWildcard())) } func (m *BACnetTagPayloadTime) GetSecondIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.SecondIsWildcard + return bool((m.GetSecond()) == (m.GetWildcard())) } func (m *BACnetTagPayloadTime) GetFractionalIsWildcard() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.FractionalIsWildcard + return bool((m.GetFractional()) == (m.GetWildcard())) } -func NewBACnetTagPayloadTime(hour int8, minute int8, second int8, fractional int8, wildcard int8, hourIsWildcard bool, minuteIsWildcard bool, secondIsWildcard bool, fractionalIsWildcard bool) *BACnetTagPayloadTime { - return &BACnetTagPayloadTime{Hour: hour, Minute: minute, Second: second, Fractional: fractional, Wildcard: wildcard, HourIsWildcard: hourIsWildcard, MinuteIsWildcard: minuteIsWildcard, SecondIsWildcard: secondIsWildcard, FractionalIsWildcard: fractionalIsWildcard} +// NewBACnetTagPayloadTime factory function for BACnetTagPayloadTime +func NewBACnetTagPayloadTime(hour uint8, minute uint8, second uint8, fractional uint8) *BACnetTagPayloadTime { + return &BACnetTagPayloadTime{Hour: hour, Minute: minute, Second: second, Fractional: fractional} } func CastBACnetTagPayloadTime(structType interface{}) *BACnetTagPayloadTime { @@ -135,11 +126,11 @@ func (m *BACnetTagPayloadTime) GetTypeName() string { return "BACnetTagPayloadTime" } -func (m *BACnetTagPayloadTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadTime) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadTime) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. @@ -167,8 +158,8 @@ func (m *BACnetTagPayloadTime) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BACnetTagPayloadTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadTimeParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadTime, error) { @@ -178,10 +169,11 @@ func BACnetTagPayloadTimeParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadTi // Virtual field _wildcard := 0xFF - wildcard := int8(_wildcard) + wildcard := uint8(_wildcard) + _ = wildcard // Simple Field (hour) - _hour, _hourErr := readBuffer.ReadInt8("hour", 8) + _hour, _hourErr := readBuffer.ReadUint8("hour", 8) if _hourErr != nil { return nil, errors.Wrap(_hourErr, "Error parsing 'hour' field") } @@ -190,9 +182,10 @@ func BACnetTagPayloadTimeParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadTi // Virtual field _hourIsWildcard := bool((hour) == (wildcard)) hourIsWildcard := bool(_hourIsWildcard) + _ = hourIsWildcard // Simple Field (minute) - _minute, _minuteErr := readBuffer.ReadInt8("minute", 8) + _minute, _minuteErr := readBuffer.ReadUint8("minute", 8) if _minuteErr != nil { return nil, errors.Wrap(_minuteErr, "Error parsing 'minute' field") } @@ -201,9 +194,10 @@ func BACnetTagPayloadTimeParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadTi // Virtual field _minuteIsWildcard := bool((minute) == (wildcard)) minuteIsWildcard := bool(_minuteIsWildcard) + _ = minuteIsWildcard // Simple Field (second) - _second, _secondErr := readBuffer.ReadInt8("second", 8) + _second, _secondErr := readBuffer.ReadUint8("second", 8) if _secondErr != nil { return nil, errors.Wrap(_secondErr, "Error parsing 'second' field") } @@ -212,9 +206,10 @@ func BACnetTagPayloadTimeParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadTi // Virtual field _secondIsWildcard := bool((second) == (wildcard)) secondIsWildcard := bool(_secondIsWildcard) + _ = secondIsWildcard // Simple Field (fractional) - _fractional, _fractionalErr := readBuffer.ReadInt8("fractional", 8) + _fractional, _fractionalErr := readBuffer.ReadUint8("fractional", 8) if _fractionalErr != nil { return nil, errors.Wrap(_fractionalErr, "Error parsing 'fractional' field") } @@ -223,13 +218,14 @@ func BACnetTagPayloadTimeParse(readBuffer utils.ReadBuffer) (*BACnetTagPayloadTi // Virtual field _fractionalIsWildcard := bool((fractional) == (wildcard)) fractionalIsWildcard := bool(_fractionalIsWildcard) + _ = fractionalIsWildcard if closeErr := readBuffer.CloseContext("BACnetTagPayloadTime"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagPayloadTime(hour, minute, second, fractional, wildcard, hourIsWildcard, minuteIsWildcard, secondIsWildcard, fractionalIsWildcard), nil + return NewBACnetTagPayloadTime(hour, minute, second, fractional), nil } func (m *BACnetTagPayloadTime) Serialize(writeBuffer utils.WriteBuffer) error { @@ -237,51 +233,51 @@ func (m *BACnetTagPayloadTime) Serialize(writeBuffer utils.WriteBuffer) error { return pushErr } // Virtual field - if _wildcardErr := writeBuffer.WriteVirtual("wildcard", m.Wildcard); _wildcardErr != nil { + if _wildcardErr := writeBuffer.WriteVirtual("wildcard", m.GetWildcard()); _wildcardErr != nil { return errors.Wrap(_wildcardErr, "Error serializing 'wildcard' field") } // Simple Field (hour) - hour := int8(m.Hour) - _hourErr := writeBuffer.WriteInt8("hour", 8, (hour)) + hour := uint8(m.Hour) + _hourErr := writeBuffer.WriteUint8("hour", 8, (hour)) if _hourErr != nil { return errors.Wrap(_hourErr, "Error serializing 'hour' field") } // Virtual field - if _hourIsWildcardErr := writeBuffer.WriteVirtual("hourIsWildcard", m.HourIsWildcard); _hourIsWildcardErr != nil { + if _hourIsWildcardErr := writeBuffer.WriteVirtual("hourIsWildcard", m.GetHourIsWildcard()); _hourIsWildcardErr != nil { return errors.Wrap(_hourIsWildcardErr, "Error serializing 'hourIsWildcard' field") } // Simple Field (minute) - minute := int8(m.Minute) - _minuteErr := writeBuffer.WriteInt8("minute", 8, (minute)) + minute := uint8(m.Minute) + _minuteErr := writeBuffer.WriteUint8("minute", 8, (minute)) if _minuteErr != nil { return errors.Wrap(_minuteErr, "Error serializing 'minute' field") } // Virtual field - if _minuteIsWildcardErr := writeBuffer.WriteVirtual("minuteIsWildcard", m.MinuteIsWildcard); _minuteIsWildcardErr != nil { + if _minuteIsWildcardErr := writeBuffer.WriteVirtual("minuteIsWildcard", m.GetMinuteIsWildcard()); _minuteIsWildcardErr != nil { return errors.Wrap(_minuteIsWildcardErr, "Error serializing 'minuteIsWildcard' field") } // Simple Field (second) - second := int8(m.Second) - _secondErr := writeBuffer.WriteInt8("second", 8, (second)) + second := uint8(m.Second) + _secondErr := writeBuffer.WriteUint8("second", 8, (second)) if _secondErr != nil { return errors.Wrap(_secondErr, "Error serializing 'second' field") } // Virtual field - if _secondIsWildcardErr := writeBuffer.WriteVirtual("secondIsWildcard", m.SecondIsWildcard); _secondIsWildcardErr != nil { + if _secondIsWildcardErr := writeBuffer.WriteVirtual("secondIsWildcard", m.GetSecondIsWildcard()); _secondIsWildcardErr != nil { return errors.Wrap(_secondIsWildcardErr, "Error serializing 'secondIsWildcard' field") } // Simple Field (fractional) - fractional := int8(m.Fractional) - _fractionalErr := writeBuffer.WriteInt8("fractional", 8, (fractional)) + fractional := uint8(m.Fractional) + _fractionalErr := writeBuffer.WriteUint8("fractional", 8, (fractional)) if _fractionalErr != nil { return errors.Wrap(_fractionalErr, "Error serializing 'fractional' field") } // Virtual field - if _fractionalIsWildcardErr := writeBuffer.WriteVirtual("fractionalIsWildcard", m.FractionalIsWildcard); _fractionalIsWildcardErr != nil { + if _fractionalIsWildcardErr := writeBuffer.WriteVirtual("fractionalIsWildcard", m.GetFractionalIsWildcard()); _fractionalIsWildcardErr != nil { return errors.Wrap(_fractionalIsWildcardErr, "Error serializing 'fractionalIsWildcard' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go index 394ea077f48..15b2e6d330c 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go @@ -32,11 +32,9 @@ type BACnetTagPayloadUnsignedInteger struct { ValueUint16 *uint16 ValueUint24 *uint32 ValueUint32 *uint32 - IsUint8 bool - IsUint16 bool - IsUint24 bool - IsUint32 bool - ActualValue uint32 + + // Arguments. + ActualLength uint32 } // The corresponding interface @@ -59,10 +57,10 @@ type IBACnetTagPayloadUnsignedInteger interface { GetIsUint32() bool // GetActualValue returns ActualValue GetActualValue() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,32 +88,74 @@ func (m *BACnetTagPayloadUnsignedInteger) GetValueUint32() *uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTagPayloadUnsignedInteger) GetIsUint8() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsUint8 + valueUint8 := m.ValueUint8 + _ = valueUint8 + valueUint16 := m.ValueUint16 + _ = valueUint16 + valueUint24 := m.ValueUint24 + _ = valueUint24 + valueUint32 := m.ValueUint32 + _ = valueUint32 + return bool((m.ActualLength) == (1)) } func (m *BACnetTagPayloadUnsignedInteger) GetIsUint16() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsUint16 + valueUint8 := m.ValueUint8 + _ = valueUint8 + valueUint16 := m.ValueUint16 + _ = valueUint16 + valueUint24 := m.ValueUint24 + _ = valueUint24 + valueUint32 := m.ValueUint32 + _ = valueUint32 + return bool((m.ActualLength) == (2)) } func (m *BACnetTagPayloadUnsignedInteger) GetIsUint24() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsUint24 + valueUint8 := m.ValueUint8 + _ = valueUint8 + valueUint16 := m.ValueUint16 + _ = valueUint16 + valueUint24 := m.ValueUint24 + _ = valueUint24 + valueUint32 := m.ValueUint32 + _ = valueUint32 + return bool((m.ActualLength) == (3)) } func (m *BACnetTagPayloadUnsignedInteger) GetIsUint32() bool { - // TODO: calculation should happen here instead accessing the stored field - return m.IsUint32 + valueUint8 := m.ValueUint8 + _ = valueUint8 + valueUint16 := m.ValueUint16 + _ = valueUint16 + valueUint24 := m.ValueUint24 + _ = valueUint24 + valueUint32 := m.ValueUint32 + _ = valueUint32 + return bool((m.ActualLength) == (4)) } func (m *BACnetTagPayloadUnsignedInteger) GetActualValue() uint32 { - // TODO: calculation should happen here instead accessing the stored field - return m.ActualValue + valueUint8 := m.ValueUint8 + _ = valueUint8 + valueUint16 := m.ValueUint16 + _ = valueUint16 + valueUint24 := m.ValueUint24 + _ = valueUint24 + valueUint32 := m.ValueUint32 + _ = valueUint32 + return utils.InlineIf(m.GetIsUint8(), func() interface{} { return uint32((*m.GetValueUint8())) }, func() interface{} { + return uint32(uint32(utils.InlineIf(m.GetIsUint16(), func() interface{} { return uint32((*m.GetValueUint16())) }, func() interface{} { + return uint32(uint32(utils.InlineIf(m.GetIsUint24(), func() interface{} { return uint32((*m.GetValueUint24())) }, func() interface{} { + return uint32(uint32(utils.InlineIf(m.GetIsUint32(), func() interface{} { return uint32((*m.GetValueUint32())) }, func() interface{} { return uint32(uint32(0)) }).(uint32))) + }).(uint32))) + }).(uint32))) + }).(uint32) } -func NewBACnetTagPayloadUnsignedInteger(valueUint8 *uint8, valueUint16 *uint16, valueUint24 *uint32, valueUint32 *uint32, isUint8 bool, isUint16 bool, isUint24 bool, isUint32 bool, actualValue uint32) *BACnetTagPayloadUnsignedInteger { - return &BACnetTagPayloadUnsignedInteger{ValueUint8: valueUint8, ValueUint16: valueUint16, ValueUint24: valueUint24, ValueUint32: valueUint32, IsUint8: isUint8, IsUint16: isUint16, IsUint24: isUint24, IsUint32: isUint32, ActualValue: actualValue} +// NewBACnetTagPayloadUnsignedInteger factory function for BACnetTagPayloadUnsignedInteger +func NewBACnetTagPayloadUnsignedInteger(valueUint8 *uint8, valueUint16 *uint16, valueUint24 *uint32, valueUint32 *uint32, actualLength uint32) *BACnetTagPayloadUnsignedInteger { + return &BACnetTagPayloadUnsignedInteger{ValueUint8: valueUint8, ValueUint16: valueUint16, ValueUint24: valueUint24, ValueUint32: valueUint32, ActualLength: actualLength} } func CastBACnetTagPayloadUnsignedInteger(structType interface{}) *BACnetTagPayloadUnsignedInteger { @@ -135,11 +175,11 @@ func (m *BACnetTagPayloadUnsignedInteger) GetTypeName() string { return "BACnetTagPayloadUnsignedInteger" } -func (m *BACnetTagPayloadUnsignedInteger) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTagPayloadUnsignedInteger) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTagPayloadUnsignedInteger) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BACnetTagPayloadUnsignedInteger) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // A virtual field doesn't have any in- or output. @@ -175,8 +215,8 @@ func (m *BACnetTagPayloadUnsignedInteger) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *BACnetTagPayloadUnsignedInteger) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTagPayloadUnsignedInteger) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTagPayloadUnsignedIntegerParse(readBuffer utils.ReadBuffer, actualLength uint32) (*BACnetTagPayloadUnsignedInteger, error) { @@ -187,6 +227,7 @@ func BACnetTagPayloadUnsignedIntegerParse(readBuffer utils.ReadBuffer, actualLen // Virtual field _isUint8 := bool((actualLength) == (1)) isUint8 := bool(_isUint8) + _ = isUint8 // Optional Field (valueUint8) (Can be skipped, if a given expression evaluates to false) var valueUint8 *uint8 = nil @@ -201,6 +242,7 @@ func BACnetTagPayloadUnsignedIntegerParse(readBuffer utils.ReadBuffer, actualLen // Virtual field _isUint16 := bool((actualLength) == (2)) isUint16 := bool(_isUint16) + _ = isUint16 // Optional Field (valueUint16) (Can be skipped, if a given expression evaluates to false) var valueUint16 *uint16 = nil @@ -215,6 +257,7 @@ func BACnetTagPayloadUnsignedIntegerParse(readBuffer utils.ReadBuffer, actualLen // Virtual field _isUint24 := bool((actualLength) == (3)) isUint24 := bool(_isUint24) + _ = isUint24 // Optional Field (valueUint24) (Can be skipped, if a given expression evaluates to false) var valueUint24 *uint32 = nil @@ -229,6 +272,7 @@ func BACnetTagPayloadUnsignedIntegerParse(readBuffer utils.ReadBuffer, actualLen // Virtual field _isUint32 := bool((actualLength) == (4)) isUint32 := bool(_isUint32) + _ = isUint32 // Optional Field (valueUint32) (Can be skipped, if a given expression evaluates to false) var valueUint32 *uint32 = nil @@ -249,13 +293,14 @@ func BACnetTagPayloadUnsignedIntegerParse(readBuffer utils.ReadBuffer, actualLen }).(uint32))) }).(uint32) actualValue := uint32(_actualValue) + _ = actualValue if closeErr := readBuffer.CloseContext("BACnetTagPayloadUnsignedInteger"); closeErr != nil { return nil, closeErr } // Create the instance - return NewBACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, isUint8, isUint16, isUint24, isUint32, actualValue), nil + return NewBACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, actualLength), nil } func (m *BACnetTagPayloadUnsignedInteger) Serialize(writeBuffer utils.WriteBuffer) error { @@ -263,7 +308,7 @@ func (m *BACnetTagPayloadUnsignedInteger) Serialize(writeBuffer utils.WriteBuffe return pushErr } // Virtual field - if _isUint8Err := writeBuffer.WriteVirtual("isUint8", m.IsUint8); _isUint8Err != nil { + if _isUint8Err := writeBuffer.WriteVirtual("isUint8", m.GetIsUint8()); _isUint8Err != nil { return errors.Wrap(_isUint8Err, "Error serializing 'isUint8' field") } @@ -277,7 +322,7 @@ func (m *BACnetTagPayloadUnsignedInteger) Serialize(writeBuffer utils.WriteBuffe } } // Virtual field - if _isUint16Err := writeBuffer.WriteVirtual("isUint16", m.IsUint16); _isUint16Err != nil { + if _isUint16Err := writeBuffer.WriteVirtual("isUint16", m.GetIsUint16()); _isUint16Err != nil { return errors.Wrap(_isUint16Err, "Error serializing 'isUint16' field") } @@ -291,7 +336,7 @@ func (m *BACnetTagPayloadUnsignedInteger) Serialize(writeBuffer utils.WriteBuffe } } // Virtual field - if _isUint24Err := writeBuffer.WriteVirtual("isUint24", m.IsUint24); _isUint24Err != nil { + if _isUint24Err := writeBuffer.WriteVirtual("isUint24", m.GetIsUint24()); _isUint24Err != nil { return errors.Wrap(_isUint24Err, "Error serializing 'isUint24' field") } @@ -305,7 +350,7 @@ func (m *BACnetTagPayloadUnsignedInteger) Serialize(writeBuffer utils.WriteBuffe } } // Virtual field - if _isUint32Err := writeBuffer.WriteVirtual("isUint32", m.IsUint32); _isUint32Err != nil { + if _isUint32Err := writeBuffer.WriteVirtual("isUint32", m.GetIsUint32()); _isUint32Err != nil { return errors.Wrap(_isUint32Err, "Error serializing 'isUint32' field") } @@ -319,7 +364,7 @@ func (m *BACnetTagPayloadUnsignedInteger) Serialize(writeBuffer utils.WriteBuffe } } // Virtual field - if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.ActualValue); _actualValueErr != nil { + if _actualValueErr := writeBuffer.WriteVirtual("actualValue", m.GetActualValue()); _actualValueErr != nil { return errors.Wrap(_actualValueErr, "Error serializing 'actualValue' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go index bccc43494b1..a2ca7932baa 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go @@ -31,8 +31,10 @@ type BACnetTimeStamp struct { OpeningTag *BACnetOpeningTag PeekedTagHeader *BACnetTagHeader ClosingTag *BACnetClosingTag - PeekedTagNumber uint8 - Child IBACnetTimeStampChild + + // Arguments. + TagNumber uint8 + Child IBACnetTimeStampChild } // The corresponding interface @@ -47,10 +49,10 @@ type IBACnetTimeStamp interface { GetClosingTag() *BACnetClosingTag // GetPeekedTagNumber returns PeekedTagNumber GetPeekedTagNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,7 +64,7 @@ type IBACnetTimeStampParent interface { type IBACnetTimeStampChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) + InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) GetTypeName() string IBACnetTimeStamp } @@ -86,12 +88,12 @@ func (m *BACnetTimeStamp) GetClosingTag() *BACnetClosingTag { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BACnetTimeStamp) GetPeekedTagNumber() uint8 { - // TODO: calculation should happen here instead accessing the stored field - return m.PeekedTagNumber + return m.GetPeekedTagHeader().GetActualTagNumber() } -func NewBACnetTimeStamp(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetTimeStamp { - return &BACnetTimeStamp{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, PeekedTagNumber: peekedTagNumber} +// NewBACnetTimeStamp factory function for BACnetTimeStamp +func NewBACnetTimeStamp(openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetTimeStamp { + return &BACnetTimeStamp{OpeningTag: openingTag, PeekedTagHeader: peekedTagHeader, ClosingTag: closingTag, TagNumber: tagNumber} } func CastBACnetTimeStamp(structType interface{}) *BACnetTimeStamp { @@ -111,30 +113,30 @@ func (m *BACnetTimeStamp) GetTypeName() string { return "BACnetTimeStamp" } -func (m *BACnetTimeStamp) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTimeStamp) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTimeStamp) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetTimeStamp) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetTimeStamp) ParentLengthInBits() uint16 { +func (m *BACnetTimeStamp) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (openingTag) - lengthInBits += m.OpeningTag.LengthInBits() + lengthInBits += m.OpeningTag.GetLengthInBits() // A virtual field doesn't have any in- or output. // Simple field (closingTag) - lengthInBits += m.ClosingTag.LengthInBits() + lengthInBits += m.ClosingTag.GetLengthInBits() return lengthInBits } -func (m *BACnetTimeStamp) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTimeStamp) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTimeStampParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetTimeStamp, error) { @@ -164,8 +166,9 @@ func BACnetTimeStampParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnet readBuffer.Reset(currentPos) // Virtual field - _peekedTagNumber := peekedTagHeader.ActualTagNumber + _peekedTagNumber := peekedTagHeader.GetActualTagNumber() peekedTagNumber := uint8(_peekedTagNumber) + _ = peekedTagNumber // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BACnetTimeStamp @@ -203,7 +206,7 @@ func BACnetTimeStampParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnet } // Finish initializing - _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag, peekedTagNumber) + _parent.Child.InitializeParent(_parent, openingTag, peekedTagHeader, closingTag) return _parent, nil } @@ -228,7 +231,7 @@ func (m *BACnetTimeStamp) SerializeParent(writeBuffer utils.WriteBuffer, child I return errors.Wrap(_openingTagErr, "Error serializing 'openingTag' field") } // Virtual field - if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.PeekedTagNumber); _peekedTagNumberErr != nil { + if _peekedTagNumberErr := writeBuffer.WriteVirtual("peekedTagNumber", m.GetPeekedTagNumber()); _peekedTagNumberErr != nil { return errors.Wrap(_peekedTagNumberErr, "Error serializing 'peekedTagNumber' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go index 6dffb934637..92bfaf8e904 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go @@ -30,16 +30,19 @@ import ( type BACnetTimeStampDateTime struct { *BACnetTimeStamp DateTimeValue *BACnetDateTime + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetTimeStampDateTime interface { // GetDateTimeValue returns DateTimeValue GetDateTimeValue() *BACnetDateTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +58,10 @@ func (m *BACnetTimeStampDateTime) GetPeekedTagNumber() uint8 { return uint8(2) } -func (m *BACnetTimeStampDateTime) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetTimeStampDateTime) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetTimeStamp.OpeningTag = openingTag m.BACnetTimeStamp.PeekedTagHeader = peekedTagHeader m.BACnetTimeStamp.ClosingTag = closingTag - m.BACnetTimeStamp.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -73,10 +75,11 @@ func (m *BACnetTimeStampDateTime) GetDateTimeValue() *BACnetDateTime { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetTimeStampDateTime(dateTimeValue *BACnetDateTime, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetTimeStamp { +// NewBACnetTimeStampDateTime factory function for BACnetTimeStampDateTime +func NewBACnetTimeStampDateTime(dateTimeValue *BACnetDateTime, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetTimeStamp { child := &BACnetTimeStampDateTime{ DateTimeValue: dateTimeValue, - BACnetTimeStamp: NewBACnetTimeStamp(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetTimeStamp: NewBACnetTimeStamp(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetTimeStamp @@ -105,21 +108,21 @@ func (m *BACnetTimeStampDateTime) GetTypeName() string { return "BACnetTimeStampDateTime" } -func (m *BACnetTimeStampDateTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTimeStampDateTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTimeStampDateTime) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetTimeStampDateTime) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (dateTimeValue) - lengthInBits += m.DateTimeValue.LengthInBits() + lengthInBits += m.DateTimeValue.GetLengthInBits() return lengthInBits } -func (m *BACnetTimeStampDateTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTimeStampDateTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTimeStampDateTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetTimeStamp, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go index 83fe104824f..c5d2ea92058 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go @@ -30,16 +30,19 @@ import ( type BACnetTimeStampSequence struct { *BACnetTimeStamp SequenceNumber *BACnetContextTagUnsignedInteger + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetTimeStampSequence interface { // GetSequenceNumber returns SequenceNumber GetSequenceNumber() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +58,10 @@ func (m *BACnetTimeStampSequence) GetPeekedTagNumber() uint8 { return uint8(1) } -func (m *BACnetTimeStampSequence) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetTimeStampSequence) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetTimeStamp.OpeningTag = openingTag m.BACnetTimeStamp.PeekedTagHeader = peekedTagHeader m.BACnetTimeStamp.ClosingTag = closingTag - m.BACnetTimeStamp.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -73,10 +75,11 @@ func (m *BACnetTimeStampSequence) GetSequenceNumber() *BACnetContextTagUnsignedI // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetTimeStampSequence(sequenceNumber *BACnetContextTagUnsignedInteger, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetTimeStamp { +// NewBACnetTimeStampSequence factory function for BACnetTimeStampSequence +func NewBACnetTimeStampSequence(sequenceNumber *BACnetContextTagUnsignedInteger, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetTimeStamp { child := &BACnetTimeStampSequence{ SequenceNumber: sequenceNumber, - BACnetTimeStamp: NewBACnetTimeStamp(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetTimeStamp: NewBACnetTimeStamp(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetTimeStamp @@ -105,21 +108,21 @@ func (m *BACnetTimeStampSequence) GetTypeName() string { return "BACnetTimeStampSequence" } -func (m *BACnetTimeStampSequence) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTimeStampSequence) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTimeStampSequence) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetTimeStampSequence) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (sequenceNumber) - lengthInBits += m.SequenceNumber.LengthInBits() + lengthInBits += m.SequenceNumber.GetLengthInBits() return lengthInBits } -func (m *BACnetTimeStampSequence) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTimeStampSequence) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTimeStampSequenceParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetTimeStamp, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go index a453f2819ef..322a0e03d26 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go @@ -30,16 +30,19 @@ import ( type BACnetTimeStampTime struct { *BACnetTimeStamp TimeValue *BACnetContextTagTime + + // Arguments. + TagNumber uint8 } // The corresponding interface type IBACnetTimeStampTime interface { // GetTimeValue returns TimeValue GetTimeValue() *BACnetContextTagTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,11 +58,10 @@ func (m *BACnetTimeStampTime) GetPeekedTagNumber() uint8 { return uint8(0) } -func (m *BACnetTimeStampTime) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) { +func (m *BACnetTimeStampTime) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) { m.BACnetTimeStamp.OpeningTag = openingTag m.BACnetTimeStamp.PeekedTagHeader = peekedTagHeader m.BACnetTimeStamp.ClosingTag = closingTag - m.BACnetTimeStamp.PeekedTagNumber = peekedTagNumber } /////////////////////////////////////////////////////////// @@ -73,10 +75,11 @@ func (m *BACnetTimeStampTime) GetTimeValue() *BACnetContextTagTime { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetTimeStampTime(timeValue *BACnetContextTagTime, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, peekedTagNumber uint8) *BACnetTimeStamp { +// NewBACnetTimeStampTime factory function for BACnetTimeStampTime +func NewBACnetTimeStampTime(timeValue *BACnetContextTagTime, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag, tagNumber uint8) *BACnetTimeStamp { child := &BACnetTimeStampTime{ TimeValue: timeValue, - BACnetTimeStamp: NewBACnetTimeStamp(openingTag, peekedTagHeader, closingTag, peekedTagNumber), + BACnetTimeStamp: NewBACnetTimeStamp(openingTag, peekedTagHeader, closingTag, tagNumber), } child.Child = child return child.BACnetTimeStamp @@ -105,21 +108,21 @@ func (m *BACnetTimeStampTime) GetTypeName() string { return "BACnetTimeStampTime" } -func (m *BACnetTimeStampTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetTimeStampTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetTimeStampTime) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetTimeStampTime) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (timeValue) - lengthInBits += m.TimeValue.LengthInBits() + lengthInBits += m.TimeValue.GetLengthInBits() return lengthInBits } -func (m *BACnetTimeStampTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetTimeStampTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetTimeStampTimeParse(readBuffer utils.ReadBuffer, tagNumber uint8) (*BACnetTimeStamp, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go index 8bc2387ac4f..6f631261406 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go @@ -28,6 +28,9 @@ import ( // The data-structure of this message type BACnetUnconfirmedServiceRequest struct { + + // Arguments. + Len uint16 Child IBACnetUnconfirmedServiceRequestChild } @@ -35,10 +38,10 @@ type BACnetUnconfirmedServiceRequest struct { type IBACnetUnconfirmedServiceRequest interface { // ServiceChoice returns ServiceChoice ServiceChoice() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IBACnetUnconfirmedServiceRequestChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequest() *BACnetUnconfirmedServiceRequest { - return &BACnetUnconfirmedServiceRequest{} +// NewBACnetUnconfirmedServiceRequest factory function for BACnetUnconfirmedServiceRequest +func NewBACnetUnconfirmedServiceRequest(len uint16) *BACnetUnconfirmedServiceRequest { + return &BACnetUnconfirmedServiceRequest{Len: len} } func CastBACnetUnconfirmedServiceRequest(structType interface{}) *BACnetUnconfirmedServiceRequest { @@ -84,15 +88,15 @@ func (m *BACnetUnconfirmedServiceRequest) GetTypeName() string { return "BACnetUnconfirmedServiceRequest" } -func (m *BACnetUnconfirmedServiceRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequest) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BACnetUnconfirmedServiceRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BACnetUnconfirmedServiceRequest) ParentLengthInBits() uint16 { +func (m *BACnetUnconfirmedServiceRequest) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (serviceChoice) lengthInBits += 8 @@ -100,8 +104,8 @@ func (m *BACnetUnconfirmedServiceRequest) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BACnetUnconfirmedServiceRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go index edb54d1b0b8..bc1061158e8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go @@ -33,6 +33,9 @@ type BACnetUnconfirmedServiceRequestIAm struct { MaximumApduLengthAcceptedLength *BACnetApplicationTagUnsignedInteger SegmentationSupported *BACnetSegmentation VendorId *BACnetApplicationTagUnsignedInteger + + // Arguments. + Len uint16 } // The corresponding interface @@ -45,10 +48,10 @@ type IBACnetUnconfirmedServiceRequestIAm interface { GetSegmentationSupported() *BACnetSegmentation // GetVendorId returns VendorId GetVendorId() *BACnetApplicationTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,13 +93,14 @@ func (m *BACnetUnconfirmedServiceRequestIAm) GetVendorId() *BACnetApplicationTag // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestIAm(deviceIdentifier *BACnetApplicationTagObjectIdentifier, maximumApduLengthAcceptedLength *BACnetApplicationTagUnsignedInteger, segmentationSupported *BACnetSegmentation, vendorId *BACnetApplicationTagUnsignedInteger) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestIAm factory function for BACnetUnconfirmedServiceRequestIAm +func NewBACnetUnconfirmedServiceRequestIAm(deviceIdentifier *BACnetApplicationTagObjectIdentifier, maximumApduLengthAcceptedLength *BACnetApplicationTagUnsignedInteger, segmentationSupported *BACnetSegmentation, vendorId *BACnetApplicationTagUnsignedInteger, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestIAm{ DeviceIdentifier: deviceIdentifier, MaximumApduLengthAcceptedLength: maximumApduLengthAcceptedLength, SegmentationSupported: segmentationSupported, VendorId: vendorId, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -125,30 +129,30 @@ func (m *BACnetUnconfirmedServiceRequestIAm) GetTypeName() string { return "BACnetUnconfirmedServiceRequestIAm" } -func (m *BACnetUnconfirmedServiceRequestIAm) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestIAm) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestIAm) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestIAm) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (deviceIdentifier) - lengthInBits += m.DeviceIdentifier.LengthInBits() + lengthInBits += m.DeviceIdentifier.GetLengthInBits() // Simple field (maximumApduLengthAcceptedLength) - lengthInBits += m.MaximumApduLengthAcceptedLength.LengthInBits() + lengthInBits += m.MaximumApduLengthAcceptedLength.GetLengthInBits() // Simple field (segmentationSupported) - lengthInBits += m.SegmentationSupported.LengthInBits() + lengthInBits += m.SegmentationSupported.GetLengthInBits() // Simple field (vendorId) - lengthInBits += m.VendorId.LengthInBits() + lengthInBits += m.VendorId.GetLengthInBits() return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestIAm) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestIAm) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestIAmParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go index 4328bf268d4..c5698b38206 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go @@ -32,6 +32,9 @@ type BACnetUnconfirmedServiceRequestIHave struct { DeviceIdentifier *BACnetApplicationTagObjectIdentifier ObjectIdentifier *BACnetApplicationTagObjectIdentifier ObjectName *BACnetApplicationTagCharacterString + + // Arguments. + Len uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type IBACnetUnconfirmedServiceRequestIHave interface { GetObjectIdentifier() *BACnetApplicationTagObjectIdentifier // GetObjectName returns ObjectName GetObjectName() *BACnetApplicationTagCharacterString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -83,12 +86,13 @@ func (m *BACnetUnconfirmedServiceRequestIHave) GetObjectName() *BACnetApplicatio // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestIHave(deviceIdentifier *BACnetApplicationTagObjectIdentifier, objectIdentifier *BACnetApplicationTagObjectIdentifier, objectName *BACnetApplicationTagCharacterString) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestIHave factory function for BACnetUnconfirmedServiceRequestIHave +func NewBACnetUnconfirmedServiceRequestIHave(deviceIdentifier *BACnetApplicationTagObjectIdentifier, objectIdentifier *BACnetApplicationTagObjectIdentifier, objectName *BACnetApplicationTagCharacterString, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestIHave{ DeviceIdentifier: deviceIdentifier, ObjectIdentifier: objectIdentifier, ObjectName: objectName, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -117,27 +121,27 @@ func (m *BACnetUnconfirmedServiceRequestIHave) GetTypeName() string { return "BACnetUnconfirmedServiceRequestIHave" } -func (m *BACnetUnconfirmedServiceRequestIHave) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestIHave) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestIHave) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestIHave) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (deviceIdentifier) - lengthInBits += m.DeviceIdentifier.LengthInBits() + lengthInBits += m.DeviceIdentifier.GetLengthInBits() // Simple field (objectIdentifier) - lengthInBits += m.ObjectIdentifier.LengthInBits() + lengthInBits += m.ObjectIdentifier.GetLengthInBits() // Simple field (objectName) - lengthInBits += m.ObjectName.LengthInBits() + lengthInBits += m.ObjectName.GetLengthInBits() return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestIHave) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestIHave) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestIHaveParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go index 7f4eea31d63..4cc302cbe11 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go @@ -31,6 +31,9 @@ type BACnetUnconfirmedServiceRequestTimeSynchronization struct { *BACnetUnconfirmedServiceRequest SynchronizedDate *BACnetApplicationTagDate SynchronizedTime *BACnetApplicationTagTime + + // Arguments. + Len uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type IBACnetUnconfirmedServiceRequestTimeSynchronization interface { GetSynchronizedDate() *BACnetApplicationTagDate // GetSynchronizedTime returns SynchronizedTime GetSynchronizedTime() *BACnetApplicationTagTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) GetSynchronizedTime // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestTimeSynchronization(synchronizedDate *BACnetApplicationTagDate, synchronizedTime *BACnetApplicationTagTime) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestTimeSynchronization factory function for BACnetUnconfirmedServiceRequestTimeSynchronization +func NewBACnetUnconfirmedServiceRequestTimeSynchronization(synchronizedDate *BACnetApplicationTagDate, synchronizedTime *BACnetApplicationTagTime, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestTimeSynchronization{ SynchronizedDate: synchronizedDate, SynchronizedTime: synchronizedTime, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -109,24 +113,24 @@ func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) GetTypeName() strin return "BACnetUnconfirmedServiceRequestTimeSynchronization" } -func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (synchronizedDate) - lengthInBits += m.SynchronizedDate.LengthInBits() + lengthInBits += m.SynchronizedDate.GetLengthInBits() // Simple field (synchronizedTime) - lengthInBits += m.SynchronizedTime.LengthInBits() + lengthInBits += m.SynchronizedTime.GetLengthInBits() return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestTimeSynchronizationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go index 8a7b92f1f6a..14abd1fd2bb 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetUnconfirmedServiceRequestUTCTimeSynchronization struct { *BACnetUnconfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetUnconfirmedServiceRequestUTCTimeSynchronization interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) InitializeParent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization() *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization factory function for BACnetUnconfirmedServiceRequestUTCTimeSynchronization +func NewBACnetUnconfirmedServiceRequestUTCTimeSynchronization(len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUTCTimeSynchronization{ - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) GetTypeName() st return "BACnetUnconfirmedServiceRequestUTCTimeSynchronization" } -func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUTCTimeSynchronizationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go index 3650fe26aca..49ad99f7cc0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go @@ -34,6 +34,9 @@ type BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification struct { MonitoredObjectIdentifier *BACnetContextTagObjectIdentifier LifetimeInSeconds *BACnetContextTagUnsignedInteger ListOfValues *BACnetPropertyValues + + // Arguments. + Len uint16 } // The corresponding interface @@ -48,10 +51,10 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification interface { GetLifetimeInSeconds() *BACnetContextTagUnsignedInteger // GetListOfValues returns ListOfValues GetListOfValues() *BACnetPropertyValues - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -97,14 +100,15 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) GetListOfVal // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(subscriberProcessIdentifier *BACnetContextTagUnsignedInteger, monitoredDeviceIdentifier *BACnetContextTagObjectIdentifier, monitoredObjectIdentifier *BACnetContextTagObjectIdentifier, lifetimeInSeconds *BACnetContextTagUnsignedInteger, listOfValues *BACnetPropertyValues) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification factory function for BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification +func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(subscriberProcessIdentifier *BACnetContextTagUnsignedInteger, monitoredDeviceIdentifier *BACnetContextTagObjectIdentifier, monitoredObjectIdentifier *BACnetContextTagObjectIdentifier, lifetimeInSeconds *BACnetContextTagUnsignedInteger, listOfValues *BACnetPropertyValues, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification{ SubscriberProcessIdentifier: subscriberProcessIdentifier, MonitoredDeviceIdentifier: monitoredDeviceIdentifier, MonitoredObjectIdentifier: monitoredObjectIdentifier, LifetimeInSeconds: lifetimeInSeconds, ListOfValues: listOfValues, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -133,33 +137,33 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) GetTypeName( return "BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification" } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (subscriberProcessIdentifier) - lengthInBits += m.SubscriberProcessIdentifier.LengthInBits() + lengthInBits += m.SubscriberProcessIdentifier.GetLengthInBits() // Simple field (monitoredDeviceIdentifier) - lengthInBits += m.MonitoredDeviceIdentifier.LengthInBits() + lengthInBits += m.MonitoredDeviceIdentifier.GetLengthInBits() // Simple field (monitoredObjectIdentifier) - lengthInBits += m.MonitoredObjectIdentifier.LengthInBits() + lengthInBits += m.MonitoredObjectIdentifier.GetLengthInBits() // Simple field (lifetimeInSeconds) - lengthInBits += m.LifetimeInSeconds.LengthInBits() + lengthInBits += m.LifetimeInSeconds.GetLengthInBits() // Simple field (listOfValues) - lengthInBits += m.ListOfValues.LengthInBits() + lengthInBits += m.ListOfValues.GetLengthInBits() return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { @@ -223,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.ObjectType) + _listOfValues, _listOfValuesErr := BACnetPropertyValuesParse(readBuffer, uint8(uint8(4)), monitoredObjectIdentifier.GetObjectType()) if _listOfValuesErr != nil { return nil, errors.Wrap(_listOfValuesErr, "Error parsing 'listOfValues' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go index c755f8ad3e9..e2e50e0f12f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple struct { *BACnetUnconfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) Init // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple() *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple factory function for BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple +func NewBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple{ - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) GetT return "BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple" } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultipleParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go index 5e472bd7731..d3a1576eb72 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetUnconfirmedServiceRequestUnconfirmedEventNotification struct { *BACnetUnconfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetUnconfirmedServiceRequestUnconfirmedEventNotification interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) Initialize // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification() *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification factory function for BACnetUnconfirmedServiceRequestUnconfirmedEventNotification +func NewBACnetUnconfirmedServiceRequestUnconfirmedEventNotification(len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUnconfirmedEventNotification{ - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) GetTypeNam return "BACnetUnconfirmedServiceRequestUnconfirmedEventNotification" } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go index 165b94e9901..b5229ff35ac 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go @@ -33,6 +33,9 @@ type BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer struct { VendorId *BACnetContextTagUnsignedInteger ServiceNumber *BACnetContextTagUnsignedInteger ServiceParameters *BACnetPropertyValues + + // Arguments. + Len uint16 } // The corresponding interface @@ -43,10 +46,10 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer interface { GetServiceNumber() *BACnetContextTagUnsignedInteger // GetServiceParameters returns ServiceParameters GetServiceParameters() *BACnetPropertyValues - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,12 +87,13 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) GetServicePa // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(vendorId *BACnetContextTagUnsignedInteger, serviceNumber *BACnetContextTagUnsignedInteger, serviceParameters *BACnetPropertyValues) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer factory function for BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer +func NewBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(vendorId *BACnetContextTagUnsignedInteger, serviceNumber *BACnetContextTagUnsignedInteger, serviceParameters *BACnetPropertyValues, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer{ VendorId: vendorId, ServiceNumber: serviceNumber, ServiceParameters: serviceParameters, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -118,29 +122,29 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) GetTypeName( return "BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer" } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (vendorId) - lengthInBits += m.VendorId.LengthInBits() + lengthInBits += m.VendorId.GetLengthInBits() // Simple field (serviceNumber) - lengthInBits += m.ServiceNumber.LengthInBits() + lengthInBits += m.ServiceNumber.GetLengthInBits() // Optional Field (serviceParameters) if m.ServiceParameters != nil { - lengthInBits += (*m.ServiceParameters).LengthInBits() + lengthInBits += (*m.ServiceParameters).GetLengthInBits() } return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go index a85968d967c..a7b7a20e6a8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetUnconfirmedServiceRequestUnconfirmedTextMessage struct { *BACnetUnconfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetUnconfirmedServiceRequestUnconfirmedTextMessage interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) InitializeParent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage() *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage factory function for BACnetUnconfirmedServiceRequestUnconfirmedTextMessage +func NewBACnetUnconfirmedServiceRequestUnconfirmedTextMessage(len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUnconfirmedTextMessage{ - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) GetTypeName() st return "BACnetUnconfirmedServiceRequestUnconfirmedTextMessage" } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUnconfirmedTextMessageParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go index adaaa0a63b9..3a1ef21041f 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go @@ -30,16 +30,19 @@ import ( type BACnetUnconfirmedServiceRequestUnconfirmedUnknown struct { *BACnetUnconfirmedServiceRequest UnknownBytes []byte + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetUnconfirmedServiceRequestUnconfirmedUnknown interface { // GetUnknownBytes returns UnknownBytes GetUnknownBytes() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +72,11 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) GetUnknownBytes() [] // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestUnconfirmedUnknown(unknownBytes []byte) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestUnconfirmedUnknown factory function for BACnetUnconfirmedServiceRequestUnconfirmedUnknown +func NewBACnetUnconfirmedServiceRequestUnconfirmedUnknown(unknownBytes []byte, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestUnconfirmedUnknown{ UnknownBytes: unknownBytes, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -101,12 +105,12 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) GetTypeName() string return "BACnetUnconfirmedServiceRequestUnconfirmedUnknown" } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.UnknownBytes) > 0 { @@ -116,8 +120,8 @@ func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) LengthInBitsConditio return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestUnconfirmedUnknownParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go index 07f4a0c6b2c..66d8bb00e38 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go @@ -34,6 +34,9 @@ type BACnetUnconfirmedServiceRequestWhoHas struct { DeviceInstanceRangeHighLimit *BACnetContextTagUnsignedInteger ObjectIdentifier *BACnetContextTagObjectIdentifier ObjectName *BACnetContextTagOctetString + + // Arguments. + Len uint16 } // The corresponding interface @@ -46,10 +49,10 @@ type IBACnetUnconfirmedServiceRequestWhoHas interface { GetObjectIdentifier() *BACnetContextTagObjectIdentifier // GetObjectName returns ObjectName GetObjectName() *BACnetContextTagOctetString - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,13 +94,14 @@ func (m *BACnetUnconfirmedServiceRequestWhoHas) GetObjectName() *BACnetContextTa // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestWhoHas(deviceInstanceRangeLowLimit *BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit *BACnetContextTagUnsignedInteger, objectIdentifier *BACnetContextTagObjectIdentifier, objectName *BACnetContextTagOctetString) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestWhoHas factory function for BACnetUnconfirmedServiceRequestWhoHas +func NewBACnetUnconfirmedServiceRequestWhoHas(deviceInstanceRangeLowLimit *BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit *BACnetContextTagUnsignedInteger, objectIdentifier *BACnetContextTagObjectIdentifier, objectName *BACnetContextTagOctetString, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestWhoHas{ DeviceInstanceRangeLowLimit: deviceInstanceRangeLowLimit, DeviceInstanceRangeHighLimit: deviceInstanceRangeHighLimit, ObjectIdentifier: objectIdentifier, ObjectName: objectName, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -126,38 +130,38 @@ func (m *BACnetUnconfirmedServiceRequestWhoHas) GetTypeName() string { return "BACnetUnconfirmedServiceRequestWhoHas" } -func (m *BACnetUnconfirmedServiceRequestWhoHas) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestWhoHas) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestWhoHas) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestWhoHas) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Optional Field (deviceInstanceRangeLowLimit) if m.DeviceInstanceRangeLowLimit != nil { - lengthInBits += (*m.DeviceInstanceRangeLowLimit).LengthInBits() + lengthInBits += (*m.DeviceInstanceRangeLowLimit).GetLengthInBits() } // Optional Field (deviceInstanceRangeHighLimit) if m.DeviceInstanceRangeHighLimit != nil { - lengthInBits += (*m.DeviceInstanceRangeHighLimit).LengthInBits() + lengthInBits += (*m.DeviceInstanceRangeHighLimit).GetLengthInBits() } // Optional Field (objectIdentifier) if m.ObjectIdentifier != nil { - lengthInBits += (*m.ObjectIdentifier).LengthInBits() + lengthInBits += (*m.ObjectIdentifier).GetLengthInBits() } // Optional Field (objectName) if m.ObjectName != nil { - lengthInBits += (*m.ObjectName).LengthInBits() + lengthInBits += (*m.ObjectName).GetLengthInBits() } return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestWhoHas) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestWhoHas) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestWhoHasParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go index 5889e7cfb73..ff708a02039 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go @@ -32,6 +32,9 @@ type BACnetUnconfirmedServiceRequestWhoIs struct { *BACnetUnconfirmedServiceRequest DeviceInstanceRangeLowLimit *BACnetContextTagUnsignedInteger DeviceInstanceRangeHighLimit *BACnetContextTagUnsignedInteger + + // Arguments. + Len uint16 } // The corresponding interface @@ -40,10 +43,10 @@ type IBACnetUnconfirmedServiceRequestWhoIs interface { GetDeviceInstanceRangeLowLimit() *BACnetContextTagUnsignedInteger // GetDeviceInstanceRangeHighLimit returns DeviceInstanceRangeHighLimit GetDeviceInstanceRangeHighLimit() *BACnetContextTagUnsignedInteger - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *BACnetUnconfirmedServiceRequestWhoIs) GetDeviceInstanceRangeHighLimit() // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestWhoIs(deviceInstanceRangeLowLimit *BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit *BACnetContextTagUnsignedInteger) *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestWhoIs factory function for BACnetUnconfirmedServiceRequestWhoIs +func NewBACnetUnconfirmedServiceRequestWhoIs(deviceInstanceRangeLowLimit *BACnetContextTagUnsignedInteger, deviceInstanceRangeHighLimit *BACnetContextTagUnsignedInteger, len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestWhoIs{ DeviceInstanceRangeLowLimit: deviceInstanceRangeLowLimit, DeviceInstanceRangeHighLimit: deviceInstanceRangeHighLimit, - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -110,28 +114,28 @@ func (m *BACnetUnconfirmedServiceRequestWhoIs) GetTypeName() string { return "BACnetUnconfirmedServiceRequestWhoIs" } -func (m *BACnetUnconfirmedServiceRequestWhoIs) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestWhoIs) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestWhoIs) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestWhoIs) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Optional Field (deviceInstanceRangeLowLimit) if m.DeviceInstanceRangeLowLimit != nil { - lengthInBits += (*m.DeviceInstanceRangeLowLimit).LengthInBits() + lengthInBits += (*m.DeviceInstanceRangeLowLimit).GetLengthInBits() } // Optional Field (deviceInstanceRangeHighLimit) if m.DeviceInstanceRangeHighLimit != nil { - lengthInBits += (*m.DeviceInstanceRangeHighLimit).LengthInBits() + lengthInBits += (*m.DeviceInstanceRangeHighLimit).GetLengthInBits() } return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestWhoIs) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestWhoIs) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestWhoIsParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go index 7d7836dde9e..e270b17ed65 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type BACnetUnconfirmedServiceRequestWriteGroup struct { *BACnetUnconfirmedServiceRequest + + // Arguments. + Len uint16 } // The corresponding interface type IBACnetUnconfirmedServiceRequestWriteGroup interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,9 +65,10 @@ func (m *BACnetUnconfirmedServiceRequestWriteGroup) InitializeParent(parent *BAC // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBACnetUnconfirmedServiceRequestWriteGroup() *BACnetUnconfirmedServiceRequest { +// NewBACnetUnconfirmedServiceRequestWriteGroup factory function for BACnetUnconfirmedServiceRequestWriteGroup +func NewBACnetUnconfirmedServiceRequestWriteGroup(len uint16) *BACnetUnconfirmedServiceRequest { child := &BACnetUnconfirmedServiceRequestWriteGroup{ - BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(), + BACnetUnconfirmedServiceRequest: NewBACnetUnconfirmedServiceRequest(len), } child.Child = child return child.BACnetUnconfirmedServiceRequest @@ -93,18 +97,18 @@ func (m *BACnetUnconfirmedServiceRequestWriteGroup) GetTypeName() string { return "BACnetUnconfirmedServiceRequestWriteGroup" } -func (m *BACnetUnconfirmedServiceRequestWriteGroup) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BACnetUnconfirmedServiceRequestWriteGroup) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BACnetUnconfirmedServiceRequestWriteGroup) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BACnetUnconfirmedServiceRequestWriteGroup) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BACnetUnconfirmedServiceRequestWriteGroup) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BACnetUnconfirmedServiceRequestWriteGroup) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BACnetUnconfirmedServiceRequestWriteGroupParse(readBuffer utils.ReadBuffer, len uint16) (*BACnetUnconfirmedServiceRequest, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go index 74c0266a8eb..dd9505486c6 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go @@ -32,8 +32,7 @@ const BVLC_BACNETTYPE uint8 = 0x81 // The data-structure of this message type BVLC struct { - BvlcPayloadLength uint16 - Child IBVLCChild + Child IBVLCChild } // The corresponding interface @@ -42,10 +41,10 @@ type IBVLC interface { BvlcFunction() uint8 // GetBvlcPayloadLength returns BvlcPayloadLength GetBvlcPayloadLength() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -57,7 +56,7 @@ type IBVLCParent interface { type IBVLCChild interface { Serialize(writeBuffer utils.WriteBuffer) error - InitializeParent(parent *BVLC, bvlcPayloadLength uint16) + InitializeParent(parent *BVLC) GetTypeName() string IBVLC } @@ -70,12 +69,12 @@ type IBVLCChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *BVLC) GetBvlcPayloadLength() uint16 { - // TODO: calculation should happen here instead accessing the stored field - return m.BvlcPayloadLength + return uint16(uint16(m.GetLengthInBytes())) - uint16(uint16(4)) } -func NewBVLC(bvlcPayloadLength uint16) *BVLC { - return &BVLC{BvlcPayloadLength: bvlcPayloadLength} +// NewBVLC factory function for BVLC +func NewBVLC() *BVLC { + return &BVLC{} } func CastBVLC(structType interface{}) *BVLC { @@ -95,15 +94,15 @@ func (m *BVLC) GetTypeName() string { return "BVLC" } -func (m *BVLC) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLC) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLC) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *BVLC) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *BVLC) ParentLengthInBits() uint16 { +func (m *BVLC) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Const Field (bacnetType) @@ -119,8 +118,8 @@ func (m *BVLC) ParentLengthInBits() uint16 { return lengthInBits } -func (m *BVLC) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLC) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCParse(readBuffer utils.ReadBuffer) (*BVLC, error) { @@ -153,6 +152,7 @@ func BVLCParse(readBuffer utils.ReadBuffer) (*BVLC, error) { // Virtual field _bvlcPayloadLength := uint16(bvlcLength) - uint16(uint16(4)) bvlcPayloadLength := uint16(_bvlcPayloadLength) + _ = bvlcPayloadLength // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) var _parent *BVLC @@ -197,7 +197,7 @@ func BVLCParse(readBuffer utils.ReadBuffer) (*BVLC, error) { } // Finish initializing - _parent.Child.InitializeParent(_parent, bvlcPayloadLength) + _parent.Child.InitializeParent(_parent) return _parent, nil } @@ -225,13 +225,13 @@ func (m *BVLC) SerializeParent(writeBuffer utils.WriteBuffer, child IBVLC, seria } // Implicit Field (bvlcLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - bvlcLength := uint16(uint16(m.LengthInBytes())) + bvlcLength := uint16(uint16(m.GetLengthInBytes())) _bvlcLengthErr := writeBuffer.WriteUint16("bvlcLength", 16, (bvlcLength)) if _bvlcLengthErr != nil { return errors.Wrap(_bvlcLengthErr, "Error serializing 'bvlcLength' field") } // Virtual field - if _bvlcPayloadLengthErr := writeBuffer.WriteVirtual("bvlcPayloadLength", m.BvlcPayloadLength); _bvlcPayloadLengthErr != nil { + if _bvlcPayloadLengthErr := writeBuffer.WriteVirtual("bvlcPayloadLength", m.GetBvlcPayloadLength()); _bvlcPayloadLengthErr != nil { return errors.Wrap(_bvlcPayloadLengthErr, "Error serializing 'bvlcPayloadLength' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go index 2740c28d87f..82f0efbb5b7 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go @@ -32,10 +32,10 @@ type BVLCDeleteForeignDeviceTableEntry struct { // The corresponding interface type IBVLCDeleteForeignDeviceTableEntry interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,9 +51,7 @@ func (m *BVLCDeleteForeignDeviceTableEntry) GetBvlcFunction() uint8 { return 0x08 } -func (m *BVLCDeleteForeignDeviceTableEntry) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCDeleteForeignDeviceTableEntry) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -63,9 +61,10 @@ func (m *BVLCDeleteForeignDeviceTableEntry) InitializeParent(parent *BVLC, bvlcP // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCDeleteForeignDeviceTableEntry(bvlcPayloadLength uint16) *BVLC { +// NewBVLCDeleteForeignDeviceTableEntry factory function for BVLCDeleteForeignDeviceTableEntry +func NewBVLCDeleteForeignDeviceTableEntry() *BVLC { child := &BVLCDeleteForeignDeviceTableEntry{ - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -94,18 +93,18 @@ func (m *BVLCDeleteForeignDeviceTableEntry) GetTypeName() string { return "BVLCDeleteForeignDeviceTableEntry" } -func (m *BVLCDeleteForeignDeviceTableEntry) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCDeleteForeignDeviceTableEntry) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCDeleteForeignDeviceTableEntry) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCDeleteForeignDeviceTableEntry) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BVLCDeleteForeignDeviceTableEntry) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCDeleteForeignDeviceTableEntry) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCDeleteForeignDeviceTableEntryParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go index 94126d85df9..c4024d5da70 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go @@ -30,16 +30,19 @@ import ( type BVLCDistributeBroadcastToNetwork struct { *BVLC Npdu *NPDU + + // Arguments. + BvlcPayloadLength uint16 } // The corresponding interface type IBVLCDistributeBroadcastToNetwork interface { // GetNpdu returns Npdu GetNpdu() *NPDU - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,9 +58,7 @@ func (m *BVLCDistributeBroadcastToNetwork) GetBvlcFunction() uint8 { return 0x09 } -func (m *BVLCDistributeBroadcastToNetwork) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCDistributeBroadcastToNetwork) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -70,10 +71,11 @@ func (m *BVLCDistributeBroadcastToNetwork) GetNpdu() *NPDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBVLCDistributeBroadcastToNetwork factory function for BVLCDistributeBroadcastToNetwork func NewBVLCDistributeBroadcastToNetwork(npdu *NPDU, bvlcPayloadLength uint16) *BVLC { child := &BVLCDistributeBroadcastToNetwork{ Npdu: npdu, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -102,21 +104,21 @@ func (m *BVLCDistributeBroadcastToNetwork) GetTypeName() string { return "BVLCDistributeBroadcastToNetwork" } -func (m *BVLCDistributeBroadcastToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCDistributeBroadcastToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCDistributeBroadcastToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCDistributeBroadcastToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (npdu) - lengthInBits += m.Npdu.LengthInBits() + lengthInBits += m.Npdu.GetLengthInBits() return lengthInBits } -func (m *BVLCDistributeBroadcastToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCDistributeBroadcastToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCDistributeBroadcastToNetworkParse(readBuffer utils.ReadBuffer, bvlcPayloadLength uint16) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go index da0978e645b..b36f4bb062d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go @@ -32,6 +32,9 @@ type BVLCForwardedNPDU struct { Ip []uint8 Port uint16 Npdu *NPDU + + // Arguments. + BvlcPayloadLength uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type IBVLCForwardedNPDU interface { GetPort() uint16 // GetNpdu returns Npdu GetNpdu() *NPDU - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,7 @@ func (m *BVLCForwardedNPDU) GetBvlcFunction() uint8 { return 0x04 } -func (m *BVLCForwardedNPDU) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCForwardedNPDU) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -84,12 +85,13 @@ func (m *BVLCForwardedNPDU) GetNpdu() *NPDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBVLCForwardedNPDU factory function for BVLCForwardedNPDU func NewBVLCForwardedNPDU(ip []uint8, port uint16, npdu *NPDU, bvlcPayloadLength uint16) *BVLC { child := &BVLCForwardedNPDU{ Ip: ip, Port: port, Npdu: npdu, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -118,12 +120,12 @@ func (m *BVLCForwardedNPDU) GetTypeName() string { return "BVLCForwardedNPDU" } -func (m *BVLCForwardedNPDU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCForwardedNPDU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCForwardedNPDU) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCForwardedNPDU) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Ip) > 0 { @@ -134,13 +136,13 @@ func (m *BVLCForwardedNPDU) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 16 // Simple field (npdu) - lengthInBits += m.Npdu.LengthInBits() + lengthInBits += m.Npdu.GetLengthInBits() return lengthInBits } -func (m *BVLCForwardedNPDU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCForwardedNPDU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCForwardedNPDUParse(readBuffer utils.ReadBuffer, bvlcPayloadLength uint16) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go index 382c8c41adb..af91f5a04b0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go @@ -30,16 +30,19 @@ import ( type BVLCOriginalBroadcastNPDU struct { *BVLC Npdu *NPDU + + // Arguments. + BvlcPayloadLength uint16 } // The corresponding interface type IBVLCOriginalBroadcastNPDU interface { // GetNpdu returns Npdu GetNpdu() *NPDU - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,9 +58,7 @@ func (m *BVLCOriginalBroadcastNPDU) GetBvlcFunction() uint8 { return 0x0B } -func (m *BVLCOriginalBroadcastNPDU) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCOriginalBroadcastNPDU) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -70,10 +71,11 @@ func (m *BVLCOriginalBroadcastNPDU) GetNpdu() *NPDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBVLCOriginalBroadcastNPDU factory function for BVLCOriginalBroadcastNPDU func NewBVLCOriginalBroadcastNPDU(npdu *NPDU, bvlcPayloadLength uint16) *BVLC { child := &BVLCOriginalBroadcastNPDU{ Npdu: npdu, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -102,21 +104,21 @@ func (m *BVLCOriginalBroadcastNPDU) GetTypeName() string { return "BVLCOriginalBroadcastNPDU" } -func (m *BVLCOriginalBroadcastNPDU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCOriginalBroadcastNPDU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCOriginalBroadcastNPDU) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCOriginalBroadcastNPDU) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (npdu) - lengthInBits += m.Npdu.LengthInBits() + lengthInBits += m.Npdu.GetLengthInBits() return lengthInBits } -func (m *BVLCOriginalBroadcastNPDU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCOriginalBroadcastNPDU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCOriginalBroadcastNPDUParse(readBuffer utils.ReadBuffer, bvlcPayloadLength uint16) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go index 878446ac4c7..f4a563b8df2 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go @@ -30,16 +30,19 @@ import ( type BVLCOriginalUnicastNPDU struct { *BVLC Npdu *NPDU + + // Arguments. + BvlcPayloadLength uint16 } // The corresponding interface type IBVLCOriginalUnicastNPDU interface { // GetNpdu returns Npdu GetNpdu() *NPDU - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,9 +58,7 @@ func (m *BVLCOriginalUnicastNPDU) GetBvlcFunction() uint8 { return 0x0A } -func (m *BVLCOriginalUnicastNPDU) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCOriginalUnicastNPDU) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -70,10 +71,11 @@ func (m *BVLCOriginalUnicastNPDU) GetNpdu() *NPDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBVLCOriginalUnicastNPDU factory function for BVLCOriginalUnicastNPDU func NewBVLCOriginalUnicastNPDU(npdu *NPDU, bvlcPayloadLength uint16) *BVLC { child := &BVLCOriginalUnicastNPDU{ Npdu: npdu, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -102,21 +104,21 @@ func (m *BVLCOriginalUnicastNPDU) GetTypeName() string { return "BVLCOriginalUnicastNPDU" } -func (m *BVLCOriginalUnicastNPDU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCOriginalUnicastNPDU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCOriginalUnicastNPDU) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCOriginalUnicastNPDU) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (npdu) - lengthInBits += m.Npdu.LengthInBits() + lengthInBits += m.Npdu.GetLengthInBits() return lengthInBits } -func (m *BVLCOriginalUnicastNPDU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCOriginalUnicastNPDU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCOriginalUnicastNPDUParse(readBuffer utils.ReadBuffer, bvlcPayloadLength uint16) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go index 191f2cf5c58..6b5788b6d73 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go @@ -32,10 +32,10 @@ type BVLCReadBroadcastDistributionTable struct { // The corresponding interface type IBVLCReadBroadcastDistributionTable interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,9 +51,7 @@ func (m *BVLCReadBroadcastDistributionTable) GetBvlcFunction() uint8 { return 0x02 } -func (m *BVLCReadBroadcastDistributionTable) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCReadBroadcastDistributionTable) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -63,9 +61,10 @@ func (m *BVLCReadBroadcastDistributionTable) InitializeParent(parent *BVLC, bvlc // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCReadBroadcastDistributionTable(bvlcPayloadLength uint16) *BVLC { +// NewBVLCReadBroadcastDistributionTable factory function for BVLCReadBroadcastDistributionTable +func NewBVLCReadBroadcastDistributionTable() *BVLC { child := &BVLCReadBroadcastDistributionTable{ - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -94,18 +93,18 @@ func (m *BVLCReadBroadcastDistributionTable) GetTypeName() string { return "BVLCReadBroadcastDistributionTable" } -func (m *BVLCReadBroadcastDistributionTable) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCReadBroadcastDistributionTable) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCReadBroadcastDistributionTable) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCReadBroadcastDistributionTable) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BVLCReadBroadcastDistributionTable) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCReadBroadcastDistributionTable) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCReadBroadcastDistributionTableParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go index 324028de8aa..936e2ae5902 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go @@ -32,10 +32,10 @@ type BVLCReadBroadcastDistributionTableAck struct { // The corresponding interface type IBVLCReadBroadcastDistributionTableAck interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,9 +51,7 @@ func (m *BVLCReadBroadcastDistributionTableAck) GetBvlcFunction() uint8 { return 0x03 } -func (m *BVLCReadBroadcastDistributionTableAck) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCReadBroadcastDistributionTableAck) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -63,9 +61,10 @@ func (m *BVLCReadBroadcastDistributionTableAck) InitializeParent(parent *BVLC, b // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCReadBroadcastDistributionTableAck(bvlcPayloadLength uint16) *BVLC { +// NewBVLCReadBroadcastDistributionTableAck factory function for BVLCReadBroadcastDistributionTableAck +func NewBVLCReadBroadcastDistributionTableAck() *BVLC { child := &BVLCReadBroadcastDistributionTableAck{ - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -94,18 +93,18 @@ func (m *BVLCReadBroadcastDistributionTableAck) GetTypeName() string { return "BVLCReadBroadcastDistributionTableAck" } -func (m *BVLCReadBroadcastDistributionTableAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCReadBroadcastDistributionTableAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCReadBroadcastDistributionTableAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCReadBroadcastDistributionTableAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BVLCReadBroadcastDistributionTableAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCReadBroadcastDistributionTableAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCReadBroadcastDistributionTableAckParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go index daa83853a6b..860c49a99c0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go @@ -32,10 +32,10 @@ type BVLCReadForeignDeviceTable struct { // The corresponding interface type IBVLCReadForeignDeviceTable interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,9 +51,7 @@ func (m *BVLCReadForeignDeviceTable) GetBvlcFunction() uint8 { return 0x06 } -func (m *BVLCReadForeignDeviceTable) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCReadForeignDeviceTable) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -63,9 +61,10 @@ func (m *BVLCReadForeignDeviceTable) InitializeParent(parent *BVLC, bvlcPayloadL // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCReadForeignDeviceTable(bvlcPayloadLength uint16) *BVLC { +// NewBVLCReadForeignDeviceTable factory function for BVLCReadForeignDeviceTable +func NewBVLCReadForeignDeviceTable() *BVLC { child := &BVLCReadForeignDeviceTable{ - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -94,18 +93,18 @@ func (m *BVLCReadForeignDeviceTable) GetTypeName() string { return "BVLCReadForeignDeviceTable" } -func (m *BVLCReadForeignDeviceTable) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCReadForeignDeviceTable) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCReadForeignDeviceTable) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCReadForeignDeviceTable) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BVLCReadForeignDeviceTable) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCReadForeignDeviceTable) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCReadForeignDeviceTableParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go index 537f9795e0c..ecdee56fd66 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go @@ -32,10 +32,10 @@ type BVLCReadForeignDeviceTableAck struct { // The corresponding interface type IBVLCReadForeignDeviceTableAck interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,9 +51,7 @@ func (m *BVLCReadForeignDeviceTableAck) GetBvlcFunction() uint8 { return 0x07 } -func (m *BVLCReadForeignDeviceTableAck) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCReadForeignDeviceTableAck) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -63,9 +61,10 @@ func (m *BVLCReadForeignDeviceTableAck) InitializeParent(parent *BVLC, bvlcPaylo // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCReadForeignDeviceTableAck(bvlcPayloadLength uint16) *BVLC { +// NewBVLCReadForeignDeviceTableAck factory function for BVLCReadForeignDeviceTableAck +func NewBVLCReadForeignDeviceTableAck() *BVLC { child := &BVLCReadForeignDeviceTableAck{ - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -94,18 +93,18 @@ func (m *BVLCReadForeignDeviceTableAck) GetTypeName() string { return "BVLCReadForeignDeviceTableAck" } -func (m *BVLCReadForeignDeviceTableAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCReadForeignDeviceTableAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCReadForeignDeviceTableAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCReadForeignDeviceTableAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BVLCReadForeignDeviceTableAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCReadForeignDeviceTableAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCReadForeignDeviceTableAckParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go index d8c365a1262..e30fbcd1d13 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go @@ -36,10 +36,10 @@ type BVLCRegisterForeignDevice struct { type IBVLCRegisterForeignDevice interface { // GetTtl returns Ttl GetTtl() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,9 +55,7 @@ func (m *BVLCRegisterForeignDevice) GetBvlcFunction() uint8 { return 0x05 } -func (m *BVLCRegisterForeignDevice) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCRegisterForeignDevice) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -70,10 +68,11 @@ func (m *BVLCRegisterForeignDevice) GetTtl() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCRegisterForeignDevice(ttl uint16, bvlcPayloadLength uint16) *BVLC { +// NewBVLCRegisterForeignDevice factory function for BVLCRegisterForeignDevice +func NewBVLCRegisterForeignDevice(ttl uint16) *BVLC { child := &BVLCRegisterForeignDevice{ Ttl: ttl, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -102,12 +101,12 @@ func (m *BVLCRegisterForeignDevice) GetTypeName() string { return "BVLCRegisterForeignDevice" } -func (m *BVLCRegisterForeignDevice) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCRegisterForeignDevice) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCRegisterForeignDevice) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCRegisterForeignDevice) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (ttl) lengthInBits += 16 @@ -115,8 +114,8 @@ func (m *BVLCRegisterForeignDevice) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *BVLCRegisterForeignDevice) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCRegisterForeignDevice) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCRegisterForeignDeviceParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go index 63614bc1d2d..4de740dfdee 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go @@ -36,10 +36,10 @@ type BVLCResult struct { type IBVLCResult interface { // GetCode returns Code GetCode() BVLCResultCode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,9 +55,7 @@ func (m *BVLCResult) GetBvlcFunction() uint8 { return 0x00 } -func (m *BVLCResult) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCResult) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -70,10 +68,11 @@ func (m *BVLCResult) GetCode() BVLCResultCode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCResult(code BVLCResultCode, bvlcPayloadLength uint16) *BVLC { +// NewBVLCResult factory function for BVLCResult +func NewBVLCResult(code BVLCResultCode) *BVLC { child := &BVLCResult{ Code: code, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -102,12 +101,12 @@ func (m *BVLCResult) GetTypeName() string { return "BVLCResult" } -func (m *BVLCResult) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCResult) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCResult) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCResult) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (code) lengthInBits += 16 @@ -115,8 +114,8 @@ func (m *BVLCResult) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *BVLCResult) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCResult) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCResultParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResultCode.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResultCode.go index 0333a54b217..237117426f2 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResultCode.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResultCode.go @@ -116,12 +116,12 @@ func CastBVLCResultCode(structType interface{}) BVLCResultCode { return castFunc(structType) } -func (m BVLCResultCode) LengthInBits() uint16 { +func (m BVLCResultCode) GetLengthInBits() uint16 { return 16 } -func (m BVLCResultCode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m BVLCResultCode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCResultCodeParse(readBuffer utils.ReadBuffer) (BVLCResultCode, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go index 38353bcd412..b94743db896 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go @@ -32,10 +32,10 @@ type BVLCSecureBVLL struct { // The corresponding interface type IBVLCSecureBVLL interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -51,9 +51,7 @@ func (m *BVLCSecureBVLL) GetBvlcFunction() uint8 { return 0x0C } -func (m *BVLCSecureBVLL) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCSecureBVLL) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -63,9 +61,10 @@ func (m *BVLCSecureBVLL) InitializeParent(parent *BVLC, bvlcPayloadLength uint16 // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewBVLCSecureBVLL(bvlcPayloadLength uint16) *BVLC { +// NewBVLCSecureBVLL factory function for BVLCSecureBVLL +func NewBVLCSecureBVLL() *BVLC { child := &BVLCSecureBVLL{ - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -94,18 +93,18 @@ func (m *BVLCSecureBVLL) GetTypeName() string { return "BVLCSecureBVLL" } -func (m *BVLCSecureBVLL) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCSecureBVLL) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCSecureBVLL) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCSecureBVLL) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *BVLCSecureBVLL) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCSecureBVLL) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCSecureBVLLParse(readBuffer utils.ReadBuffer) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go index e1e048b924d..44e8aae66b4 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go @@ -30,16 +30,19 @@ import ( type BVLCWriteBroadcastDistributionTable struct { *BVLC Table []*BVLCWriteBroadcastDistributionTableEntry + + // Arguments. + BvlcPayloadLength uint16 } // The corresponding interface type IBVLCWriteBroadcastDistributionTable interface { // GetTable returns Table GetTable() []*BVLCWriteBroadcastDistributionTableEntry - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,9 +58,7 @@ func (m *BVLCWriteBroadcastDistributionTable) GetBvlcFunction() uint8 { return 0x01 } -func (m *BVLCWriteBroadcastDistributionTable) InitializeParent(parent *BVLC, bvlcPayloadLength uint16) { - m.BVLC.BvlcPayloadLength = bvlcPayloadLength -} +func (m *BVLCWriteBroadcastDistributionTable) InitializeParent(parent *BVLC) {} /////////////////////////////////////////////////////////// // Accessors for property fields. @@ -70,10 +71,11 @@ func (m *BVLCWriteBroadcastDistributionTable) GetTable() []*BVLCWriteBroadcastDi // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBVLCWriteBroadcastDistributionTable factory function for BVLCWriteBroadcastDistributionTable func NewBVLCWriteBroadcastDistributionTable(table []*BVLCWriteBroadcastDistributionTableEntry, bvlcPayloadLength uint16) *BVLC { child := &BVLCWriteBroadcastDistributionTable{ Table: table, - BVLC: NewBVLC(bvlcPayloadLength), + BVLC: NewBVLC(), } child.Child = child return child.BVLC @@ -102,25 +104,25 @@ func (m *BVLCWriteBroadcastDistributionTable) GetTypeName() string { return "BVLCWriteBroadcastDistributionTable" } -func (m *BVLCWriteBroadcastDistributionTable) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCWriteBroadcastDistributionTable) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCWriteBroadcastDistributionTable) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *BVLCWriteBroadcastDistributionTable) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Table) > 0 { for _, element := range m.Table { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *BVLCWriteBroadcastDistributionTable) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCWriteBroadcastDistributionTable) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCWriteBroadcastDistributionTableParse(readBuffer utils.ReadBuffer, bvlcPayloadLength uint16) (*BVLC, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go index 1e308d6bc0f..3f7993d299b 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go @@ -41,10 +41,10 @@ type IBVLCWriteBroadcastDistributionTableEntry interface { GetPort() uint16 // GetBroadcastDistributionMap returns BroadcastDistributionMap GetBroadcastDistributionMap() []uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *BVLCWriteBroadcastDistributionTableEntry) GetBroadcastDistributionMap() // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewBVLCWriteBroadcastDistributionTableEntry factory function for BVLCWriteBroadcastDistributionTableEntry func NewBVLCWriteBroadcastDistributionTableEntry(ip []uint8, port uint16, broadcastDistributionMap []uint8) *BVLCWriteBroadcastDistributionTableEntry { return &BVLCWriteBroadcastDistributionTableEntry{Ip: ip, Port: port, BroadcastDistributionMap: broadcastDistributionMap} } @@ -89,11 +90,11 @@ func (m *BVLCWriteBroadcastDistributionTableEntry) GetTypeName() string { return "BVLCWriteBroadcastDistributionTableEntry" } -func (m *BVLCWriteBroadcastDistributionTableEntry) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *BVLCWriteBroadcastDistributionTableEntry) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *BVLCWriteBroadcastDistributionTableEntry) LengthInBitsConditional(lastItem bool) uint16 { +func (m *BVLCWriteBroadcastDistributionTableEntry) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Array field @@ -112,8 +113,8 @@ func (m *BVLCWriteBroadcastDistributionTableEntry) LengthInBitsConditional(lastI return lengthInBits } -func (m *BVLCWriteBroadcastDistributionTableEntry) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *BVLCWriteBroadcastDistributionTableEntry) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func BVLCWriteBroadcastDistributionTableEntryParse(readBuffer utils.ReadBuffer) (*BVLCWriteBroadcastDistributionTableEntry, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go index 5d02a8800ce..9ea860702dc 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go @@ -29,7 +29,10 @@ import ( // The data-structure of this message type NLM struct { VendorId *uint16 - Child INLMChild + + // Arguments. + ApduLength uint16 + Child INLMChild } // The corresponding interface @@ -38,10 +41,10 @@ type INLM interface { MessageType() uint8 // GetVendorId returns VendorId GetVendorId() *uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,8 +72,9 @@ func (m *NLM) GetVendorId() *uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLM(vendorId *uint16) *NLM { - return &NLM{VendorId: vendorId} +// NewNLM factory function for NLM +func NewNLM(vendorId *uint16, apduLength uint16) *NLM { + return &NLM{VendorId: vendorId, ApduLength: apduLength} } func CastNLM(structType interface{}) *NLM { @@ -90,15 +94,15 @@ func (m *NLM) GetTypeName() string { return "NLM" } -func (m *NLM) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLM) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLM) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *NLM) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *NLM) ParentLengthInBits() uint16 { +func (m *NLM) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (messageType) lengthInBits += 8 @@ -111,8 +115,8 @@ func (m *NLM) ParentLengthInBits() uint16 { return lengthInBits } -func (m *NLM) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLM) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMParse(readBuffer utils.ReadBuffer, apduLength uint16) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go index 11726705194..412eac9961d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go @@ -30,16 +30,19 @@ import ( type NLMDisconnectConnectionToNetwork struct { *NLM DestinationNetworkAddress uint16 + + // Arguments. + ApduLength uint16 } // The corresponding interface type INLMDisconnectConnectionToNetwork interface { // GetDestinationNetworkAddress returns DestinationNetworkAddress GetDestinationNetworkAddress() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,10 +73,11 @@ func (m *NLMDisconnectConnectionToNetwork) GetDestinationNetworkAddress() uint16 // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMDisconnectConnectionToNetwork(destinationNetworkAddress uint16, vendorId *uint16) *NLM { +// NewNLMDisconnectConnectionToNetwork factory function for NLMDisconnectConnectionToNetwork +func NewNLMDisconnectConnectionToNetwork(destinationNetworkAddress uint16, vendorId *uint16, apduLength uint16) *NLM { child := &NLMDisconnectConnectionToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -102,12 +106,12 @@ func (m *NLMDisconnectConnectionToNetwork) GetTypeName() string { return "NLMDisconnectConnectionToNetwork" } -func (m *NLMDisconnectConnectionToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMDisconnectConnectionToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMDisconnectConnectionToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMDisconnectConnectionToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationNetworkAddress) lengthInBits += 16 @@ -115,8 +119,8 @@ func (m *NLMDisconnectConnectionToNetwork) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *NLMDisconnectConnectionToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMDisconnectConnectionToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMDisconnectConnectionToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go index ecc42bc721a..3b66c02cfb0 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go @@ -31,6 +31,9 @@ type NLMEstablishConnectionToNetwork struct { *NLM DestinationNetworkAddress uint16 TerminationTime uint8 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type INLMEstablishConnectionToNetwork interface { GetDestinationNetworkAddress() uint16 // GetTerminationTime returns TerminationTime GetTerminationTime() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *NLMEstablishConnectionToNetwork) GetTerminationTime() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMEstablishConnectionToNetwork(destinationNetworkAddress uint16, terminationTime uint8, vendorId *uint16) *NLM { +// NewNLMEstablishConnectionToNetwork factory function for NLMEstablishConnectionToNetwork +func NewNLMEstablishConnectionToNetwork(destinationNetworkAddress uint16, terminationTime uint8, vendorId *uint16, apduLength uint16) *NLM { child := &NLMEstablishConnectionToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, TerminationTime: terminationTime, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -110,12 +114,12 @@ func (m *NLMEstablishConnectionToNetwork) GetTypeName() string { return "NLMEstablishConnectionToNetwork" } -func (m *NLMEstablishConnectionToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMEstablishConnectionToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMEstablishConnectionToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMEstablishConnectionToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationNetworkAddress) lengthInBits += 16 @@ -126,8 +130,8 @@ func (m *NLMEstablishConnectionToNetwork) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *NLMEstablishConnectionToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMEstablishConnectionToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMEstablishConnectionToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go index 0512724759c..bd0300be641 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go @@ -30,16 +30,19 @@ import ( type NLMIAmRouterToNetwork struct { *NLM DestinationNetworkAddress []uint16 + + // Arguments. + ApduLength uint16 } // The corresponding interface type INLMIAmRouterToNetwork interface { // GetDestinationNetworkAddress returns DestinationNetworkAddress GetDestinationNetworkAddress() []uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,10 +73,11 @@ func (m *NLMIAmRouterToNetwork) GetDestinationNetworkAddress() []uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMIAmRouterToNetwork(destinationNetworkAddress []uint16, vendorId *uint16) *NLM { +// NewNLMIAmRouterToNetwork factory function for NLMIAmRouterToNetwork +func NewNLMIAmRouterToNetwork(destinationNetworkAddress []uint16, vendorId *uint16, apduLength uint16) *NLM { child := &NLMIAmRouterToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -102,12 +106,12 @@ func (m *NLMIAmRouterToNetwork) GetTypeName() string { return "NLMIAmRouterToNetwork" } -func (m *NLMIAmRouterToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMIAmRouterToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMIAmRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMIAmRouterToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.DestinationNetworkAddress) > 0 { @@ -117,8 +121,8 @@ func (m *NLMIAmRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *NLMIAmRouterToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMIAmRouterToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMIAmRouterToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go index 9d1b49e3947..eac6cd76035 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go @@ -31,6 +31,9 @@ type NLMICouldBeRouterToNetwork struct { *NLM DestinationNetworkAddress uint16 PerformanceIndex uint8 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type INLMICouldBeRouterToNetwork interface { GetDestinationNetworkAddress() uint16 // GetPerformanceIndex returns PerformanceIndex GetPerformanceIndex() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *NLMICouldBeRouterToNetwork) GetPerformanceIndex() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMICouldBeRouterToNetwork(destinationNetworkAddress uint16, performanceIndex uint8, vendorId *uint16) *NLM { +// NewNLMICouldBeRouterToNetwork factory function for NLMICouldBeRouterToNetwork +func NewNLMICouldBeRouterToNetwork(destinationNetworkAddress uint16, performanceIndex uint8, vendorId *uint16, apduLength uint16) *NLM { child := &NLMICouldBeRouterToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, PerformanceIndex: performanceIndex, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -110,12 +114,12 @@ func (m *NLMICouldBeRouterToNetwork) GetTypeName() string { return "NLMICouldBeRouterToNetwork" } -func (m *NLMICouldBeRouterToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMICouldBeRouterToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMICouldBeRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMICouldBeRouterToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationNetworkAddress) lengthInBits += 16 @@ -126,8 +130,8 @@ func (m *NLMICouldBeRouterToNetwork) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *NLMICouldBeRouterToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMICouldBeRouterToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMICouldBeRouterToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go index 99e2b3a2907..950eb782620 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go @@ -31,6 +31,9 @@ type NLMInitalizeRoutingTable struct { *NLM NumberOfPorts uint8 PortMappings []*NLMInitalizeRoutingTablePortMapping + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type INLMInitalizeRoutingTable interface { GetNumberOfPorts() uint8 // GetPortMappings returns PortMappings GetPortMappings() []*NLMInitalizeRoutingTablePortMapping - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *NLMInitalizeRoutingTable) GetPortMappings() []*NLMInitalizeRoutingTable // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMInitalizeRoutingTable(numberOfPorts uint8, portMappings []*NLMInitalizeRoutingTablePortMapping, vendorId *uint16) *NLM { +// NewNLMInitalizeRoutingTable factory function for NLMInitalizeRoutingTable +func NewNLMInitalizeRoutingTable(numberOfPorts uint8, portMappings []*NLMInitalizeRoutingTablePortMapping, vendorId *uint16, apduLength uint16) *NLM { child := &NLMInitalizeRoutingTable{ NumberOfPorts: numberOfPorts, PortMappings: portMappings, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -110,12 +114,12 @@ func (m *NLMInitalizeRoutingTable) GetTypeName() string { return "NLMInitalizeRoutingTable" } -func (m *NLMInitalizeRoutingTable) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMInitalizeRoutingTable) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMInitalizeRoutingTable) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMInitalizeRoutingTable) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numberOfPorts) lengthInBits += 8 @@ -124,15 +128,15 @@ func (m *NLMInitalizeRoutingTable) LengthInBitsConditional(lastItem bool) uint16 if len(m.PortMappings) > 0 { for i, element := range m.PortMappings { last := i == len(m.PortMappings)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *NLMInitalizeRoutingTable) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMInitalizeRoutingTable) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMInitalizeRoutingTableParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go index 0e3aea5c244..b43e8d3d116 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go @@ -31,6 +31,9 @@ type NLMInitalizeRoutingTableAck struct { *NLM NumberOfPorts uint8 PortMappings []*NLMInitalizeRoutingTablePortMapping + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type INLMInitalizeRoutingTableAck interface { GetNumberOfPorts() uint8 // GetPortMappings returns PortMappings GetPortMappings() []*NLMInitalizeRoutingTablePortMapping - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *NLMInitalizeRoutingTableAck) GetPortMappings() []*NLMInitalizeRoutingTa // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMInitalizeRoutingTableAck(numberOfPorts uint8, portMappings []*NLMInitalizeRoutingTablePortMapping, vendorId *uint16) *NLM { +// NewNLMInitalizeRoutingTableAck factory function for NLMInitalizeRoutingTableAck +func NewNLMInitalizeRoutingTableAck(numberOfPorts uint8, portMappings []*NLMInitalizeRoutingTablePortMapping, vendorId *uint16, apduLength uint16) *NLM { child := &NLMInitalizeRoutingTableAck{ NumberOfPorts: numberOfPorts, PortMappings: portMappings, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -110,12 +114,12 @@ func (m *NLMInitalizeRoutingTableAck) GetTypeName() string { return "NLMInitalizeRoutingTableAck" } -func (m *NLMInitalizeRoutingTableAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMInitalizeRoutingTableAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMInitalizeRoutingTableAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMInitalizeRoutingTableAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numberOfPorts) lengthInBits += 8 @@ -124,15 +128,15 @@ func (m *NLMInitalizeRoutingTableAck) LengthInBitsConditional(lastItem bool) uin if len(m.PortMappings) > 0 { for i, element := range m.PortMappings { last := i == len(m.PortMappings)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *NLMInitalizeRoutingTableAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMInitalizeRoutingTableAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMInitalizeRoutingTableAckParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go index cc6aaa3d29e..b38bf3111d8 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go @@ -44,10 +44,10 @@ type INLMInitalizeRoutingTablePortMapping interface { GetPortInfoLength() uint8 // GetPortInfo returns PortInfo GetPortInfo() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *NLMInitalizeRoutingTablePortMapping) GetPortInfo() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewNLMInitalizeRoutingTablePortMapping factory function for NLMInitalizeRoutingTablePortMapping func NewNLMInitalizeRoutingTablePortMapping(destinationNetworkAddress uint16, portId uint8, portInfoLength uint8, portInfo []byte) *NLMInitalizeRoutingTablePortMapping { return &NLMInitalizeRoutingTablePortMapping{DestinationNetworkAddress: destinationNetworkAddress, PortId: portId, PortInfoLength: portInfoLength, PortInfo: portInfo} } @@ -96,11 +97,11 @@ func (m *NLMInitalizeRoutingTablePortMapping) GetTypeName() string { return "NLMInitalizeRoutingTablePortMapping" } -func (m *NLMInitalizeRoutingTablePortMapping) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMInitalizeRoutingTablePortMapping) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMInitalizeRoutingTablePortMapping) LengthInBitsConditional(lastItem bool) uint16 { +func (m *NLMInitalizeRoutingTablePortMapping) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (destinationNetworkAddress) @@ -120,8 +121,8 @@ func (m *NLMInitalizeRoutingTablePortMapping) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *NLMInitalizeRoutingTablePortMapping) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMInitalizeRoutingTablePortMapping) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMInitalizeRoutingTablePortMappingParse(readBuffer utils.ReadBuffer) (*NLMInitalizeRoutingTablePortMapping, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go index f5e9688450b..dd4df625455 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go @@ -31,6 +31,9 @@ type NLMRejectRouterToNetwork struct { *NLM RejectReason NLMRejectRouterToNetworkRejectReason DestinationNetworkAddress uint16 + + // Arguments. + ApduLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type INLMRejectRouterToNetwork interface { GetRejectReason() NLMRejectRouterToNetworkRejectReason // GetDestinationNetworkAddress returns DestinationNetworkAddress GetDestinationNetworkAddress() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,11 +80,12 @@ func (m *NLMRejectRouterToNetwork) GetDestinationNetworkAddress() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMRejectRouterToNetwork(rejectReason NLMRejectRouterToNetworkRejectReason, destinationNetworkAddress uint16, vendorId *uint16) *NLM { +// NewNLMRejectRouterToNetwork factory function for NLMRejectRouterToNetwork +func NewNLMRejectRouterToNetwork(rejectReason NLMRejectRouterToNetworkRejectReason, destinationNetworkAddress uint16, vendorId *uint16, apduLength uint16) *NLM { child := &NLMRejectRouterToNetwork{ RejectReason: rejectReason, DestinationNetworkAddress: destinationNetworkAddress, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -110,12 +114,12 @@ func (m *NLMRejectRouterToNetwork) GetTypeName() string { return "NLMRejectRouterToNetwork" } -func (m *NLMRejectRouterToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMRejectRouterToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMRejectRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMRejectRouterToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (rejectReason) lengthInBits += 8 @@ -126,8 +130,8 @@ func (m *NLMRejectRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *NLMRejectRouterToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMRejectRouterToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMRejectRouterToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go index 9ac3ceaf6ba..3c8e72d9915 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go @@ -116,12 +116,12 @@ func CastNLMRejectRouterToNetworkRejectReason(structType interface{}) NLMRejectR return castFunc(structType) } -func (m NLMRejectRouterToNetworkRejectReason) LengthInBits() uint16 { +func (m NLMRejectRouterToNetworkRejectReason) GetLengthInBits() uint16 { return 8 } -func (m NLMRejectRouterToNetworkRejectReason) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m NLMRejectRouterToNetworkRejectReason) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMRejectRouterToNetworkRejectReasonParse(readBuffer utils.ReadBuffer) (NLMRejectRouterToNetworkRejectReason, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go index d2433e62113..c37e0f7f450 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go @@ -30,16 +30,19 @@ import ( type NLMRouterAvailableToNetwork struct { *NLM DestinationNetworkAddress []uint16 + + // Arguments. + ApduLength uint16 } // The corresponding interface type INLMRouterAvailableToNetwork interface { // GetDestinationNetworkAddress returns DestinationNetworkAddress GetDestinationNetworkAddress() []uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,10 +73,11 @@ func (m *NLMRouterAvailableToNetwork) GetDestinationNetworkAddress() []uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMRouterAvailableToNetwork(destinationNetworkAddress []uint16, vendorId *uint16) *NLM { +// NewNLMRouterAvailableToNetwork factory function for NLMRouterAvailableToNetwork +func NewNLMRouterAvailableToNetwork(destinationNetworkAddress []uint16, vendorId *uint16, apduLength uint16) *NLM { child := &NLMRouterAvailableToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -102,12 +106,12 @@ func (m *NLMRouterAvailableToNetwork) GetTypeName() string { return "NLMRouterAvailableToNetwork" } -func (m *NLMRouterAvailableToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMRouterAvailableToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMRouterAvailableToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMRouterAvailableToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.DestinationNetworkAddress) > 0 { @@ -117,8 +121,8 @@ func (m *NLMRouterAvailableToNetwork) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *NLMRouterAvailableToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMRouterAvailableToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMRouterAvailableToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go index b62ac43d2a5..0ce14185ea3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go @@ -30,16 +30,19 @@ import ( type NLMRouterBusyToNetwork struct { *NLM DestinationNetworkAddress []uint16 + + // Arguments. + ApduLength uint16 } // The corresponding interface type INLMRouterBusyToNetwork interface { // GetDestinationNetworkAddress returns DestinationNetworkAddress GetDestinationNetworkAddress() []uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,10 +73,11 @@ func (m *NLMRouterBusyToNetwork) GetDestinationNetworkAddress() []uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMRouterBusyToNetwork(destinationNetworkAddress []uint16, vendorId *uint16) *NLM { +// NewNLMRouterBusyToNetwork factory function for NLMRouterBusyToNetwork +func NewNLMRouterBusyToNetwork(destinationNetworkAddress []uint16, vendorId *uint16, apduLength uint16) *NLM { child := &NLMRouterBusyToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -102,12 +106,12 @@ func (m *NLMRouterBusyToNetwork) GetTypeName() string { return "NLMRouterBusyToNetwork" } -func (m *NLMRouterBusyToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMRouterBusyToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMRouterBusyToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMRouterBusyToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.DestinationNetworkAddress) > 0 { @@ -117,8 +121,8 @@ func (m *NLMRouterBusyToNetwork) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *NLMRouterBusyToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMRouterBusyToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMRouterBusyToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go index 3cc2b2ee5e5..b66fe2ad8f3 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go @@ -30,16 +30,19 @@ import ( type NLMWhoIsRouterToNetwork struct { *NLM DestinationNetworkAddress []uint16 + + // Arguments. + ApduLength uint16 } // The corresponding interface type INLMWhoIsRouterToNetwork interface { // GetDestinationNetworkAddress returns DestinationNetworkAddress GetDestinationNetworkAddress() []uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,10 +73,11 @@ func (m *NLMWhoIsRouterToNetwork) GetDestinationNetworkAddress() []uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewNLMWhoIsRouterToNetwork(destinationNetworkAddress []uint16, vendorId *uint16) *NLM { +// NewNLMWhoIsRouterToNetwork factory function for NLMWhoIsRouterToNetwork +func NewNLMWhoIsRouterToNetwork(destinationNetworkAddress []uint16, vendorId *uint16, apduLength uint16) *NLM { child := &NLMWhoIsRouterToNetwork{ DestinationNetworkAddress: destinationNetworkAddress, - NLM: NewNLM(vendorId), + NLM: NewNLM(vendorId, apduLength), } child.Child = child return child.NLM @@ -102,12 +106,12 @@ func (m *NLMWhoIsRouterToNetwork) GetTypeName() string { return "NLMWhoIsRouterToNetwork" } -func (m *NLMWhoIsRouterToNetwork) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NLMWhoIsRouterToNetwork) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NLMWhoIsRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *NLMWhoIsRouterToNetwork) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.DestinationNetworkAddress) > 0 { @@ -117,8 +121,8 @@ func (m *NLMWhoIsRouterToNetwork) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *NLMWhoIsRouterToNetwork) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NLMWhoIsRouterToNetwork) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NLMWhoIsRouterToNetworkParse(readBuffer utils.ReadBuffer, apduLength uint16, messageType uint8) (*NLM, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go index 4d413bb7638..5594a37c6bf 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go @@ -40,9 +40,9 @@ type NPDU struct { HopCount *uint8 Nlm *NLM Apdu *APDU - SourceLengthAddon uint16 - DestinationLengthAddon uint16 - PayloadSubtraction uint16 + + // Arguments. + NpduLength uint16 } // The corresponding interface @@ -75,10 +75,10 @@ type INPDU interface { GetDestinationLengthAddon() uint16 // GetPayloadSubtraction returns PayloadSubtraction GetPayloadSubtraction() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -134,22 +134,62 @@ func (m *NPDU) GetApdu() *APDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// func (m *NPDU) GetSourceLengthAddon() uint16 { - // TODO: calculation should happen here instead accessing the stored field - return m.SourceLengthAddon + destinationNetworkAddress := m.DestinationNetworkAddress + _ = destinationNetworkAddress + destinationLength := m.DestinationLength + _ = destinationLength + sourceNetworkAddress := m.SourceNetworkAddress + _ = sourceNetworkAddress + sourceLength := m.SourceLength + _ = sourceLength + hopCount := m.HopCount + _ = hopCount + nlm := m.Nlm + _ = nlm + apdu := m.Apdu + _ = apdu + return utils.InlineIf(m.GetControl().GetSourceSpecified(), func() interface{} { return uint16(uint16(uint16(3)) + uint16((*m.GetSourceLength()))) }, func() interface{} { return uint16(uint16(0)) }).(uint16) } func (m *NPDU) GetDestinationLengthAddon() uint16 { - // TODO: calculation should happen here instead accessing the stored field - return m.DestinationLengthAddon + destinationNetworkAddress := m.DestinationNetworkAddress + _ = destinationNetworkAddress + destinationLength := m.DestinationLength + _ = destinationLength + sourceNetworkAddress := m.SourceNetworkAddress + _ = sourceNetworkAddress + sourceLength := m.SourceLength + _ = sourceLength + hopCount := m.HopCount + _ = hopCount + nlm := m.Nlm + _ = nlm + apdu := m.Apdu + _ = apdu + return utils.InlineIf(m.GetControl().GetDestinationSpecified(), func() interface{} { return uint16(uint16(uint16(3)) + uint16((*m.GetDestinationLength()))) }, func() interface{} { return uint16(uint16(0)) }).(uint16) } func (m *NPDU) GetPayloadSubtraction() uint16 { - // TODO: calculation should happen here instead accessing the stored field - return m.PayloadSubtraction + destinationNetworkAddress := m.DestinationNetworkAddress + _ = destinationNetworkAddress + destinationLength := m.DestinationLength + _ = destinationLength + sourceNetworkAddress := m.SourceNetworkAddress + _ = sourceNetworkAddress + sourceLength := m.SourceLength + _ = sourceLength + hopCount := m.HopCount + _ = hopCount + nlm := m.Nlm + _ = nlm + apdu := m.Apdu + _ = apdu + return uint16(uint16(2)) + uint16(uint16(uint16(uint16(m.GetSourceLengthAddon())+uint16(m.GetDestinationLengthAddon()))+uint16(uint16(utils.InlineIf(bool(bool(m.GetControl().GetDestinationSpecified()) || bool(m.GetControl().GetSourceSpecified())), func() interface{} { return uint16(uint16(1)) }, func() interface{} { return uint16(uint16(0)) }).(uint16))))) } -func NewNPDU(protocolVersionNumber uint8, control *NPDUControl, destinationNetworkAddress *uint16, destinationLength *uint8, destinationAddress []uint8, sourceNetworkAddress *uint16, sourceLength *uint8, sourceAddress []uint8, hopCount *uint8, nlm *NLM, apdu *APDU, sourceLengthAddon uint16, destinationLengthAddon uint16, payloadSubtraction uint16) *NPDU { - return &NPDU{ProtocolVersionNumber: protocolVersionNumber, Control: control, DestinationNetworkAddress: destinationNetworkAddress, DestinationLength: destinationLength, DestinationAddress: destinationAddress, SourceNetworkAddress: sourceNetworkAddress, SourceLength: sourceLength, SourceAddress: sourceAddress, HopCount: hopCount, Nlm: nlm, Apdu: apdu, SourceLengthAddon: sourceLengthAddon, DestinationLengthAddon: destinationLengthAddon, PayloadSubtraction: payloadSubtraction} +// NewNPDU factory function for NPDU +func NewNPDU(protocolVersionNumber uint8, control *NPDUControl, destinationNetworkAddress *uint16, destinationLength *uint8, destinationAddress []uint8, sourceNetworkAddress *uint16, sourceLength *uint8, sourceAddress []uint8, hopCount *uint8, nlm *NLM, apdu *APDU, npduLength uint16) *NPDU { + return &NPDU{ProtocolVersionNumber: protocolVersionNumber, Control: control, DestinationNetworkAddress: destinationNetworkAddress, DestinationLength: destinationLength, DestinationAddress: destinationAddress, SourceNetworkAddress: sourceNetworkAddress, SourceLength: sourceLength, SourceAddress: sourceAddress, HopCount: hopCount, Nlm: nlm, Apdu: apdu, NpduLength: npduLength} } func CastNPDU(structType interface{}) *NPDU { @@ -169,18 +209,18 @@ func (m *NPDU) GetTypeName() string { return "NPDU" } -func (m *NPDU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NPDU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NPDU) LengthInBitsConditional(lastItem bool) uint16 { +func (m *NPDU) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (protocolVersionNumber) lengthInBits += 8 // Simple field (control) - lengthInBits += m.Control.LengthInBits() + lengthInBits += m.Control.GetLengthInBits() // Optional Field (destinationNetworkAddress) if m.DestinationNetworkAddress != nil { @@ -225,19 +265,19 @@ func (m *NPDU) LengthInBitsConditional(lastItem bool) uint16 { // Optional Field (nlm) if m.Nlm != nil { - lengthInBits += (*m.Nlm).LengthInBits() + lengthInBits += (*m.Nlm).GetLengthInBits() } // Optional Field (apdu) if m.Apdu != nil { - lengthInBits += (*m.Apdu).LengthInBits() + lengthInBits += (*m.Apdu).GetLengthInBits() } return lengthInBits } -func (m *NPDU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NPDU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { @@ -267,7 +307,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { // Optional Field (destinationNetworkAddress) (Can be skipped, if a given expression evaluates to false) var destinationNetworkAddress *uint16 = nil - if control.DestinationSpecified { + if control.GetDestinationSpecified() { _val, _err := readBuffer.ReadUint16("destinationNetworkAddress", 16) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'destinationNetworkAddress' field") @@ -277,7 +317,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { // Optional Field (destinationLength) (Can be skipped, if a given expression evaluates to false) var destinationLength *uint8 = nil - if control.DestinationSpecified { + if control.GetDestinationSpecified() { _val, _err := readBuffer.ReadUint8("destinationLength", 8) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'destinationLength' field") @@ -290,9 +330,9 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { return nil, pullErr } // Count array - destinationAddress := make([]uint8, utils.InlineIf(control.DestinationSpecified, func() interface{} { return uint16((*destinationLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) + destinationAddress := make([]uint8, utils.InlineIf(control.GetDestinationSpecified(), func() interface{} { return uint16((*destinationLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) { - for curItem := uint16(0); curItem < uint16(utils.InlineIf(control.DestinationSpecified, func() interface{} { return uint16((*destinationLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)); curItem++ { + for curItem := uint16(0); curItem < uint16(utils.InlineIf(control.GetDestinationSpecified(), func() interface{} { return uint16((*destinationLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)); curItem++ { _item, _err := readBuffer.ReadUint8("", 8) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'destinationAddress' field") @@ -306,7 +346,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { // Optional Field (sourceNetworkAddress) (Can be skipped, if a given expression evaluates to false) var sourceNetworkAddress *uint16 = nil - if control.SourceSpecified { + if control.GetSourceSpecified() { _val, _err := readBuffer.ReadUint16("sourceNetworkAddress", 16) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'sourceNetworkAddress' field") @@ -316,7 +356,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { // Optional Field (sourceLength) (Can be skipped, if a given expression evaluates to false) var sourceLength *uint8 = nil - if control.SourceSpecified { + if control.GetSourceSpecified() { _val, _err := readBuffer.ReadUint8("sourceLength", 8) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'sourceLength' field") @@ -329,9 +369,9 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { return nil, pullErr } // Count array - sourceAddress := make([]uint8, utils.InlineIf(control.SourceSpecified, func() interface{} { return uint16((*sourceLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) + sourceAddress := make([]uint8, utils.InlineIf(control.GetSourceSpecified(), func() interface{} { return uint16((*sourceLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) { - for curItem := uint16(0); curItem < uint16(utils.InlineIf(control.SourceSpecified, func() interface{} { return uint16((*sourceLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)); curItem++ { + for curItem := uint16(0); curItem < uint16(utils.InlineIf(control.GetSourceSpecified(), func() interface{} { return uint16((*sourceLength)) }, func() interface{} { return uint16(uint16(0)) }).(uint16)); curItem++ { _item, _err := readBuffer.ReadUint8("", 8) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'sourceAddress' field") @@ -345,7 +385,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { // Optional Field (hopCount) (Can be skipped, if a given expression evaluates to false) var hopCount *uint8 = nil - if control.DestinationSpecified { + if control.GetDestinationSpecified() { _val, _err := readBuffer.ReadUint8("hopCount", 8) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'hopCount' field") @@ -354,20 +394,23 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { } // Virtual field - _sourceLengthAddon := utils.InlineIf(control.SourceSpecified, func() interface{} { return uint16(uint16(uint16(3)) + uint16((*sourceLength))) }, func() interface{} { return uint16(uint16(0)) }).(uint16) + _sourceLengthAddon := utils.InlineIf(control.GetSourceSpecified(), func() interface{} { return uint16(uint16(uint16(3)) + uint16((*sourceLength))) }, func() interface{} { return uint16(uint16(0)) }).(uint16) sourceLengthAddon := uint16(_sourceLengthAddon) + _ = sourceLengthAddon // Virtual field - _destinationLengthAddon := utils.InlineIf(control.DestinationSpecified, func() interface{} { return uint16(uint16(uint16(3)) + uint16((*destinationLength))) }, func() interface{} { return uint16(uint16(0)) }).(uint16) + _destinationLengthAddon := utils.InlineIf(control.GetDestinationSpecified(), func() interface{} { return uint16(uint16(uint16(3)) + uint16((*destinationLength))) }, func() interface{} { return uint16(uint16(0)) }).(uint16) destinationLengthAddon := uint16(_destinationLengthAddon) + _ = destinationLengthAddon // Virtual field - _payloadSubtraction := uint16(uint16(2)) + uint16(uint16(uint16(uint16(sourceLengthAddon)+uint16(destinationLengthAddon))+uint16(uint16(utils.InlineIf(bool(bool(control.DestinationSpecified) || bool(control.SourceSpecified)), func() interface{} { return uint16(uint16(1)) }, func() interface{} { return uint16(uint16(0)) }).(uint16))))) + _payloadSubtraction := uint16(uint16(2)) + uint16(uint16(uint16(uint16(sourceLengthAddon)+uint16(destinationLengthAddon))+uint16(uint16(utils.InlineIf(bool(bool(control.GetDestinationSpecified()) || bool(control.GetSourceSpecified())), func() interface{} { return uint16(uint16(1)) }, func() interface{} { return uint16(uint16(0)) }).(uint16))))) payloadSubtraction := uint16(_payloadSubtraction) + _ = payloadSubtraction // Optional Field (nlm) (Can be skipped, if a given expression evaluates to false) var nlm *NLM = nil - if control.MessageTypeFieldPresent { + if control.GetMessageTypeFieldPresent() { currentPos := readBuffer.GetPos() if pullErr := readBuffer.PullContext("nlm"); pullErr != nil { return nil, pullErr @@ -388,7 +431,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { // Optional Field (apdu) (Can be skipped, if a given expression evaluates to false) var apdu *APDU = nil - if !(control.MessageTypeFieldPresent) { + if !(control.GetMessageTypeFieldPresent()) { currentPos := readBuffer.GetPos() if pullErr := readBuffer.PullContext("apdu"); pullErr != nil { return nil, pullErr @@ -412,7 +455,7 @@ func NPDUParse(readBuffer utils.ReadBuffer, npduLength uint16) (*NPDU, error) { } // Create the instance - return NewNPDU(protocolVersionNumber, control, destinationNetworkAddress, destinationLength, destinationAddress, sourceNetworkAddress, sourceLength, sourceAddress, hopCount, nlm, apdu, sourceLengthAddon, destinationLengthAddon, payloadSubtraction), nil + return NewNPDU(protocolVersionNumber, control, destinationNetworkAddress, destinationLength, destinationAddress, sourceNetworkAddress, sourceLength, sourceAddress, hopCount, nlm, apdu, npduLength), nil } func (m *NPDU) Serialize(writeBuffer utils.WriteBuffer) error { @@ -521,15 +564,15 @@ func (m *NPDU) Serialize(writeBuffer utils.WriteBuffer) error { } } // Virtual field - if _sourceLengthAddonErr := writeBuffer.WriteVirtual("sourceLengthAddon", m.SourceLengthAddon); _sourceLengthAddonErr != nil { + if _sourceLengthAddonErr := writeBuffer.WriteVirtual("sourceLengthAddon", m.GetSourceLengthAddon()); _sourceLengthAddonErr != nil { return errors.Wrap(_sourceLengthAddonErr, "Error serializing 'sourceLengthAddon' field") } // Virtual field - if _destinationLengthAddonErr := writeBuffer.WriteVirtual("destinationLengthAddon", m.DestinationLengthAddon); _destinationLengthAddonErr != nil { + if _destinationLengthAddonErr := writeBuffer.WriteVirtual("destinationLengthAddon", m.GetDestinationLengthAddon()); _destinationLengthAddonErr != nil { return errors.Wrap(_destinationLengthAddonErr, "Error serializing 'destinationLengthAddon' field") } // Virtual field - if _payloadSubtractionErr := writeBuffer.WriteVirtual("payloadSubtraction", m.PayloadSubtraction); _payloadSubtractionErr != nil { + if _payloadSubtractionErr := writeBuffer.WriteVirtual("payloadSubtraction", m.GetPayloadSubtraction()); _payloadSubtractionErr != nil { return errors.Wrap(_payloadSubtractionErr, "Error serializing 'payloadSubtraction' field") } diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go index 5e48825b59c..f9f5b6e309d 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go @@ -48,10 +48,10 @@ type INPDUControl interface { GetExpectingReply() bool // GetNetworkPriority returns NetworkPriority GetNetworkPriority() NPDUNetworkPriority - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -83,6 +83,7 @@ func (m *NPDUControl) GetNetworkPriority() NPDUNetworkPriority { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewNPDUControl factory function for NPDUControl func NewNPDUControl(messageTypeFieldPresent bool, destinationSpecified bool, sourceSpecified bool, expectingReply bool, networkPriority NPDUNetworkPriority) *NPDUControl { return &NPDUControl{MessageTypeFieldPresent: messageTypeFieldPresent, DestinationSpecified: destinationSpecified, SourceSpecified: sourceSpecified, ExpectingReply: expectingReply, NetworkPriority: networkPriority} } @@ -104,11 +105,11 @@ func (m *NPDUControl) GetTypeName() string { return "NPDUControl" } -func (m *NPDUControl) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *NPDUControl) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *NPDUControl) LengthInBitsConditional(lastItem bool) uint16 { +func (m *NPDUControl) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (messageTypeFieldPresent) @@ -135,8 +136,8 @@ func (m *NPDUControl) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *NPDUControl) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *NPDUControl) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NPDUControlParse(readBuffer utils.ReadBuffer) (*NPDUControl, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUNetworkPriority.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUNetworkPriority.go index 4ecde4ba1bd..18b1668fbfe 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUNetworkPriority.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUNetworkPriority.go @@ -98,12 +98,12 @@ func CastNPDUNetworkPriority(structType interface{}) NPDUNetworkPriority { return castFunc(structType) } -func (m NPDUNetworkPriority) LengthInBits() uint16 { +func (m NPDUNetworkPriority) GetLengthInBits() uint16 { return 2 } -func (m NPDUNetworkPriority) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m NPDUNetworkPriority) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func NPDUNetworkPriorityParse(readBuffer utils.ReadBuffer) (NPDUNetworkPriority, error) { diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/TagClass.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/TagClass.go index 978437d61ec..9c776e9e103 100644 --- a/plc4go/internal/plc4go/bacnetip/readwrite/model/TagClass.go +++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/TagClass.go @@ -86,12 +86,12 @@ func CastTagClass(structType interface{}) TagClass { return castFunc(structType) } -func (m TagClass) LengthInBits() uint16 { +func (m TagClass) GetLengthInBits() uint16 { return 1 } -func (m TagClass) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m TagClass) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TagClassParse(readBuffer utils.ReadBuffer) (TagClass, error) { diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go index 1f4dc70265c..e603f375186 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go @@ -41,10 +41,10 @@ type IDF1Command interface { GetStatus() uint8 // GetTransactionCounter returns TransactionCounter GetTransactionCounter() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *DF1Command) GetTransactionCounter() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1Command factory function for DF1Command func NewDF1Command(status uint8, transactionCounter uint16) *DF1Command { return &DF1Command{Status: status, TransactionCounter: transactionCounter} } @@ -97,15 +98,15 @@ func (m *DF1Command) GetTypeName() string { return "DF1Command" } -func (m *DF1Command) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1Command) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1Command) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *DF1Command) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *DF1Command) ParentLengthInBits() uint16 { +func (m *DF1Command) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (commandCode) lengthInBits += 8 @@ -119,8 +120,8 @@ func (m *DF1Command) ParentLengthInBits() uint16 { return lengthInBits } -func (m *DF1Command) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1Command) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1CommandParse(readBuffer utils.ReadBuffer) (*DF1Command, error) { diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go index a2a281959a3..2fd83d09f8c 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go @@ -39,10 +39,10 @@ type DF1Symbol struct { type IDF1Symbol interface { // SymbolType returns SymbolType SymbolType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -67,6 +67,7 @@ type IDF1SymbolChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1Symbol factory function for DF1Symbol func NewDF1Symbol() *DF1Symbol { return &DF1Symbol{} } @@ -88,15 +89,15 @@ func (m *DF1Symbol) GetTypeName() string { return "DF1Symbol" } -func (m *DF1Symbol) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1Symbol) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1Symbol) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *DF1Symbol) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *DF1Symbol) ParentLengthInBits() uint16 { +func (m *DF1Symbol) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Const Field (messageStart) @@ -107,8 +108,8 @@ func (m *DF1Symbol) ParentLengthInBits() uint16 { return lengthInBits } -func (m *DF1Symbol) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1Symbol) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1SymbolParse(readBuffer utils.ReadBuffer) (*DF1Symbol, error) { diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go index a25824124ac..4fd2cc81522 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go @@ -47,10 +47,10 @@ type IDF1SymbolMessageFrame interface { GetSourceAddress() uint8 // GetCommand returns Command GetCommand() *DF1Command - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *DF1SymbolMessageFrame) GetCommand() *DF1Command { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1SymbolMessageFrame factory function for DF1SymbolMessageFrame func NewDF1SymbolMessageFrame(destinationAddress uint8, sourceAddress uint8, command *DF1Command) *DF1Symbol { child := &DF1SymbolMessageFrame{ DestinationAddress: destinationAddress, @@ -121,12 +122,12 @@ func (m *DF1SymbolMessageFrame) GetTypeName() string { return "DF1SymbolMessageFrame" } -func (m *DF1SymbolMessageFrame) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1SymbolMessageFrame) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1SymbolMessageFrame) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1SymbolMessageFrame) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationAddress) lengthInBits += 8 @@ -135,7 +136,7 @@ func (m *DF1SymbolMessageFrame) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (command) - lengthInBits += m.Command.LengthInBits() + lengthInBits += m.Command.GetLengthInBits() // Const Field (messageEnd) lengthInBits += 8 @@ -149,8 +150,8 @@ func (m *DF1SymbolMessageFrame) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *DF1SymbolMessageFrame) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1SymbolMessageFrame) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1SymbolMessageFrameParse(readBuffer utils.ReadBuffer) (*DF1Symbol, error) { @@ -279,7 +280,7 @@ func (m *DF1SymbolMessageFrame) Serialize(writeBuffer utils.WriteBuffer) error { // Checksum Field (checksum) (Calculated) { - _checksum, _checksumErr := CrcCheck(m.DestinationAddress, m.SourceAddress, m.Command) + _checksum, _checksumErr := CrcCheck(m.GetDestinationAddress(), m.GetSourceAddress(), m.GetCommand()) if _checksumErr != nil { return errors.Wrap(_checksumErr, "Error serializing 'checksum' field") } diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go index 8aa5ebd6d2f..e2c590b19e6 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go @@ -32,10 +32,10 @@ type DF1SymbolMessageFrameACK struct { // The corresponding interface type IDF1SymbolMessageFrameACK interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *DF1SymbolMessageFrameACK) InitializeParent(parent *DF1Symbol) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1SymbolMessageFrameACK factory function for DF1SymbolMessageFrameACK func NewDF1SymbolMessageFrameACK() *DF1Symbol { child := &DF1SymbolMessageFrameACK{ DF1Symbol: NewDF1Symbol(), @@ -92,18 +93,18 @@ func (m *DF1SymbolMessageFrameACK) GetTypeName() string { return "DF1SymbolMessageFrameACK" } -func (m *DF1SymbolMessageFrameACK) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1SymbolMessageFrameACK) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1SymbolMessageFrameACK) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1SymbolMessageFrameACK) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *DF1SymbolMessageFrameACK) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1SymbolMessageFrameACK) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1SymbolMessageFrameACKParse(readBuffer utils.ReadBuffer) (*DF1Symbol, error) { diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go index dff350a6304..61140409c74 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go @@ -32,10 +32,10 @@ type DF1SymbolMessageFrameNAK struct { // The corresponding interface type IDF1SymbolMessageFrameNAK interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *DF1SymbolMessageFrameNAK) InitializeParent(parent *DF1Symbol) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1SymbolMessageFrameNAK factory function for DF1SymbolMessageFrameNAK func NewDF1SymbolMessageFrameNAK() *DF1Symbol { child := &DF1SymbolMessageFrameNAK{ DF1Symbol: NewDF1Symbol(), @@ -92,18 +93,18 @@ func (m *DF1SymbolMessageFrameNAK) GetTypeName() string { return "DF1SymbolMessageFrameNAK" } -func (m *DF1SymbolMessageFrameNAK) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1SymbolMessageFrameNAK) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1SymbolMessageFrameNAK) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1SymbolMessageFrameNAK) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *DF1SymbolMessageFrameNAK) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1SymbolMessageFrameNAK) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1SymbolMessageFrameNAKParse(readBuffer utils.ReadBuffer) (*DF1Symbol, error) { diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go index 8b3ab442221..a3cbac02c1e 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go @@ -39,10 +39,10 @@ type IDF1UnprotectedReadRequest interface { GetAddress() uint16 // GetSize returns Size GetSize() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -78,6 +78,7 @@ func (m *DF1UnprotectedReadRequest) GetSize() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1UnprotectedReadRequest factory function for DF1UnprotectedReadRequest func NewDF1UnprotectedReadRequest(address uint16, size uint8, status uint8, transactionCounter uint16) *DF1Command { child := &DF1UnprotectedReadRequest{ Address: address, @@ -111,12 +112,12 @@ func (m *DF1UnprotectedReadRequest) GetTypeName() string { return "DF1UnprotectedReadRequest" } -func (m *DF1UnprotectedReadRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1UnprotectedReadRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1UnprotectedReadRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1UnprotectedReadRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (address) lengthInBits += 16 @@ -127,8 +128,8 @@ func (m *DF1UnprotectedReadRequest) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *DF1UnprotectedReadRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1UnprotectedReadRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1UnprotectedReadRequestParse(readBuffer utils.ReadBuffer) (*DF1Command, error) { diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go index f0db51e08fa..cedf1462eb9 100644 --- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go +++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go @@ -35,10 +35,10 @@ type DF1UnprotectedReadResponse struct { type IDF1UnprotectedReadResponse interface { // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,6 +70,7 @@ func (m *DF1UnprotectedReadResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDF1UnprotectedReadResponse factory function for DF1UnprotectedReadResponse func NewDF1UnprotectedReadResponse(data []byte, status uint8, transactionCounter uint16) *DF1Command { child := &DF1UnprotectedReadResponse{ Data: data, @@ -102,12 +103,12 @@ func (m *DF1UnprotectedReadResponse) GetTypeName() string { return "DF1UnprotectedReadResponse" } -func (m *DF1UnprotectedReadResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DF1UnprotectedReadResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DF1UnprotectedReadResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DF1UnprotectedReadResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Manual Array Field (data) data := m.Data @@ -116,8 +117,8 @@ func (m *DF1UnprotectedReadResponse) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *DF1UnprotectedReadResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DF1UnprotectedReadResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DF1UnprotectedReadResponseParse(readBuffer utils.ReadBuffer) (*DF1Command, error) { diff --git a/plc4go/internal/plc4go/eip/Reader.go b/plc4go/internal/plc4go/eip/Reader.go index 3b78cc677a4..114a06324d0 100644 --- a/plc4go/internal/plc4go/eip/Reader.go +++ b/plc4go/internal/plc4go/eip/Reader.go @@ -72,7 +72,7 @@ func (m *Reader) Read(readRequest model.PlcReadRequest) <-chan model.PlcReadRequ } return } - request := readWriteModel.NewCipReadRequest(getRequestSize(tag), ansi, elements) + request := readWriteModel.NewCipReadRequest(getRequestSize(tag), ansi, elements, 0) requestItems[i] = request } if len(requestItems) > 1 { @@ -81,7 +81,7 @@ func (m *Reader) Read(readRequest model.PlcReadRequest) <-chan model.PlcReadRequ offset := 2 + nb*2 for i := uint16(0); i < nb; i++ { offsets[i] = offset - offset += requestItems[i].LengthInBytes() + offset += requestItems[i].GetLengthInBytes() } serviceArr := make([]*readWriteModel.CipService, nb) @@ -89,20 +89,23 @@ func (m *Reader) Read(readRequest model.PlcReadRequest) <-chan model.PlcReadRequ serviceArr[i] = requestItems[i] } - data := readWriteModel.NewServices(nb, offsets, serviceArr) + data := readWriteModel.NewServices(nb, offsets, serviceArr, 0) //Encapsulate the data pkt := readWriteModel.NewCipRRData( readWriteModel.NewCipExchange( readWriteModel.NewCipUnconnectedRequest( - readWriteModel.NewMultipleServiceRequest(data), + readWriteModel.NewMultipleServiceRequest(data, 0), m.configuration.backplane, m.configuration.slot, + 0, ), + 0, ), *m.sessionHandle, 0, make([]byte, 8), 0, + 0, ) // Start a new request-transaction (Is ended in the response-handler) @@ -180,12 +183,15 @@ func (m *Reader) Read(readRequest model.PlcReadRequest) <-chan model.PlcReadRequ requestItems[0], m.configuration.backplane, m.configuration.slot, + 0, ), + 0, ), *m.sessionHandle, 0, make([]byte, 8), 0, + 0, ) // Start a new request-transaction (Is ended in the response-handler) @@ -407,7 +413,7 @@ func (m *Reader) ToPlc4xReadResponse(response *readWriteModel.CipService, readRe return nil, err } } - services := readWriteModel.NewServices(nb, multipleServiceResponse.Offsets, arr) + services := readWriteModel.NewServices(nb, multipleServiceResponse.Offsets, arr, 0) for i, fieldName := range readRequest.GetFieldNames() { field := readRequest.GetField(fieldName).(EIPPlcField) if cipReadResponse, ok := services.Services[i].Child.(*readWriteModel.CipReadResponse); ok { diff --git a/plc4go/internal/plc4go/eip/Writer.go b/plc4go/internal/plc4go/eip/Writer.go index 929de9fc0be..633b3c71528 100644 --- a/plc4go/internal/plc4go/eip/Writer.go +++ b/plc4go/internal/plc4go/eip/Writer.go @@ -93,7 +93,7 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR } return } - items[i] = readWriteModel.NewCipWriteRequest(requestPathSize, ansi, field.GetType(), elements, data) + items[i] = readWriteModel.NewCipWriteRequest(requestPathSize, ansi, field.GetType(), elements, data, 0) } if len(items) == 1 { @@ -105,12 +105,15 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR items[0], m.configuration.backplane, m.configuration.slot, + 0, ), + 0, ), *m.sessionHandle, 0, *m.senderContext, 0, + 0, ) // Start a new request-transaction (Is ended in the response-handler) transaction := m.tm.StartTransaction() @@ -181,7 +184,7 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR offset := 2 + nb*2 for i := uint16(0); i < nb; i++ { offsets[i] = offset - offset += items[i].LengthInBytes() + offset += items[i].GetLengthInBytes() } serviceArr := make([]*readWriteModel.CipService, nb) @@ -189,22 +192,25 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR serviceArr[i] = items[i] } - data := readWriteModel.NewServices(nb, offsets, serviceArr) + data := readWriteModel.NewServices(nb, offsets, serviceArr, 0) // Assemble the finished paket log.Trace().Msg("Assemble paket") pkt := readWriteModel.NewCipRRData( readWriteModel.NewCipExchange( readWriteModel.NewCipUnconnectedRequest( - readWriteModel.NewMultipleServiceRequest(data), + readWriteModel.NewMultipleServiceRequest(data, 0), m.configuration.backplane, m.configuration.slot, + 0, ), + 0, ), *m.sessionHandle, 0, *m.senderContext, 0, + 0, ) // Start a new request-transaction (Is ended in the response-handler) transaction := m.tm.StartTransaction() @@ -336,7 +342,7 @@ func (m Writer) ToPlc4xWriteResponse(response *readWriteModel.CipService, writeR return nil, err } } - services := readWriteModel.NewServices(nb, multipleServiceResponse.Offsets, arr) + services := readWriteModel.NewServices(nb, multipleServiceResponse.Offsets, arr, 0) for i, fieldName := range writeRequest.GetFieldNames() { if writeResponse, ok := services.Services[i].Child.(*readWriteModel.CipWriteResponse); ok { code := decodeResponseCode(writeResponse.Status) diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CIPDataTypeCode.go b/plc4go/internal/plc4go/eip/readwrite/model/CIPDataTypeCode.go index e53fb4a5ebe..5548dd29fa7 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CIPDataTypeCode.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CIPDataTypeCode.go @@ -176,12 +176,12 @@ func CastCIPDataTypeCode(structType interface{}) CIPDataTypeCode { return castFunc(structType) } -func (m CIPDataTypeCode) LengthInBits() uint16 { +func (m CIPDataTypeCode) GetLengthInBits() uint16 { return 16 } -func (m CIPDataTypeCode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m CIPDataTypeCode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CIPDataTypeCodeParse(readBuffer utils.ReadBuffer) (CIPDataTypeCode, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go index 4da2c2feb96..76936a89e11 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go @@ -35,16 +35,19 @@ const CipExchange_UNCONNECTEDDATA uint16 = 0x00B2 // The data-structure of this message type CipExchange struct { Service *CipService + + // Arguments. + ExchangeLen uint16 } // The corresponding interface type ICipExchange interface { // GetService returns Service GetService() *CipService - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -60,8 +63,9 @@ func (m *CipExchange) GetService() *CipService { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipExchange(service *CipService) *CipExchange { - return &CipExchange{Service: service} +// NewCipExchange factory function for CipExchange +func NewCipExchange(service *CipService, exchangeLen uint16) *CipExchange { + return &CipExchange{Service: service, ExchangeLen: exchangeLen} } func CastCipExchange(structType interface{}) *CipExchange { @@ -81,11 +85,11 @@ func (m *CipExchange) GetTypeName() string { return "CipExchange" } -func (m *CipExchange) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipExchange) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipExchange) LengthInBitsConditional(lastItem bool) uint16 { +func (m *CipExchange) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Const Field (itemCount) @@ -101,13 +105,13 @@ func (m *CipExchange) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 16 // Simple field (service) - lengthInBits += m.Service.LengthInBits() + lengthInBits += m.Service.GetLengthInBits() return lengthInBits } -func (m *CipExchange) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipExchange) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipExchangeParse(readBuffer utils.ReadBuffer, exchangeLen uint16) (*CipExchange, error) { @@ -167,7 +171,7 @@ func CipExchangeParse(readBuffer utils.ReadBuffer, exchangeLen uint16) (*CipExch } // Create the instance - return NewCipExchange(service), nil + return NewCipExchange(service, exchangeLen), nil } func (m *CipExchange) Serialize(writeBuffer utils.WriteBuffer) error { @@ -194,7 +198,7 @@ func (m *CipExchange) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (size) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - size := uint16(uint16(uint16(uint16(m.LengthInBytes()))-uint16(uint16(8))) - uint16(uint16(2))) + size := uint16(uint16(uint16(uint16(m.GetLengthInBytes()))-uint16(uint16(8))) - uint16(uint16(2))) _sizeErr := writeBuffer.WriteUint16("size", 16, (size)) if _sizeErr != nil { return errors.Wrap(_sizeErr, "Error serializing 'size' field") diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go index 0bd5e2fb0f0..22cc66502b6 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go @@ -31,16 +31,19 @@ import ( type CipRRData struct { *EipPacket Exchange *CipExchange + + // Arguments. + Len uint16 } // The corresponding interface type ICipRRData interface { // GetExchange returns Exchange GetExchange() *CipExchange - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -74,7 +77,8 @@ func (m *CipRRData) GetExchange() *CipExchange { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipRRData(exchange *CipExchange, sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *EipPacket { +// NewCipRRData factory function for CipRRData +func NewCipRRData(exchange *CipExchange, sessionHandle uint32, status uint32, senderContext []uint8, options uint32, len uint16) *EipPacket { child := &CipRRData{ Exchange: exchange, EipPacket: NewEipPacket(sessionHandle, status, senderContext, options), @@ -106,12 +110,12 @@ func (m *CipRRData) GetTypeName() string { return "CipRRData" } -func (m *CipRRData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipRRData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipRRData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CipRRData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 32 @@ -120,13 +124,13 @@ func (m *CipRRData) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 16 // Simple field (exchange) - lengthInBits += m.Exchange.LengthInBits() + lengthInBits += m.Exchange.GetLengthInBits() return lengthInBits } -func (m *CipRRData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipRRData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipRRDataParse(readBuffer utils.ReadBuffer, len uint16) (*EipPacket, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go index 295bd48d438..5d6c266f8c6 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go @@ -32,6 +32,9 @@ type CipReadRequest struct { RequestPathSize int8 Tag []byte ElementNb uint16 + + // Arguments. + ServiceLen uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ICipReadRequest interface { GetTag() []byte // GetElementNb returns ElementNb GetElementNb() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,12 +85,13 @@ func (m *CipReadRequest) GetElementNb() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipReadRequest(requestPathSize int8, tag []byte, elementNb uint16) *CipService { +// NewCipReadRequest factory function for CipReadRequest +func NewCipReadRequest(requestPathSize int8, tag []byte, elementNb uint16, serviceLen uint16) *CipService { child := &CipReadRequest{ RequestPathSize: requestPathSize, Tag: tag, ElementNb: elementNb, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -116,12 +120,12 @@ func (m *CipReadRequest) GetTypeName() string { return "CipReadRequest" } -func (m *CipReadRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipReadRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipReadRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CipReadRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (requestPathSize) lengthInBits += 8 @@ -137,8 +141,8 @@ func (m *CipReadRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *CipReadRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipReadRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipReadRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go index 1e41474bc64..b188829bfc0 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go @@ -34,6 +34,9 @@ type CipReadResponse struct { ExtStatus uint8 DataType CIPDataTypeCode Data []byte + + // Arguments. + ServiceLen uint16 } // The corresponding interface @@ -46,10 +49,10 @@ type ICipReadResponse interface { GetDataType() CIPDataTypeCode // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,13 +93,14 @@ func (m *CipReadResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipReadResponse(status uint8, extStatus uint8, dataType CIPDataTypeCode, data []byte) *CipService { +// NewCipReadResponse factory function for CipReadResponse +func NewCipReadResponse(status uint8, extStatus uint8, dataType CIPDataTypeCode, data []byte, serviceLen uint16) *CipService { child := &CipReadResponse{ Status: status, ExtStatus: extStatus, DataType: dataType, Data: data, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -125,12 +129,12 @@ func (m *CipReadResponse) GetTypeName() string { return "CipReadResponse" } -func (m *CipReadResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipReadResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipReadResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CipReadResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 8 @@ -152,8 +156,8 @@ func (m *CipReadResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *CipReadResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipReadResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipReadResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipService.go b/plc4go/internal/plc4go/eip/readwrite/model/CipService.go index 16b58dfd23b..edee767a961 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipService.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipService.go @@ -28,17 +28,20 @@ import ( // The data-structure of this message type CipService struct { - Child ICipServiceChild + + // Arguments. + ServiceLen uint16 + Child ICipServiceChild } // The corresponding interface type ICipService interface { // Service returns Service Service() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type ICipServiceChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipService() *CipService { - return &CipService{} +// NewCipService factory function for CipService +func NewCipService(serviceLen uint16) *CipService { + return &CipService{ServiceLen: serviceLen} } func CastCipService(structType interface{}) *CipService { @@ -84,15 +88,15 @@ func (m *CipService) GetTypeName() string { return "CipService" } -func (m *CipService) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipService) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipService) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *CipService) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *CipService) ParentLengthInBits() uint16 { +func (m *CipService) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (service) lengthInBits += 8 @@ -100,8 +104,8 @@ func (m *CipService) ParentLengthInBits() uint16 { return lengthInBits } -func (m *CipService) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipService) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipServiceParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go index 380c55a5c01..021462a49b6 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go @@ -37,6 +37,9 @@ type CipUnconnectedRequest struct { UnconnectedService *CipService BackPlane int8 Slot int8 + + // Arguments. + ServiceLen uint16 } // The corresponding interface @@ -47,10 +50,10 @@ type ICipUnconnectedRequest interface { GetBackPlane() int8 // GetSlot returns Slot GetSlot() int8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,12 +90,13 @@ func (m *CipUnconnectedRequest) GetSlot() int8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipUnconnectedRequest(unconnectedService *CipService, backPlane int8, slot int8) *CipService { +// NewCipUnconnectedRequest factory function for CipUnconnectedRequest +func NewCipUnconnectedRequest(unconnectedService *CipService, backPlane int8, slot int8, serviceLen uint16) *CipService { child := &CipUnconnectedRequest{ UnconnectedService: unconnectedService, BackPlane: backPlane, Slot: slot, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -121,12 +125,12 @@ func (m *CipUnconnectedRequest) GetTypeName() string { return "CipUnconnectedRequest" } -func (m *CipUnconnectedRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipUnconnectedRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipUnconnectedRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CipUnconnectedRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 8 @@ -150,7 +154,7 @@ func (m *CipUnconnectedRequest) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 16 // Simple field (unconnectedService) - lengthInBits += m.UnconnectedService.LengthInBits() + lengthInBits += m.UnconnectedService.GetLengthInBits() // Const Field (route) lengthInBits += 16 @@ -164,8 +168,8 @@ func (m *CipUnconnectedRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *CipUnconnectedRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipUnconnectedRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipUnconnectedRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { @@ -370,7 +374,7 @@ func (m *CipUnconnectedRequest) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (messageSize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - messageSize := uint16(uint16(uint16(uint16(m.LengthInBytes()))-uint16(uint16(10))) - uint16(uint16(4))) + messageSize := uint16(uint16(uint16(uint16(m.GetLengthInBytes()))-uint16(uint16(10))) - uint16(uint16(4))) _messageSizeErr := writeBuffer.WriteUint16("messageSize", 16, (messageSize)) if _messageSizeErr != nil { return errors.Wrap(_messageSizeErr, "Error serializing 'messageSize' field") diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go index ab30f607ce8..c62c50920e6 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go @@ -34,6 +34,9 @@ type CipWriteRequest struct { DataType CIPDataTypeCode ElementNb uint16 Data []byte + + // Arguments. + ServiceLen uint16 } // The corresponding interface @@ -48,10 +51,10 @@ type ICipWriteRequest interface { GetElementNb() uint16 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -96,14 +99,15 @@ func (m *CipWriteRequest) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipWriteRequest(requestPathSize int8, tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte) *CipService { +// NewCipWriteRequest factory function for CipWriteRequest +func NewCipWriteRequest(requestPathSize int8, tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte, serviceLen uint16) *CipService { child := &CipWriteRequest{ RequestPathSize: requestPathSize, Tag: tag, DataType: dataType, ElementNb: elementNb, Data: data, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -132,12 +136,12 @@ func (m *CipWriteRequest) GetTypeName() string { return "CipWriteRequest" } -func (m *CipWriteRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipWriteRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CipWriteRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (requestPathSize) lengthInBits += 8 @@ -161,8 +165,8 @@ func (m *CipWriteRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *CipWriteRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipWriteRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipWriteRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go index 32098698e02..f1807112a55 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go @@ -32,6 +32,9 @@ type CipWriteResponse struct { *CipService Status uint8 ExtStatus uint8 + + // Arguments. + ServiceLen uint16 } // The corresponding interface @@ -40,10 +43,10 @@ type ICipWriteResponse interface { GetStatus() uint8 // GetExtStatus returns ExtStatus GetExtStatus() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *CipWriteResponse) GetExtStatus() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCipWriteResponse(status uint8, extStatus uint8) *CipService { +// NewCipWriteResponse factory function for CipWriteResponse +func NewCipWriteResponse(status uint8, extStatus uint8, serviceLen uint16) *CipService { child := &CipWriteResponse{ Status: status, ExtStatus: extStatus, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -109,12 +113,12 @@ func (m *CipWriteResponse) GetTypeName() string { return "CipWriteResponse" } -func (m *CipWriteResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CipWriteResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CipWriteResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CipWriteResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 8 @@ -128,8 +132,8 @@ func (m *CipWriteResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *CipWriteResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CipWriteResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CipWriteResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EiPCommand.go b/plc4go/internal/plc4go/eip/readwrite/model/EiPCommand.go index c8e2cfabbdd..52d5ef78d62 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/EiPCommand.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/EiPCommand.go @@ -92,12 +92,12 @@ func CastEiPCommand(structType interface{}) EiPCommand { return castFunc(structType) } -func (m EiPCommand) LengthInBits() uint16 { +func (m EiPCommand) GetLengthInBits() uint16 { return 16 } -func (m EiPCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m EiPCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func EiPCommandParse(readBuffer utils.ReadBuffer) (EiPCommand, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go index 8e739280ae7..7291442e9bc 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go @@ -38,10 +38,10 @@ type EipConnectionRequest struct { // The corresponding interface type IEipConnectionRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -72,6 +72,7 @@ func (m *EipConnectionRequest) InitializeParent(parent *EipPacket, sessionHandle // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewEipConnectionRequest factory function for EipConnectionRequest func NewEipConnectionRequest(sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *EipPacket { child := &EipConnectionRequest{ EipPacket: NewEipPacket(sessionHandle, status, senderContext, options), @@ -103,12 +104,12 @@ func (m *EipConnectionRequest) GetTypeName() string { return "EipConnectionRequest" } -func (m *EipConnectionRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *EipConnectionRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *EipConnectionRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *EipConnectionRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (protocolVersion) lengthInBits += 16 @@ -119,8 +120,8 @@ func (m *EipConnectionRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *EipConnectionRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *EipConnectionRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func EipConnectionRequestParse(readBuffer utils.ReadBuffer) (*EipPacket, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go index 5ab39267dd1..cb63a6b165a 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go @@ -32,10 +32,10 @@ type EipDisconnectRequest struct { // The corresponding interface type IEipDisconnectRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -66,6 +66,7 @@ func (m *EipDisconnectRequest) InitializeParent(parent *EipPacket, sessionHandle // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewEipDisconnectRequest factory function for EipDisconnectRequest func NewEipDisconnectRequest(sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *EipPacket { child := &EipDisconnectRequest{ EipPacket: NewEipPacket(sessionHandle, status, senderContext, options), @@ -97,18 +98,18 @@ func (m *EipDisconnectRequest) GetTypeName() string { return "EipDisconnectRequest" } -func (m *EipDisconnectRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *EipDisconnectRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *EipDisconnectRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *EipDisconnectRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *EipDisconnectRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *EipDisconnectRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func EipDisconnectRequestParse(readBuffer utils.ReadBuffer) (*EipPacket, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go b/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go index 129a17f0497..dc525db66f1 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go @@ -47,10 +47,10 @@ type IEipPacket interface { GetSenderContext() []uint8 // GetOptions returns Options GetOptions() uint32 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *EipPacket) GetOptions() uint32 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewEipPacket factory function for EipPacket func NewEipPacket(sessionHandle uint32, status uint32, senderContext []uint8, options uint32) *EipPacket { return &EipPacket{SessionHandle: sessionHandle, Status: status, SenderContext: senderContext, Options: options} } @@ -111,15 +112,15 @@ func (m *EipPacket) GetTypeName() string { return "EipPacket" } -func (m *EipPacket) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *EipPacket) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *EipPacket) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *EipPacket) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *EipPacket) ParentLengthInBits() uint16 { +func (m *EipPacket) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (command) lengthInBits += 16 @@ -144,8 +145,8 @@ func (m *EipPacket) ParentLengthInBits() uint16 { return lengthInBits } -func (m *EipPacket) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *EipPacket) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func EipPacketParse(readBuffer utils.ReadBuffer) (*EipPacket, error) { @@ -251,7 +252,7 @@ func (m *EipPacket) SerializeParent(writeBuffer utils.WriteBuffer, child IEipPac } // Implicit Field (len) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - len := uint16(uint16(uint16(m.LengthInBytes())) - uint16(uint16(24))) + len := uint16(uint16(uint16(m.GetLengthInBytes())) - uint16(uint16(24))) _lenErr := writeBuffer.WriteUint16("len", 16, (len)) if _lenErr != nil { return errors.Wrap(_lenErr, "Error serializing 'len' field") diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go index a1d1fbc62ff..7542bec7b01 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go @@ -35,16 +35,19 @@ const MultipleServiceRequest_REQUESTPATH uint32 = 0x01240220 type MultipleServiceRequest struct { *CipService Data *Services + + // Arguments. + ServiceLen uint16 } // The corresponding interface type IMultipleServiceRequest interface { // GetData returns Data GetData() *Services - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,10 +76,11 @@ func (m *MultipleServiceRequest) GetData() *Services { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMultipleServiceRequest(data *Services) *CipService { +// NewMultipleServiceRequest factory function for MultipleServiceRequest +func NewMultipleServiceRequest(data *Services, serviceLen uint16) *CipService { child := &MultipleServiceRequest{ Data: data, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -105,12 +109,12 @@ func (m *MultipleServiceRequest) GetTypeName() string { return "MultipleServiceRequest" } -func (m *MultipleServiceRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MultipleServiceRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MultipleServiceRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MultipleServiceRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (requestPathSize) lengthInBits += 8 @@ -119,13 +123,13 @@ func (m *MultipleServiceRequest) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 32 // Simple field (data) - lengthInBits += m.Data.LengthInBits() + lengthInBits += m.Data.GetLengthInBits() return lengthInBits } -func (m *MultipleServiceRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MultipleServiceRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MultipleServiceRequestParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go index d42524ab276..67e0edfbda1 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go @@ -35,6 +35,9 @@ type MultipleServiceResponse struct { ServiceNb uint16 Offsets []uint16 ServicesData []byte + + // Arguments. + ServiceLen uint16 } // The corresponding interface @@ -49,10 +52,10 @@ type IMultipleServiceResponse interface { GetOffsets() []uint16 // GetServicesData returns ServicesData GetServicesData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -97,14 +100,15 @@ func (m *MultipleServiceResponse) GetServicesData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte) *CipService { +// NewMultipleServiceResponse factory function for MultipleServiceResponse +func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte, serviceLen uint16) *CipService { child := &MultipleServiceResponse{ Status: status, ExtStatus: extStatus, ServiceNb: serviceNb, Offsets: offsets, ServicesData: servicesData, - CipService: NewCipService(), + CipService: NewCipService(serviceLen), } child.Child = child return child.CipService @@ -133,12 +137,12 @@ func (m *MultipleServiceResponse) GetTypeName() string { return "MultipleServiceResponse" } -func (m *MultipleServiceResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MultipleServiceResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MultipleServiceResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MultipleServiceResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 8 @@ -165,8 +169,8 @@ func (m *MultipleServiceResponse) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *MultipleServiceResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MultipleServiceResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MultipleServiceResponseParse(readBuffer utils.ReadBuffer, serviceLen uint16) (*CipService, error) { diff --git a/plc4go/internal/plc4go/eip/readwrite/model/Services.go b/plc4go/internal/plc4go/eip/readwrite/model/Services.go index dc2f0b1ceda..1d8e22ccfcb 100644 --- a/plc4go/internal/plc4go/eip/readwrite/model/Services.go +++ b/plc4go/internal/plc4go/eip/readwrite/model/Services.go @@ -31,6 +31,9 @@ type Services struct { ServiceNb uint16 Offsets []uint16 Services []*CipService + + // Arguments. + ServicesLen uint16 } // The corresponding interface @@ -41,10 +44,10 @@ type IServices interface { GetOffsets() []uint16 // GetServices returns Services GetServices() []*CipService - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,8 +71,9 @@ func (m *Services) GetServices() []*CipService { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewServices(serviceNb uint16, offsets []uint16, services []*CipService) *Services { - return &Services{ServiceNb: serviceNb, Offsets: offsets, Services: services} +// NewServices factory function for Services +func NewServices(serviceNb uint16, offsets []uint16, services []*CipService, servicesLen uint16) *Services { + return &Services{ServiceNb: serviceNb, Offsets: offsets, Services: services, ServicesLen: servicesLen} } func CastServices(structType interface{}) *Services { @@ -89,11 +93,11 @@ func (m *Services) GetTypeName() string { return "Services" } -func (m *Services) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *Services) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *Services) LengthInBitsConditional(lastItem bool) uint16 { +func (m *Services) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (serviceNb) @@ -108,15 +112,15 @@ func (m *Services) LengthInBitsConditional(lastItem bool) uint16 { if len(m.Services) > 0 { for i, element := range m.Services { last := i == len(m.Services)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *Services) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *Services) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ServicesParse(readBuffer utils.ReadBuffer, servicesLen uint16) (*Services, error) { @@ -174,7 +178,7 @@ func ServicesParse(readBuffer utils.ReadBuffer, servicesLen uint16) (*Services, } // Create the instance - return NewServices(serviceNb, offsets, services), nil + return NewServices(serviceNb, offsets, services, servicesLen), nil } func (m *Services) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go index 4ff5da2cec0..dd0d77169d0 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go @@ -28,17 +28,20 @@ import ( // The data-structure of this message type FirmataCommand struct { - Child IFirmataCommandChild + + // Arguments. + Response bool + Child IFirmataCommandChild } // The corresponding interface type IFirmataCommand interface { // CommandCode returns CommandCode CommandCode() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IFirmataCommandChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataCommand() *FirmataCommand { - return &FirmataCommand{} +// NewFirmataCommand factory function for FirmataCommand +func NewFirmataCommand(response bool) *FirmataCommand { + return &FirmataCommand{Response: response} } func CastFirmataCommand(structType interface{}) *FirmataCommand { @@ -84,15 +88,15 @@ func (m *FirmataCommand) GetTypeName() string { return "FirmataCommand" } -func (m *FirmataCommand) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataCommand) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataCommand) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *FirmataCommand) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *FirmataCommand) ParentLengthInBits() uint16 { +func (m *FirmataCommand) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (commandCode) lengthInBits += 4 @@ -100,8 +104,8 @@ func (m *FirmataCommand) ParentLengthInBits() uint16 { return lengthInBits } -func (m *FirmataCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataCommandParse(readBuffer utils.ReadBuffer, response bool) (*FirmataCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go index 6aa94eaffc0..cf3640b8b91 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go @@ -31,6 +31,9 @@ type FirmataCommandProtocolVersion struct { *FirmataCommand MajorVersion uint8 MinorVersion uint8 + + // Arguments. + Response bool } // The corresponding interface @@ -39,10 +42,10 @@ type IFirmataCommandProtocolVersion interface { GetMajorVersion() uint8 // GetMinorVersion returns MinorVersion GetMinorVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *FirmataCommandProtocolVersion) GetMinorVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataCommandProtocolVersion(majorVersion uint8, minorVersion uint8) *FirmataCommand { +// NewFirmataCommandProtocolVersion factory function for FirmataCommandProtocolVersion +func NewFirmataCommandProtocolVersion(majorVersion uint8, minorVersion uint8, response bool) *FirmataCommand { child := &FirmataCommandProtocolVersion{ MajorVersion: majorVersion, MinorVersion: minorVersion, - FirmataCommand: NewFirmataCommand(), + FirmataCommand: NewFirmataCommand(response), } child.Child = child return child.FirmataCommand @@ -108,12 +112,12 @@ func (m *FirmataCommandProtocolVersion) GetTypeName() string { return "FirmataCommandProtocolVersion" } -func (m *FirmataCommandProtocolVersion) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataCommandProtocolVersion) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataCommandProtocolVersion) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataCommandProtocolVersion) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (majorVersion) lengthInBits += 8 @@ -124,8 +128,8 @@ func (m *FirmataCommandProtocolVersion) LengthInBitsConditional(lastItem bool) u return lengthInBits } -func (m *FirmataCommandProtocolVersion) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataCommandProtocolVersion) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataCommandProtocolVersionParse(readBuffer utils.ReadBuffer, response bool) (*FirmataCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go index 9810a232e5a..6cf9a440152 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go @@ -32,6 +32,9 @@ type FirmataCommandSetDigitalPinValue struct { *FirmataCommand Pin uint8 On bool + + // Arguments. + Response bool } // The corresponding interface @@ -40,10 +43,10 @@ type IFirmataCommandSetDigitalPinValue interface { GetPin() uint8 // GetOn returns On GetOn() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *FirmataCommandSetDigitalPinValue) GetOn() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataCommandSetDigitalPinValue(pin uint8, on bool) *FirmataCommand { +// NewFirmataCommandSetDigitalPinValue factory function for FirmataCommandSetDigitalPinValue +func NewFirmataCommandSetDigitalPinValue(pin uint8, on bool, response bool) *FirmataCommand { child := &FirmataCommandSetDigitalPinValue{ Pin: pin, On: on, - FirmataCommand: NewFirmataCommand(), + FirmataCommand: NewFirmataCommand(response), } child.Child = child return child.FirmataCommand @@ -109,12 +113,12 @@ func (m *FirmataCommandSetDigitalPinValue) GetTypeName() string { return "FirmataCommandSetDigitalPinValue" } -func (m *FirmataCommandSetDigitalPinValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataCommandSetDigitalPinValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataCommandSetDigitalPinValue) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataCommandSetDigitalPinValue) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 8 @@ -128,8 +132,8 @@ func (m *FirmataCommandSetDigitalPinValue) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *FirmataCommandSetDigitalPinValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataCommandSetDigitalPinValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataCommandSetDigitalPinValueParse(readBuffer utils.ReadBuffer, response bool) (*FirmataCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go index e9b21b28010..dcef4ce7429 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go @@ -31,6 +31,9 @@ type FirmataCommandSetPinMode struct { *FirmataCommand Pin uint8 Mode PinMode + + // Arguments. + Response bool } // The corresponding interface @@ -39,10 +42,10 @@ type IFirmataCommandSetPinMode interface { GetPin() uint8 // GetMode returns Mode GetMode() PinMode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *FirmataCommandSetPinMode) GetMode() PinMode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataCommandSetPinMode(pin uint8, mode PinMode) *FirmataCommand { +// NewFirmataCommandSetPinMode factory function for FirmataCommandSetPinMode +func NewFirmataCommandSetPinMode(pin uint8, mode PinMode, response bool) *FirmataCommand { child := &FirmataCommandSetPinMode{ Pin: pin, Mode: mode, - FirmataCommand: NewFirmataCommand(), + FirmataCommand: NewFirmataCommand(response), } child.Child = child return child.FirmataCommand @@ -108,12 +112,12 @@ func (m *FirmataCommandSetPinMode) GetTypeName() string { return "FirmataCommandSetPinMode" } -func (m *FirmataCommandSetPinMode) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataCommandSetPinMode) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataCommandSetPinMode) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataCommandSetPinMode) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 8 @@ -124,8 +128,8 @@ func (m *FirmataCommandSetPinMode) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *FirmataCommandSetPinMode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataCommandSetPinMode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataCommandSetPinModeParse(readBuffer utils.ReadBuffer, response bool) (*FirmataCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go index 2a1f5825728..bce104c1bef 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go @@ -31,16 +31,19 @@ import ( type FirmataCommandSysex struct { *FirmataCommand Command *SysexCommand + + // Arguments. + Response bool } // The corresponding interface type IFirmataCommandSysex interface { // GetCommand returns Command GetCommand() *SysexCommand - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,10 +72,11 @@ func (m *FirmataCommandSysex) GetCommand() *SysexCommand { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataCommandSysex(command *SysexCommand) *FirmataCommand { +// NewFirmataCommandSysex factory function for FirmataCommandSysex +func NewFirmataCommandSysex(command *SysexCommand, response bool) *FirmataCommand { child := &FirmataCommandSysex{ Command: command, - FirmataCommand: NewFirmataCommand(), + FirmataCommand: NewFirmataCommand(response), } child.Child = child return child.FirmataCommand @@ -101,15 +105,15 @@ func (m *FirmataCommandSysex) GetTypeName() string { return "FirmataCommandSysex" } -func (m *FirmataCommandSysex) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataCommandSysex) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataCommandSysex) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataCommandSysex) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (command) - lengthInBits += m.Command.LengthInBits() + lengthInBits += m.Command.GetLengthInBits() // Reserved Field (reserved) lengthInBits += 8 @@ -117,8 +121,8 @@ func (m *FirmataCommandSysex) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *FirmataCommandSysex) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataCommandSysex) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataCommandSysexParse(readBuffer utils.ReadBuffer, response bool) (*FirmataCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go index bde9d4c9a16..8f65eaa74f6 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type FirmataCommandSystemReset struct { *FirmataCommand + + // Arguments. + Response bool } // The corresponding interface type IFirmataCommandSystemReset interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *FirmataCommandSystemReset) InitializeParent(parent *FirmataCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataCommandSystemReset() *FirmataCommand { +// NewFirmataCommandSystemReset factory function for FirmataCommandSystemReset +func NewFirmataCommandSystemReset(response bool) *FirmataCommand { child := &FirmataCommandSystemReset{ - FirmataCommand: NewFirmataCommand(), + FirmataCommand: NewFirmataCommand(response), } child.Child = child return child.FirmataCommand @@ -92,18 +96,18 @@ func (m *FirmataCommandSystemReset) GetTypeName() string { return "FirmataCommandSystemReset" } -func (m *FirmataCommandSystemReset) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataCommandSystemReset) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataCommandSystemReset) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataCommandSystemReset) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *FirmataCommandSystemReset) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataCommandSystemReset) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataCommandSystemResetParse(readBuffer utils.ReadBuffer, response bool) (*FirmataCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go index 992bb747704..328443e72f1 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go @@ -28,17 +28,20 @@ import ( // The data-structure of this message type FirmataMessage struct { - Child IFirmataMessageChild + + // Arguments. + Response bool + Child IFirmataMessageChild } // The corresponding interface type IFirmataMessage interface { // MessageType returns MessageType MessageType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IFirmataMessageChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataMessage() *FirmataMessage { - return &FirmataMessage{} +// NewFirmataMessage factory function for FirmataMessage +func NewFirmataMessage(response bool) *FirmataMessage { + return &FirmataMessage{Response: response} } func CastFirmataMessage(structType interface{}) *FirmataMessage { @@ -84,15 +88,15 @@ func (m *FirmataMessage) GetTypeName() string { return "FirmataMessage" } -func (m *FirmataMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataMessage) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *FirmataMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *FirmataMessage) ParentLengthInBits() uint16 { +func (m *FirmataMessage) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (messageType) lengthInBits += 4 @@ -100,8 +104,8 @@ func (m *FirmataMessage) ParentLengthInBits() uint16 { return lengthInBits } -func (m *FirmataMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataMessageParse(readBuffer utils.ReadBuffer, response bool) (*FirmataMessage, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go index 109209fcd15..946e4dd1712 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go @@ -31,6 +31,9 @@ type FirmataMessageAnalogIO struct { *FirmataMessage Pin uint8 Data []int8 + + // Arguments. + Response bool } // The corresponding interface @@ -39,10 +42,10 @@ type IFirmataMessageAnalogIO interface { GetPin() uint8 // GetData returns Data GetData() []int8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *FirmataMessageAnalogIO) GetData() []int8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataMessageAnalogIO(pin uint8, data []int8) *FirmataMessage { +// NewFirmataMessageAnalogIO factory function for FirmataMessageAnalogIO +func NewFirmataMessageAnalogIO(pin uint8, data []int8, response bool) *FirmataMessage { child := &FirmataMessageAnalogIO{ Pin: pin, Data: data, - FirmataMessage: NewFirmataMessage(), + FirmataMessage: NewFirmataMessage(response), } child.Child = child return child.FirmataMessage @@ -108,12 +112,12 @@ func (m *FirmataMessageAnalogIO) GetTypeName() string { return "FirmataMessageAnalogIO" } -func (m *FirmataMessageAnalogIO) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataMessageAnalogIO) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataMessageAnalogIO) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataMessageAnalogIO) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 4 @@ -126,8 +130,8 @@ func (m *FirmataMessageAnalogIO) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *FirmataMessageAnalogIO) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataMessageAnalogIO) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataMessageAnalogIOParse(readBuffer utils.ReadBuffer, response bool) (*FirmataMessage, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go index b633d482e08..7c7a1c2e137 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go @@ -30,16 +30,19 @@ import ( type FirmataMessageCommand struct { *FirmataMessage Command *FirmataCommand + + // Arguments. + Response bool } // The corresponding interface type IFirmataMessageCommand interface { // GetCommand returns Command GetCommand() *FirmataCommand - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *FirmataMessageCommand) GetCommand() *FirmataCommand { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataMessageCommand(command *FirmataCommand) *FirmataMessage { +// NewFirmataMessageCommand factory function for FirmataMessageCommand +func NewFirmataMessageCommand(command *FirmataCommand, response bool) *FirmataMessage { child := &FirmataMessageCommand{ Command: command, - FirmataMessage: NewFirmataMessage(), + FirmataMessage: NewFirmataMessage(response), } child.Child = child return child.FirmataMessage @@ -100,21 +104,21 @@ func (m *FirmataMessageCommand) GetTypeName() string { return "FirmataMessageCommand" } -func (m *FirmataMessageCommand) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataMessageCommand) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataMessageCommand) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataMessageCommand) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (command) - lengthInBits += m.Command.LengthInBits() + lengthInBits += m.Command.GetLengthInBits() return lengthInBits } -func (m *FirmataMessageCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataMessageCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataMessageCommandParse(readBuffer utils.ReadBuffer, response bool) (*FirmataMessage, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go index 4f07b2dd046..ae7bff86962 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go @@ -31,6 +31,9 @@ type FirmataMessageDigitalIO struct { *FirmataMessage PinBlock uint8 Data []int8 + + // Arguments. + Response bool } // The corresponding interface @@ -39,10 +42,10 @@ type IFirmataMessageDigitalIO interface { GetPinBlock() uint8 // GetData returns Data GetData() []int8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *FirmataMessageDigitalIO) GetData() []int8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataMessageDigitalIO(pinBlock uint8, data []int8) *FirmataMessage { +// NewFirmataMessageDigitalIO factory function for FirmataMessageDigitalIO +func NewFirmataMessageDigitalIO(pinBlock uint8, data []int8, response bool) *FirmataMessage { child := &FirmataMessageDigitalIO{ PinBlock: pinBlock, Data: data, - FirmataMessage: NewFirmataMessage(), + FirmataMessage: NewFirmataMessage(response), } child.Child = child return child.FirmataMessage @@ -108,12 +112,12 @@ func (m *FirmataMessageDigitalIO) GetTypeName() string { return "FirmataMessageDigitalIO" } -func (m *FirmataMessageDigitalIO) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataMessageDigitalIO) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataMessageDigitalIO) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataMessageDigitalIO) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pinBlock) lengthInBits += 4 @@ -126,8 +130,8 @@ func (m *FirmataMessageDigitalIO) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *FirmataMessageDigitalIO) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataMessageDigitalIO) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataMessageDigitalIOParse(readBuffer utils.ReadBuffer, response bool) (*FirmataMessage, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go index bf2d0510e7c..e153971bc51 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go @@ -32,6 +32,9 @@ type FirmataMessageSubscribeAnalogPinValue struct { *FirmataMessage Pin uint8 Enable bool + + // Arguments. + Response bool } // The corresponding interface @@ -40,10 +43,10 @@ type IFirmataMessageSubscribeAnalogPinValue interface { GetPin() uint8 // GetEnable returns Enable GetEnable() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *FirmataMessageSubscribeAnalogPinValue) GetEnable() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataMessageSubscribeAnalogPinValue(pin uint8, enable bool) *FirmataMessage { +// NewFirmataMessageSubscribeAnalogPinValue factory function for FirmataMessageSubscribeAnalogPinValue +func NewFirmataMessageSubscribeAnalogPinValue(pin uint8, enable bool, response bool) *FirmataMessage { child := &FirmataMessageSubscribeAnalogPinValue{ Pin: pin, Enable: enable, - FirmataMessage: NewFirmataMessage(), + FirmataMessage: NewFirmataMessage(response), } child.Child = child return child.FirmataMessage @@ -109,12 +113,12 @@ func (m *FirmataMessageSubscribeAnalogPinValue) GetTypeName() string { return "FirmataMessageSubscribeAnalogPinValue" } -func (m *FirmataMessageSubscribeAnalogPinValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataMessageSubscribeAnalogPinValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataMessageSubscribeAnalogPinValue) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataMessageSubscribeAnalogPinValue) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 4 @@ -128,8 +132,8 @@ func (m *FirmataMessageSubscribeAnalogPinValue) LengthInBitsConditional(lastItem return lengthInBits } -func (m *FirmataMessageSubscribeAnalogPinValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataMessageSubscribeAnalogPinValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataMessageSubscribeAnalogPinValueParse(readBuffer utils.ReadBuffer, response bool) (*FirmataMessage, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go index 41d0a1b3e5d..b6094e4a75d 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go @@ -32,6 +32,9 @@ type FirmataMessageSubscribeDigitalPinValue struct { *FirmataMessage Pin uint8 Enable bool + + // Arguments. + Response bool } // The corresponding interface @@ -40,10 +43,10 @@ type IFirmataMessageSubscribeDigitalPinValue interface { GetPin() uint8 // GetEnable returns Enable GetEnable() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,11 +79,12 @@ func (m *FirmataMessageSubscribeDigitalPinValue) GetEnable() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewFirmataMessageSubscribeDigitalPinValue(pin uint8, enable bool) *FirmataMessage { +// NewFirmataMessageSubscribeDigitalPinValue factory function for FirmataMessageSubscribeDigitalPinValue +func NewFirmataMessageSubscribeDigitalPinValue(pin uint8, enable bool, response bool) *FirmataMessage { child := &FirmataMessageSubscribeDigitalPinValue{ Pin: pin, Enable: enable, - FirmataMessage: NewFirmataMessage(), + FirmataMessage: NewFirmataMessage(response), } child.Child = child return child.FirmataMessage @@ -109,12 +113,12 @@ func (m *FirmataMessageSubscribeDigitalPinValue) GetTypeName() string { return "FirmataMessageSubscribeDigitalPinValue" } -func (m *FirmataMessageSubscribeDigitalPinValue) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *FirmataMessageSubscribeDigitalPinValue) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *FirmataMessageSubscribeDigitalPinValue) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *FirmataMessageSubscribeDigitalPinValue) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 4 @@ -128,8 +132,8 @@ func (m *FirmataMessageSubscribeDigitalPinValue) LengthInBitsConditional(lastIte return lengthInBits } -func (m *FirmataMessageSubscribeDigitalPinValue) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *FirmataMessageSubscribeDigitalPinValue) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmataMessageSubscribeDigitalPinValueParse(readBuffer utils.ReadBuffer, response bool) (*FirmataMessage, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/PinMode.go b/plc4go/internal/plc4go/firmata/readwrite/model/PinMode.go index 2feb00e71e3..02627ed11c7 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/PinMode.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/PinMode.go @@ -146,12 +146,12 @@ func CastPinMode(structType interface{}) PinMode { return castFunc(structType) } -func (m PinMode) LengthInBits() uint16 { +func (m PinMode) GetLengthInBits() uint16 { return 8 } -func (m PinMode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m PinMode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func PinModeParse(readBuffer utils.ReadBuffer) (PinMode, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go index 40cdb2a3cc4..930ad648f53 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go @@ -37,10 +37,10 @@ type ISysexCommand interface { CommandType() uint8 // Response returns Response Response() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -65,6 +65,7 @@ type ISysexCommandChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommand factory function for SysexCommand func NewSysexCommand() *SysexCommand { return &SysexCommand{} } @@ -86,15 +87,15 @@ func (m *SysexCommand) GetTypeName() string { return "SysexCommand" } -func (m *SysexCommand) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommand) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommand) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *SysexCommand) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *SysexCommand) ParentLengthInBits() uint16 { +func (m *SysexCommand) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (commandType) lengthInBits += 8 @@ -102,8 +103,8 @@ func (m *SysexCommand) ParentLengthInBits() uint16 { return lengthInBits } -func (m *SysexCommand) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommand) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go index b6ecbe3e95a..30424be40c0 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go @@ -32,10 +32,10 @@ type SysexCommandAnalogMappingQueryRequest struct { // The corresponding interface type ISysexCommandAnalogMappingQueryRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandAnalogMappingQueryRequest) InitializeParent(parent *SysexCo // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandAnalogMappingQueryRequest factory function for SysexCommandAnalogMappingQueryRequest func NewSysexCommandAnalogMappingQueryRequest() *SysexCommand { child := &SysexCommandAnalogMappingQueryRequest{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandAnalogMappingQueryRequest) GetTypeName() string { return "SysexCommandAnalogMappingQueryRequest" } -func (m *SysexCommandAnalogMappingQueryRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandAnalogMappingQueryRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandAnalogMappingQueryRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandAnalogMappingQueryRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandAnalogMappingQueryRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandAnalogMappingQueryRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandAnalogMappingQueryRequestParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go index 250469a77d4..8d4e83cc9e8 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go @@ -36,10 +36,10 @@ type SysexCommandAnalogMappingQueryResponse struct { type ISysexCommandAnalogMappingQueryResponse interface { // GetPin returns Pin GetPin() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *SysexCommandAnalogMappingQueryResponse) GetPin() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandAnalogMappingQueryResponse factory function for SysexCommandAnalogMappingQueryResponse func NewSysexCommandAnalogMappingQueryResponse(pin uint8) *SysexCommand { child := &SysexCommandAnalogMappingQueryResponse{ Pin: pin, @@ -108,12 +109,12 @@ func (m *SysexCommandAnalogMappingQueryResponse) GetTypeName() string { return "SysexCommandAnalogMappingQueryResponse" } -func (m *SysexCommandAnalogMappingQueryResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandAnalogMappingQueryResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandAnalogMappingQueryResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandAnalogMappingQueryResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 8 @@ -121,8 +122,8 @@ func (m *SysexCommandAnalogMappingQueryResponse) LengthInBitsConditional(lastIte return lengthInBits } -func (m *SysexCommandAnalogMappingQueryResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandAnalogMappingQueryResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandAnalogMappingQueryResponseParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go index 272b7cf556f..8cb95d89416 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go @@ -32,10 +32,10 @@ type SysexCommandAnalogMappingResponse struct { // The corresponding interface type ISysexCommandAnalogMappingResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandAnalogMappingResponse) InitializeParent(parent *SysexComman // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandAnalogMappingResponse factory function for SysexCommandAnalogMappingResponse func NewSysexCommandAnalogMappingResponse() *SysexCommand { child := &SysexCommandAnalogMappingResponse{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandAnalogMappingResponse) GetTypeName() string { return "SysexCommandAnalogMappingResponse" } -func (m *SysexCommandAnalogMappingResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandAnalogMappingResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandAnalogMappingResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandAnalogMappingResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandAnalogMappingResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandAnalogMappingResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandAnalogMappingResponseParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go index 18cb88f3c8c..c2a8c9468b6 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go @@ -32,10 +32,10 @@ type SysexCommandCapabilityQuery struct { // The corresponding interface type ISysexCommandCapabilityQuery interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandCapabilityQuery) InitializeParent(parent *SysexCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandCapabilityQuery factory function for SysexCommandCapabilityQuery func NewSysexCommandCapabilityQuery() *SysexCommand { child := &SysexCommandCapabilityQuery{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandCapabilityQuery) GetTypeName() string { return "SysexCommandCapabilityQuery" } -func (m *SysexCommandCapabilityQuery) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandCapabilityQuery) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandCapabilityQuery) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandCapabilityQuery) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandCapabilityQuery) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandCapabilityQuery) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandCapabilityQueryParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go index 404abed0e56..174661ab6c0 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go @@ -32,10 +32,10 @@ type SysexCommandCapabilityResponse struct { // The corresponding interface type ISysexCommandCapabilityResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandCapabilityResponse) InitializeParent(parent *SysexCommand) // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandCapabilityResponse factory function for SysexCommandCapabilityResponse func NewSysexCommandCapabilityResponse() *SysexCommand { child := &SysexCommandCapabilityResponse{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandCapabilityResponse) GetTypeName() string { return "SysexCommandCapabilityResponse" } -func (m *SysexCommandCapabilityResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandCapabilityResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandCapabilityResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandCapabilityResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandCapabilityResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandCapabilityResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandCapabilityResponseParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go index e12b34a68af..a446c40ea42 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go @@ -32,10 +32,10 @@ type SysexCommandExtendedAnalog struct { // The corresponding interface type ISysexCommandExtendedAnalog interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandExtendedAnalog) InitializeParent(parent *SysexCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandExtendedAnalog factory function for SysexCommandExtendedAnalog func NewSysexCommandExtendedAnalog() *SysexCommand { child := &SysexCommandExtendedAnalog{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandExtendedAnalog) GetTypeName() string { return "SysexCommandExtendedAnalog" } -func (m *SysexCommandExtendedAnalog) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandExtendedAnalog) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandExtendedAnalog) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandExtendedAnalog) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandExtendedAnalog) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandExtendedAnalog) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandExtendedAnalogParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go index c31ad1609ff..eaa1514bd69 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go @@ -36,10 +36,10 @@ type SysexCommandExtendedId struct { type ISysexCommandExtendedId interface { // GetId returns Id GetId() []int8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *SysexCommandExtendedId) GetId() []int8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandExtendedId factory function for SysexCommandExtendedId func NewSysexCommandExtendedId(id []int8) *SysexCommand { child := &SysexCommandExtendedId{ Id: id, @@ -108,12 +109,12 @@ func (m *SysexCommandExtendedId) GetTypeName() string { return "SysexCommandExtendedId" } -func (m *SysexCommandExtendedId) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandExtendedId) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandExtendedId) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandExtendedId) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Id) > 0 { @@ -123,8 +124,8 @@ func (m *SysexCommandExtendedId) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *SysexCommandExtendedId) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandExtendedId) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandExtendedIdParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go index a2f29e87f2d..9bff9773b61 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go @@ -36,10 +36,10 @@ type SysexCommandPinStateQuery struct { type ISysexCommandPinStateQuery interface { // GetPin returns Pin GetPin() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *SysexCommandPinStateQuery) GetPin() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandPinStateQuery factory function for SysexCommandPinStateQuery func NewSysexCommandPinStateQuery(pin uint8) *SysexCommand { child := &SysexCommandPinStateQuery{ Pin: pin, @@ -108,12 +109,12 @@ func (m *SysexCommandPinStateQuery) GetTypeName() string { return "SysexCommandPinStateQuery" } -func (m *SysexCommandPinStateQuery) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandPinStateQuery) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandPinStateQuery) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandPinStateQuery) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 8 @@ -121,8 +122,8 @@ func (m *SysexCommandPinStateQuery) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *SysexCommandPinStateQuery) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandPinStateQuery) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandPinStateQueryParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go index cb83ee5008c..a5a3a63cc6b 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go @@ -42,10 +42,10 @@ type ISysexCommandPinStateResponse interface { GetPinMode() uint8 // GetPinState returns PinState GetPinState() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *SysexCommandPinStateResponse) GetPinState() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandPinStateResponse factory function for SysexCommandPinStateResponse func NewSysexCommandPinStateResponse(pin uint8, pinMode uint8, pinState uint8) *SysexCommand { child := &SysexCommandPinStateResponse{ Pin: pin, @@ -124,12 +125,12 @@ func (m *SysexCommandPinStateResponse) GetTypeName() string { return "SysexCommandPinStateResponse" } -func (m *SysexCommandPinStateResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandPinStateResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandPinStateResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandPinStateResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (pin) lengthInBits += 8 @@ -143,8 +144,8 @@ func (m *SysexCommandPinStateResponse) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *SysexCommandPinStateResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandPinStateResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandPinStateResponseParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go index 12e6deab499..170f0c14882 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go @@ -32,10 +32,10 @@ type SysexCommandReportFirmwareRequest struct { // The corresponding interface type ISysexCommandReportFirmwareRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandReportFirmwareRequest) InitializeParent(parent *SysexComman // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandReportFirmwareRequest factory function for SysexCommandReportFirmwareRequest func NewSysexCommandReportFirmwareRequest() *SysexCommand { child := &SysexCommandReportFirmwareRequest{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandReportFirmwareRequest) GetTypeName() string { return "SysexCommandReportFirmwareRequest" } -func (m *SysexCommandReportFirmwareRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandReportFirmwareRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandReportFirmwareRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandReportFirmwareRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandReportFirmwareRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandReportFirmwareRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandReportFirmwareRequestParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go index 023697dd336..eddd79680be 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go @@ -42,10 +42,10 @@ type ISysexCommandReportFirmwareResponse interface { GetMinorVersion() uint8 // GetFileName returns FileName GetFileName() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *SysexCommandReportFirmwareResponse) GetFileName() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandReportFirmwareResponse factory function for SysexCommandReportFirmwareResponse func NewSysexCommandReportFirmwareResponse(majorVersion uint8, minorVersion uint8, fileName []byte) *SysexCommand { child := &SysexCommandReportFirmwareResponse{ MajorVersion: majorVersion, @@ -124,12 +125,12 @@ func (m *SysexCommandReportFirmwareResponse) GetTypeName() string { return "SysexCommandReportFirmwareResponse" } -func (m *SysexCommandReportFirmwareResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandReportFirmwareResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandReportFirmwareResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandReportFirmwareResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (majorVersion) lengthInBits += 8 @@ -144,8 +145,8 @@ func (m *SysexCommandReportFirmwareResponse) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *SysexCommandReportFirmwareResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandReportFirmwareResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandReportFirmwareResponseParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go index 5797f777519..cede7559eaf 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go @@ -32,10 +32,10 @@ type SysexCommandSamplingInterval struct { // The corresponding interface type ISysexCommandSamplingInterval interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandSamplingInterval) InitializeParent(parent *SysexCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandSamplingInterval factory function for SysexCommandSamplingInterval func NewSysexCommandSamplingInterval() *SysexCommand { child := &SysexCommandSamplingInterval{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandSamplingInterval) GetTypeName() string { return "SysexCommandSamplingInterval" } -func (m *SysexCommandSamplingInterval) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandSamplingInterval) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandSamplingInterval) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandSamplingInterval) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandSamplingInterval) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandSamplingInterval) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandSamplingIntervalParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go index b6912978245..379a504db9c 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go @@ -32,10 +32,10 @@ type SysexCommandStringData struct { // The corresponding interface type ISysexCommandStringData interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandStringData) InitializeParent(parent *SysexCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandStringData factory function for SysexCommandStringData func NewSysexCommandStringData() *SysexCommand { child := &SysexCommandStringData{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandStringData) GetTypeName() string { return "SysexCommandStringData" } -func (m *SysexCommandStringData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandStringData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandStringData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandStringData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandStringData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandStringData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandStringDataParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go index 5469b7d0537..a45691993c9 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go @@ -32,10 +32,10 @@ type SysexCommandSysexNonRealtime struct { // The corresponding interface type ISysexCommandSysexNonRealtime interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandSysexNonRealtime) InitializeParent(parent *SysexCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandSysexNonRealtime factory function for SysexCommandSysexNonRealtime func NewSysexCommandSysexNonRealtime() *SysexCommand { child := &SysexCommandSysexNonRealtime{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandSysexNonRealtime) GetTypeName() string { return "SysexCommandSysexNonRealtime" } -func (m *SysexCommandSysexNonRealtime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandSysexNonRealtime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandSysexNonRealtime) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandSysexNonRealtime) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandSysexNonRealtime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandSysexNonRealtime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandSysexNonRealtimeParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go index 208add25105..b4fcbc36a77 100644 --- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go +++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go @@ -32,10 +32,10 @@ type SysexCommandSysexRealtime struct { // The corresponding interface type ISysexCommandSysexRealtime interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *SysexCommandSysexRealtime) InitializeParent(parent *SysexCommand) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSysexCommandSysexRealtime factory function for SysexCommandSysexRealtime func NewSysexCommandSysexRealtime() *SysexCommand { child := &SysexCommandSysexRealtime{ SysexCommand: NewSysexCommand(), @@ -100,18 +101,18 @@ func (m *SysexCommandSysexRealtime) GetTypeName() string { return "SysexCommandSysexRealtime" } -func (m *SysexCommandSysexRealtime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SysexCommandSysexRealtime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SysexCommandSysexRealtime) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SysexCommandSysexRealtime) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *SysexCommandSysexRealtime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SysexCommandSysexRealtime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SysexCommandSysexRealtimeParse(readBuffer utils.ReadBuffer, response bool) (*SysexCommand, error) { diff --git a/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go b/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go index 09ef1a9673e..20b68d036b4 100644 --- a/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go +++ b/plc4go/internal/plc4go/knxnetip/ConnectionInternalOperations.go @@ -254,14 +254,16 @@ func (m *Connection) sendGroupAddressReadRequest(groupAddress []byte) (*driverMo 6, 0, m.ClientKnxAddress, groupAddress, - driverModel.NewApduDataContainer(driverModel.NewApduDataGroupValueRead(), false, 0), + driverModel.NewApduDataContainer(driverModel.NewApduDataGroupValueRead(0), false, 0, 0), true, true, driverModel.CEMIPriority_LOW, false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduDataGroupValueResponse) @@ -337,14 +339,16 @@ func (m *Connection) sendDeviceConnectionRequest(targetAddress driverModel.KnxAd 6, uint8(0), driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress), - driverModel.NewApduControlContainer(driverModel.NewApduControlConnect(), false, 0), + driverModel.NewApduControlContainer(driverModel.NewApduControlConnect(), false, 0, 0), true, true, driverModel.CEMIPriority_SYSTEM, false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduControlConnect) @@ -427,14 +431,16 @@ func (m *Connection) sendDeviceDisconnectionRequest(targetAddress driverModel.Kn 6, uint8(0), driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress), - driverModel.NewApduControlContainer(driverModel.NewApduControlDisconnect(), false, 0), + driverModel.NewApduControlContainer(driverModel.NewApduControlDisconnect(), false, 0, 0), true, true, driverModel.CEMIPriority_SYSTEM, false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduControlDisconnect) @@ -527,10 +533,14 @@ func (m *Connection) sendDeviceAuthentication(targetAddress driverModel.KnxAddre 6, uint8(0), driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress), - driverModel.NewApduDataContainer(driverModel.NewApduDataOther( - driverModel.NewApduDataExtAuthorizeRequest(authenticationLevel, utils.ByteArrayToUint8Array(buildingKey))), + driverModel.NewApduDataContainer( + driverModel.NewApduDataOther( + driverModel.NewApduDataExtAuthorizeRequest(authenticationLevel, utils.ByteArrayToUint8Array(buildingKey), 0), + 0, + ), true, counter, + 0, ), true, true, @@ -538,7 +548,9 @@ func (m *Connection) sendDeviceAuthentication(targetAddress driverModel.KnxAddre false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduDataExtAuthorizeResponse) @@ -645,14 +657,16 @@ func (m *Connection) sendDeviceDeviceDescriptorReadRequest(targetAddress driverM driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress), driverModel.NewApduDataContainer( - driverModel.NewApduDataDeviceDescriptorRead(0), true, counter), + driverModel.NewApduDataDeviceDescriptorRead(0, 0), true, counter, 0), true, true, driverModel.CEMIPriority_LOW, false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduDataDeviceDescriptorResponse) @@ -751,10 +765,12 @@ func (m *Connection) sendDevicePropertyReadRequest(targetAddress driverModel.Knx KnxAddressToByteArray(targetAddress), driverModel.NewApduDataContainer( driverModel.NewApduDataOther( - driverModel.NewApduDataExtPropertyValueRead(objectId, propertyId, numElements, propertyIndex), + driverModel.NewApduDataExtPropertyValueRead(objectId, propertyId, numElements, propertyIndex, 0), + 0, ), true, counter, + 0, ), true, true, @@ -762,7 +778,9 @@ func (m *Connection) sendDevicePropertyReadRequest(targetAddress driverModel.Knx false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduDataExtPropertyValueResponse) @@ -866,10 +884,12 @@ func (m *Connection) sendDevicePropertyDescriptionReadRequest(targetAddress driv KnxAddressToByteArray(targetAddress), driverModel.NewApduDataContainer( driverModel.NewApduDataOther( - driverModel.NewApduDataExtPropertyDescriptionRead(objectId, propertyId, 1), + driverModel.NewApduDataExtPropertyDescriptionRead(objectId, propertyId, 1, 0), + 0, ), true, counter, + 0, ), true, true, @@ -877,7 +897,9 @@ func (m *Connection) sendDevicePropertyDescriptionReadRequest(targetAddress driv false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduDataExtPropertyDescriptionResponse) @@ -981,9 +1003,10 @@ func (m *Connection) sendDeviceMemoryReadRequest(targetAddress driverModel.KnxAd driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress), driverModel.NewApduDataContainer( - driverModel.NewApduDataMemoryRead(numBytes, address), + driverModel.NewApduDataMemoryRead(numBytes, address, 0), true, counter, + 0, ), true, true, @@ -991,7 +1014,9 @@ func (m *Connection) sendDeviceMemoryReadRequest(targetAddress driverModel.KnxAd false, false, ), + 0, ), + 0, ) result := make(chan *driverModel.ApduDataMemoryResponse) @@ -1085,14 +1110,16 @@ func (m *Connection) sendDeviceAck(targetAddress driverModel.KnxAddress, counter 6, uint8(0), driverModel.NewKnxAddress(0, 0, 0), KnxAddressToByteArray(targetAddress), - driverModel.NewApduControlContainer(driverModel.NewApduControlAck(), true, counter), + driverModel.NewApduControlContainer(driverModel.NewApduControlAck(), true, counter, 0), true, true, driverModel.CEMIPriority_SYSTEM, false, false, ), + 0, ), + 0, ) err := m.messageCodec.SendRequest( diff --git a/plc4go/internal/plc4go/knxnetip/Reader.go b/plc4go/internal/plc4go/knxnetip/Reader.go index 0d25fce0180..91fe4e463e3 100644 --- a/plc4go/internal/plc4go/knxnetip/Reader.go +++ b/plc4go/internal/plc4go/knxnetip/Reader.go @@ -219,7 +219,7 @@ func (m Reader) readGroupAddress(field GroupAddressField) (apiModel.PlcResponseC return apiModel.PlcResponseCode_INVALID_DATATYPE, nil } // If the size of the field is greater than 6, we have to skip the first byte - if field.GetFieldType().LengthInBits() > 6 { + if field.GetFieldType().GetLengthInBits() > 6 { _, _ = rb.ReadUint8("fieldType", 8) } plcValue, err := driverModel.KnxDatapointParse(rb, *field.GetFieldType()) diff --git a/plc4go/internal/plc4go/knxnetip/Subscriber.go b/plc4go/internal/plc4go/knxnetip/Subscriber.go index 136dc465dad..d14c962e89a 100644 --- a/plc4go/internal/plc4go/knxnetip/Subscriber.go +++ b/plc4go/internal/plc4go/knxnetip/Subscriber.go @@ -117,7 +117,7 @@ func (m *Subscriber) handleValueChange(destinationAddress []byte, payload []byte continue } // If the size of the field is greater than 6, we have to skip the first byte - if groupAddressField.GetFieldType().LengthInBits() > 6 { + if groupAddressField.GetFieldType().GetLengthInBits() > 6 { _, _ = rb.ReadUint8("groupAddress", 8) } elementType := *groupAddressField.GetFieldType() diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/AccessLevel.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/AccessLevel.go index f80abada376..47e942d3aef 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/AccessLevel.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/AccessLevel.go @@ -181,12 +181,12 @@ func CastAccessLevel(structType interface{}) AccessLevel { return castFunc(structType) } -func (m AccessLevel) LengthInBits() uint16 { +func (m AccessLevel) GetLengthInBits() uint16 { return 4 } -func (m AccessLevel) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m AccessLevel) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AccessLevelParse(readBuffer utils.ReadBuffer) (AccessLevel, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go index 75075a50bb4..ed8ec85ffe6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go @@ -30,7 +30,10 @@ import ( type Apdu struct { Numbered bool Counter uint8 - Child IApduChild + + // Arguments. + DataLength uint8 + Child IApduChild } // The corresponding interface @@ -41,10 +44,10 @@ type IApdu interface { GetNumbered() bool // GetCounter returns Counter GetCounter() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,8 +79,9 @@ func (m *Apdu) GetCounter() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApdu(numbered bool, counter uint8) *Apdu { - return &Apdu{Numbered: numbered, Counter: counter} +// NewApdu factory function for Apdu +func NewApdu(numbered bool, counter uint8, dataLength uint8) *Apdu { + return &Apdu{Numbered: numbered, Counter: counter, DataLength: dataLength} } func CastApdu(structType interface{}) *Apdu { @@ -97,15 +101,15 @@ func (m *Apdu) GetTypeName() string { return "Apdu" } -func (m *Apdu) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *Apdu) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *Apdu) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *Apdu) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *Apdu) ParentLengthInBits() uint16 { +func (m *Apdu) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (control) lengthInBits += 1 @@ -119,8 +123,8 @@ func (m *Apdu) ParentLengthInBits() uint16 { return lengthInBits } -func (m *Apdu) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *Apdu) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduParse(readBuffer utils.ReadBuffer, dataLength uint8) (*Apdu, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go index 902bd167de3..763b9d1988d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go @@ -35,10 +35,10 @@ type ApduControl struct { type IApduControl interface { // ControlType returns ControlType ControlType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IApduControlChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewApduControl factory function for ApduControl func NewApduControl() *ApduControl { return &ApduControl{} } @@ -84,15 +85,15 @@ func (m *ApduControl) GetTypeName() string { return "ApduControl" } -func (m *ApduControl) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduControl) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduControl) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ApduControl) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ApduControl) ParentLengthInBits() uint16 { +func (m *ApduControl) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (controlType) lengthInBits += 2 @@ -100,8 +101,8 @@ func (m *ApduControl) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ApduControl) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduControl) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduControlParse(readBuffer utils.ReadBuffer) (*ApduControl, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go index 899e5cd9d66..7469ca45bb6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go @@ -32,10 +32,10 @@ type ApduControlAck struct { // The corresponding interface type IApduControlAck interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ApduControlAck) InitializeParent(parent *ApduControl) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewApduControlAck factory function for ApduControlAck func NewApduControlAck() *ApduControl { child := &ApduControlAck{ ApduControl: NewApduControl(), @@ -92,18 +93,18 @@ func (m *ApduControlAck) GetTypeName() string { return "ApduControlAck" } -func (m *ApduControlAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduControlAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduControlAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduControlAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduControlAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduControlAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduControlAckParse(readBuffer utils.ReadBuffer) (*ApduControl, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go index 701d90d36b1..b423a1961f6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go @@ -32,10 +32,10 @@ type ApduControlConnect struct { // The corresponding interface type IApduControlConnect interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ApduControlConnect) InitializeParent(parent *ApduControl) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewApduControlConnect factory function for ApduControlConnect func NewApduControlConnect() *ApduControl { child := &ApduControlConnect{ ApduControl: NewApduControl(), @@ -92,18 +93,18 @@ func (m *ApduControlConnect) GetTypeName() string { return "ApduControlConnect" } -func (m *ApduControlConnect) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduControlConnect) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduControlConnect) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduControlConnect) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduControlConnect) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduControlConnect) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduControlConnectParse(readBuffer utils.ReadBuffer) (*ApduControl, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go index bdf5dc77cce..f5300b25aeb 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go @@ -30,16 +30,19 @@ import ( type ApduControlContainer struct { *Apdu ControlApdu *ApduControl + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduControlContainer interface { // GetControlApdu returns ControlApdu GetControlApdu() *ApduControl - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -71,10 +74,11 @@ func (m *ApduControlContainer) GetControlApdu() *ApduControl { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduControlContainer(controlApdu *ApduControl, numbered bool, counter uint8) *Apdu { +// NewApduControlContainer factory function for ApduControlContainer +func NewApduControlContainer(controlApdu *ApduControl, numbered bool, counter uint8, dataLength uint8) *Apdu { child := &ApduControlContainer{ ControlApdu: controlApdu, - Apdu: NewApdu(numbered, counter), + Apdu: NewApdu(numbered, counter, dataLength), } child.Child = child return child.Apdu @@ -103,21 +107,21 @@ func (m *ApduControlContainer) GetTypeName() string { return "ApduControlContainer" } -func (m *ApduControlContainer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduControlContainer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduControlContainer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduControlContainer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (controlApdu) - lengthInBits += m.ControlApdu.LengthInBits() + lengthInBits += m.ControlApdu.GetLengthInBits() return lengthInBits } -func (m *ApduControlContainer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduControlContainer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduControlContainerParse(readBuffer utils.ReadBuffer, dataLength uint8) (*Apdu, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go index f01640aeb83..4b15e1bd933 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go @@ -32,10 +32,10 @@ type ApduControlDisconnect struct { // The corresponding interface type IApduControlDisconnect interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ApduControlDisconnect) InitializeParent(parent *ApduControl) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewApduControlDisconnect factory function for ApduControlDisconnect func NewApduControlDisconnect() *ApduControl { child := &ApduControlDisconnect{ ApduControl: NewApduControl(), @@ -92,18 +93,18 @@ func (m *ApduControlDisconnect) GetTypeName() string { return "ApduControlDisconnect" } -func (m *ApduControlDisconnect) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduControlDisconnect) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduControlDisconnect) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduControlDisconnect) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduControlDisconnect) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduControlDisconnect) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduControlDisconnectParse(readBuffer utils.ReadBuffer) (*ApduControl, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go index 131382a1d78..5430e1bffe9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go @@ -32,10 +32,10 @@ type ApduControlNack struct { // The corresponding interface type IApduControlNack interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ApduControlNack) InitializeParent(parent *ApduControl) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewApduControlNack factory function for ApduControlNack func NewApduControlNack() *ApduControl { child := &ApduControlNack{ ApduControl: NewApduControl(), @@ -92,18 +93,18 @@ func (m *ApduControlNack) GetTypeName() string { return "ApduControlNack" } -func (m *ApduControlNack) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduControlNack) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduControlNack) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduControlNack) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduControlNack) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduControlNack) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduControlNackParse(readBuffer utils.ReadBuffer) (*ApduControl, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go index c02f6b89c12..e2b3a63f75a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go @@ -28,17 +28,20 @@ import ( // The data-structure of this message type ApduData struct { - Child IApduDataChild + + // Arguments. + DataLength uint8 + Child IApduDataChild } // The corresponding interface type IApduData interface { // ApciType returns ApciType ApciType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IApduDataChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduData() *ApduData { - return &ApduData{} +// NewApduData factory function for ApduData +func NewApduData(dataLength uint8) *ApduData { + return &ApduData{DataLength: dataLength} } func CastApduData(structType interface{}) *ApduData { @@ -84,15 +88,15 @@ func (m *ApduData) GetTypeName() string { return "ApduData" } -func (m *ApduData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduData) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ApduData) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ApduData) ParentLengthInBits() uint16 { +func (m *ApduData) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (apciType) lengthInBits += 4 @@ -100,8 +104,8 @@ func (m *ApduData) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ApduData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go index 1ad6fa74373..457f1c58945 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataAdcRead struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataAdcRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataAdcRead) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataAdcRead() *ApduData { +// NewApduDataAdcRead factory function for ApduDataAdcRead +func NewApduDataAdcRead(dataLength uint8) *ApduData { child := &ApduDataAdcRead{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataAdcRead) GetTypeName() string { return "ApduDataAdcRead" } -func (m *ApduDataAdcRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataAdcRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataAdcRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataAdcRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataAdcRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataAdcRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataAdcReadParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go index 64292bdc6aa..faf62caa28a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataAdcResponse struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataAdcResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataAdcResponse) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataAdcResponse() *ApduData { +// NewApduDataAdcResponse factory function for ApduDataAdcResponse +func NewApduDataAdcResponse(dataLength uint8) *ApduData { child := &ApduDataAdcResponse{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataAdcResponse) GetTypeName() string { return "ApduDataAdcResponse" } -func (m *ApduDataAdcResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataAdcResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataAdcResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataAdcResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataAdcResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataAdcResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataAdcResponseParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go index ddb8e0c54d3..78c8d31cfd4 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go @@ -30,16 +30,19 @@ import ( type ApduDataContainer struct { *Apdu DataApdu *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataContainer interface { // GetDataApdu returns DataApdu GetDataApdu() *ApduData - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -71,10 +74,11 @@ func (m *ApduDataContainer) GetDataApdu() *ApduData { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataContainer(dataApdu *ApduData, numbered bool, counter uint8) *Apdu { +// NewApduDataContainer factory function for ApduDataContainer +func NewApduDataContainer(dataApdu *ApduData, numbered bool, counter uint8, dataLength uint8) *Apdu { child := &ApduDataContainer{ DataApdu: dataApdu, - Apdu: NewApdu(numbered, counter), + Apdu: NewApdu(numbered, counter, dataLength), } child.Child = child return child.Apdu @@ -103,21 +107,21 @@ func (m *ApduDataContainer) GetTypeName() string { return "ApduDataContainer" } -func (m *ApduDataContainer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataContainer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataContainer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataContainer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (dataApdu) - lengthInBits += m.DataApdu.LengthInBits() + lengthInBits += m.DataApdu.GetLengthInBits() return lengthInBits } -func (m *ApduDataContainer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataContainer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataContainerParse(readBuffer utils.ReadBuffer, dataLength uint8) (*Apdu, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go index 4cf0b83c667..7cdbea42fd6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go @@ -30,16 +30,19 @@ import ( type ApduDataDeviceDescriptorRead struct { *ApduData DescriptorType uint8 + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataDeviceDescriptorRead interface { // GetDescriptorType returns DescriptorType GetDescriptorType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *ApduDataDeviceDescriptorRead) GetDescriptorType() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataDeviceDescriptorRead(descriptorType uint8) *ApduData { +// NewApduDataDeviceDescriptorRead factory function for ApduDataDeviceDescriptorRead +func NewApduDataDeviceDescriptorRead(descriptorType uint8, dataLength uint8) *ApduData { child := &ApduDataDeviceDescriptorRead{ DescriptorType: descriptorType, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -100,12 +104,12 @@ func (m *ApduDataDeviceDescriptorRead) GetTypeName() string { return "ApduDataDeviceDescriptorRead" } -func (m *ApduDataDeviceDescriptorRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataDeviceDescriptorRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataDeviceDescriptorRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataDeviceDescriptorRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (descriptorType) lengthInBits += 6 @@ -113,8 +117,8 @@ func (m *ApduDataDeviceDescriptorRead) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *ApduDataDeviceDescriptorRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataDeviceDescriptorRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataDeviceDescriptorReadParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go index d7af6b4519e..1d3d57d016d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go @@ -31,6 +31,9 @@ type ApduDataDeviceDescriptorResponse struct { *ApduData DescriptorType uint8 Data []byte + + // Arguments. + DataLength uint8 } // The corresponding interface @@ -39,10 +42,10 @@ type IApduDataDeviceDescriptorResponse interface { GetDescriptorType() uint8 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *ApduDataDeviceDescriptorResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataDeviceDescriptorResponse(descriptorType uint8, data []byte) *ApduData { +// NewApduDataDeviceDescriptorResponse factory function for ApduDataDeviceDescriptorResponse +func NewApduDataDeviceDescriptorResponse(descriptorType uint8, data []byte, dataLength uint8) *ApduData { child := &ApduDataDeviceDescriptorResponse{ DescriptorType: descriptorType, Data: data, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -108,12 +112,12 @@ func (m *ApduDataDeviceDescriptorResponse) GetTypeName() string { return "ApduDataDeviceDescriptorResponse" } -func (m *ApduDataDeviceDescriptorResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataDeviceDescriptorResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataDeviceDescriptorResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataDeviceDescriptorResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (descriptorType) lengthInBits += 6 @@ -126,8 +130,8 @@ func (m *ApduDataDeviceDescriptorResponse) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *ApduDataDeviceDescriptorResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataDeviceDescriptorResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataDeviceDescriptorResponseParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go index 54a2e997917..9e67ff15460 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go @@ -28,17 +28,20 @@ import ( // The data-structure of this message type ApduDataExt struct { - Child IApduDataExtChild + + // Arguments. + Length uint8 + Child IApduDataExtChild } // The corresponding interface type IApduDataExt interface { // ExtApciType returns ExtApciType ExtApciType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type IApduDataExtChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExt() *ApduDataExt { - return &ApduDataExt{} +// NewApduDataExt factory function for ApduDataExt +func NewApduDataExt(length uint8) *ApduDataExt { + return &ApduDataExt{Length: length} } func CastApduDataExt(structType interface{}) *ApduDataExt { @@ -84,15 +88,15 @@ func (m *ApduDataExt) GetTypeName() string { return "ApduDataExt" } -func (m *ApduDataExt) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExt) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExt) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ApduDataExt) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ApduDataExt) ParentLengthInBits() uint16 { +func (m *ApduDataExt) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (extApciType) lengthInBits += 6 @@ -100,8 +104,8 @@ func (m *ApduDataExt) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ApduDataExt) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExt) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go index baf9a464fe6..a242ac795a9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go @@ -31,6 +31,9 @@ type ApduDataExtAuthorizeRequest struct { *ApduDataExt Level uint8 Data []byte + + // Arguments. + Length uint8 } // The corresponding interface @@ -39,10 +42,10 @@ type IApduDataExtAuthorizeRequest interface { GetLevel() uint8 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *ApduDataExtAuthorizeRequest) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtAuthorizeRequest(level uint8, data []byte) *ApduDataExt { +// NewApduDataExtAuthorizeRequest factory function for ApduDataExtAuthorizeRequest +func NewApduDataExtAuthorizeRequest(level uint8, data []byte, length uint8) *ApduDataExt { child := &ApduDataExtAuthorizeRequest{ Level: level, Data: data, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -108,12 +112,12 @@ func (m *ApduDataExtAuthorizeRequest) GetTypeName() string { return "ApduDataExtAuthorizeRequest" } -func (m *ApduDataExtAuthorizeRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtAuthorizeRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtAuthorizeRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtAuthorizeRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (level) lengthInBits += 8 @@ -126,8 +130,8 @@ func (m *ApduDataExtAuthorizeRequest) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *ApduDataExtAuthorizeRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtAuthorizeRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtAuthorizeRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go index 20eb96dc584..7d2f121b55d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go @@ -30,16 +30,19 @@ import ( type ApduDataExtAuthorizeResponse struct { *ApduDataExt Level uint8 + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtAuthorizeResponse interface { // GetLevel returns Level GetLevel() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *ApduDataExtAuthorizeResponse) GetLevel() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtAuthorizeResponse(level uint8) *ApduDataExt { +// NewApduDataExtAuthorizeResponse factory function for ApduDataExtAuthorizeResponse +func NewApduDataExtAuthorizeResponse(level uint8, length uint8) *ApduDataExt { child := &ApduDataExtAuthorizeResponse{ Level: level, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -100,12 +104,12 @@ func (m *ApduDataExtAuthorizeResponse) GetTypeName() string { return "ApduDataExtAuthorizeResponse" } -func (m *ApduDataExtAuthorizeResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtAuthorizeResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtAuthorizeResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtAuthorizeResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (level) lengthInBits += 8 @@ -113,8 +117,8 @@ func (m *ApduDataExtAuthorizeResponse) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *ApduDataExtAuthorizeResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtAuthorizeResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtAuthorizeResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go index b6aa1222777..12ad2c7e1e1 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressRead) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressRead() *ApduDataExt { +// NewApduDataExtDomainAddressRead factory function for ApduDataExtDomainAddressRead +func NewApduDataExtDomainAddressRead(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressRead) GetTypeName() string { return "ApduDataExtDomainAddressRead" } -func (m *ApduDataExtDomainAddressRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go index 7d36a72e538..35a5b26dd95 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressResponse) InitializeParent(parent *ApduDataExt) // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressResponse() *ApduDataExt { +// NewApduDataExtDomainAddressResponse factory function for ApduDataExtDomainAddressResponse +func NewApduDataExtDomainAddressResponse(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressResponse) GetTypeName() string { return "ApduDataExtDomainAddressResponse" } -func (m *ApduDataExtDomainAddressResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go index 9e66adba548..95876d798b0 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressSelectiveRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressSelectiveRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressSelectiveRead) InitializeParent(parent *ApduDat // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressSelectiveRead() *ApduDataExt { +// NewApduDataExtDomainAddressSelectiveRead factory function for ApduDataExtDomainAddressSelectiveRead +func NewApduDataExtDomainAddressSelectiveRead(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressSelectiveRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressSelectiveRead) GetTypeName() string { return "ApduDataExtDomainAddressSelectiveRead" } -func (m *ApduDataExtDomainAddressSelectiveRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressSelectiveRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressSelectiveRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressSelectiveRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressSelectiveRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressSelectiveRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressSelectiveReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go index ee3c1f85a1d..a4a74f8f312 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressSerialNumberRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressSerialNumberRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressSerialNumberRead) InitializeParent(parent *Apdu // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressSerialNumberRead() *ApduDataExt { +// NewApduDataExtDomainAddressSerialNumberRead factory function for ApduDataExtDomainAddressSerialNumberRead +func NewApduDataExtDomainAddressSerialNumberRead(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressSerialNumberRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressSerialNumberRead) GetTypeName() string { return "ApduDataExtDomainAddressSerialNumberRead" } -func (m *ApduDataExtDomainAddressSerialNumberRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressSerialNumberRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressSerialNumberRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressSerialNumberRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressSerialNumberRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressSerialNumberRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressSerialNumberReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go index 5e709ec4ed7..bf0a02bc9f4 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressSerialNumberResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressSerialNumberResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressSerialNumberResponse) InitializeParent(parent * // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressSerialNumberResponse() *ApduDataExt { +// NewApduDataExtDomainAddressSerialNumberResponse factory function for ApduDataExtDomainAddressSerialNumberResponse +func NewApduDataExtDomainAddressSerialNumberResponse(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressSerialNumberResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressSerialNumberResponse) GetTypeName() string { return "ApduDataExtDomainAddressSerialNumberResponse" } -func (m *ApduDataExtDomainAddressSerialNumberResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressSerialNumberResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressSerialNumberResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressSerialNumberResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressSerialNumberResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressSerialNumberResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressSerialNumberResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go index d0d8df66127..f387c1651b9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressSerialNumberWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressSerialNumberWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressSerialNumberWrite) InitializeParent(parent *Apd // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressSerialNumberWrite() *ApduDataExt { +// NewApduDataExtDomainAddressSerialNumberWrite factory function for ApduDataExtDomainAddressSerialNumberWrite +func NewApduDataExtDomainAddressSerialNumberWrite(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressSerialNumberWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressSerialNumberWrite) GetTypeName() string { return "ApduDataExtDomainAddressSerialNumberWrite" } -func (m *ApduDataExtDomainAddressSerialNumberWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressSerialNumberWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressSerialNumberWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressSerialNumberWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressSerialNumberWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressSerialNumberWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressSerialNumberWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go index 22155b196ee..9befd94957d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtDomainAddressWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtDomainAddressWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtDomainAddressWrite) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtDomainAddressWrite() *ApduDataExt { +// NewApduDataExtDomainAddressWrite factory function for ApduDataExtDomainAddressWrite +func NewApduDataExtDomainAddressWrite(length uint8) *ApduDataExt { child := &ApduDataExtDomainAddressWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtDomainAddressWrite) GetTypeName() string { return "ApduDataExtDomainAddressWrite" } -func (m *ApduDataExtDomainAddressWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtDomainAddressWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtDomainAddressWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtDomainAddressWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtDomainAddressWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtDomainAddressWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtDomainAddressWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go index 43e47c6947a..43eed7f2a46 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtFileStreamInfoReport struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtFileStreamInfoReport interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtFileStreamInfoReport) InitializeParent(parent *ApduDataExt) // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtFileStreamInfoReport() *ApduDataExt { +// NewApduDataExtFileStreamInfoReport factory function for ApduDataExtFileStreamInfoReport +func NewApduDataExtFileStreamInfoReport(length uint8) *ApduDataExt { child := &ApduDataExtFileStreamInfoReport{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtFileStreamInfoReport) GetTypeName() string { return "ApduDataExtFileStreamInfoReport" } -func (m *ApduDataExtFileStreamInfoReport) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtFileStreamInfoReport) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtFileStreamInfoReport) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtFileStreamInfoReport) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtFileStreamInfoReport) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtFileStreamInfoReport) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtFileStreamInfoReportParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go index 911367c2e30..f0b0d91742a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtGroupPropertyValueInfoReport struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtGroupPropertyValueInfoReport interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtGroupPropertyValueInfoReport) InitializeParent(parent *ApduD // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtGroupPropertyValueInfoReport() *ApduDataExt { +// NewApduDataExtGroupPropertyValueInfoReport factory function for ApduDataExtGroupPropertyValueInfoReport +func NewApduDataExtGroupPropertyValueInfoReport(length uint8) *ApduDataExt { child := &ApduDataExtGroupPropertyValueInfoReport{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtGroupPropertyValueInfoReport) GetTypeName() string { return "ApduDataExtGroupPropertyValueInfoReport" } -func (m *ApduDataExtGroupPropertyValueInfoReport) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtGroupPropertyValueInfoReport) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtGroupPropertyValueInfoReport) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtGroupPropertyValueInfoReport) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtGroupPropertyValueInfoReport) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtGroupPropertyValueInfoReport) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtGroupPropertyValueInfoReportParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go index a2d21362019..6269bbf932e 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtGroupPropertyValueRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtGroupPropertyValueRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtGroupPropertyValueRead) InitializeParent(parent *ApduDataExt // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtGroupPropertyValueRead() *ApduDataExt { +// NewApduDataExtGroupPropertyValueRead factory function for ApduDataExtGroupPropertyValueRead +func NewApduDataExtGroupPropertyValueRead(length uint8) *ApduDataExt { child := &ApduDataExtGroupPropertyValueRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtGroupPropertyValueRead) GetTypeName() string { return "ApduDataExtGroupPropertyValueRead" } -func (m *ApduDataExtGroupPropertyValueRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtGroupPropertyValueRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtGroupPropertyValueRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtGroupPropertyValueRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtGroupPropertyValueRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtGroupPropertyValueRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtGroupPropertyValueReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go index c314e7fef1f..ce21a54039b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtGroupPropertyValueResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtGroupPropertyValueResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtGroupPropertyValueResponse) InitializeParent(parent *ApduDat // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtGroupPropertyValueResponse() *ApduDataExt { +// NewApduDataExtGroupPropertyValueResponse factory function for ApduDataExtGroupPropertyValueResponse +func NewApduDataExtGroupPropertyValueResponse(length uint8) *ApduDataExt { child := &ApduDataExtGroupPropertyValueResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtGroupPropertyValueResponse) GetTypeName() string { return "ApduDataExtGroupPropertyValueResponse" } -func (m *ApduDataExtGroupPropertyValueResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtGroupPropertyValueResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtGroupPropertyValueResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtGroupPropertyValueResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtGroupPropertyValueResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtGroupPropertyValueResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtGroupPropertyValueResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go index 96e5b1a39f5..2dbe52a03b1 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtGroupPropertyValueWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtGroupPropertyValueWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtGroupPropertyValueWrite) InitializeParent(parent *ApduDataEx // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtGroupPropertyValueWrite() *ApduDataExt { +// NewApduDataExtGroupPropertyValueWrite factory function for ApduDataExtGroupPropertyValueWrite +func NewApduDataExtGroupPropertyValueWrite(length uint8) *ApduDataExt { child := &ApduDataExtGroupPropertyValueWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtGroupPropertyValueWrite) GetTypeName() string { return "ApduDataExtGroupPropertyValueWrite" } -func (m *ApduDataExtGroupPropertyValueWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtGroupPropertyValueWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtGroupPropertyValueWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtGroupPropertyValueWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtGroupPropertyValueWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtGroupPropertyValueWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtGroupPropertyValueWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go index 89b5eebf73c..848098bccf2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtIndividualAddressSerialNumberRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtIndividualAddressSerialNumberRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtIndividualAddressSerialNumberRead) InitializeParent(parent * // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtIndividualAddressSerialNumberRead() *ApduDataExt { +// NewApduDataExtIndividualAddressSerialNumberRead factory function for ApduDataExtIndividualAddressSerialNumberRead +func NewApduDataExtIndividualAddressSerialNumberRead(length uint8) *ApduDataExt { child := &ApduDataExtIndividualAddressSerialNumberRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtIndividualAddressSerialNumberRead) GetTypeName() string { return "ApduDataExtIndividualAddressSerialNumberRead" } -func (m *ApduDataExtIndividualAddressSerialNumberRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtIndividualAddressSerialNumberRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtIndividualAddressSerialNumberRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtIndividualAddressSerialNumberRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtIndividualAddressSerialNumberRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtIndividualAddressSerialNumberRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtIndividualAddressSerialNumberReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go index ab954fad6be..9d4511fd26b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtIndividualAddressSerialNumberResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtIndividualAddressSerialNumberResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtIndividualAddressSerialNumberResponse) InitializeParent(pare // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtIndividualAddressSerialNumberResponse() *ApduDataExt { +// NewApduDataExtIndividualAddressSerialNumberResponse factory function for ApduDataExtIndividualAddressSerialNumberResponse +func NewApduDataExtIndividualAddressSerialNumberResponse(length uint8) *ApduDataExt { child := &ApduDataExtIndividualAddressSerialNumberResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtIndividualAddressSerialNumberResponse) GetTypeName() string return "ApduDataExtIndividualAddressSerialNumberResponse" } -func (m *ApduDataExtIndividualAddressSerialNumberResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtIndividualAddressSerialNumberResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtIndividualAddressSerialNumberResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtIndividualAddressSerialNumberResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtIndividualAddressSerialNumberResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtIndividualAddressSerialNumberResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtIndividualAddressSerialNumberResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go index ce40fa93c1b..b5b2bc4a6d2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtIndividualAddressSerialNumberWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtIndividualAddressSerialNumberWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtIndividualAddressSerialNumberWrite) InitializeParent(parent // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtIndividualAddressSerialNumberWrite() *ApduDataExt { +// NewApduDataExtIndividualAddressSerialNumberWrite factory function for ApduDataExtIndividualAddressSerialNumberWrite +func NewApduDataExtIndividualAddressSerialNumberWrite(length uint8) *ApduDataExt { child := &ApduDataExtIndividualAddressSerialNumberWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtIndividualAddressSerialNumberWrite) GetTypeName() string { return "ApduDataExtIndividualAddressSerialNumberWrite" } -func (m *ApduDataExtIndividualAddressSerialNumberWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtIndividualAddressSerialNumberWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtIndividualAddressSerialNumberWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtIndividualAddressSerialNumberWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtIndividualAddressSerialNumberWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtIndividualAddressSerialNumberWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtIndividualAddressSerialNumberWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go index df19d292510..af577c9ce67 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtKeyResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtKeyResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtKeyResponse) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtKeyResponse() *ApduDataExt { +// NewApduDataExtKeyResponse factory function for ApduDataExtKeyResponse +func NewApduDataExtKeyResponse(length uint8) *ApduDataExt { child := &ApduDataExtKeyResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtKeyResponse) GetTypeName() string { return "ApduDataExtKeyResponse" } -func (m *ApduDataExtKeyResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtKeyResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtKeyResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtKeyResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtKeyResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtKeyResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtKeyResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go index 6283a3a63a1..c7bf8c29daf 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtKeyWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtKeyWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtKeyWrite) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtKeyWrite() *ApduDataExt { +// NewApduDataExtKeyWrite factory function for ApduDataExtKeyWrite +func NewApduDataExtKeyWrite(length uint8) *ApduDataExt { child := &ApduDataExtKeyWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtKeyWrite) GetTypeName() string { return "ApduDataExtKeyWrite" } -func (m *ApduDataExtKeyWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtKeyWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtKeyWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtKeyWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtKeyWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtKeyWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtKeyWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go index ecd5a7f2c2f..273dd29a002 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtLinkRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtLinkRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtLinkRead) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtLinkRead() *ApduDataExt { +// NewApduDataExtLinkRead factory function for ApduDataExtLinkRead +func NewApduDataExtLinkRead(length uint8) *ApduDataExt { child := &ApduDataExtLinkRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtLinkRead) GetTypeName() string { return "ApduDataExtLinkRead" } -func (m *ApduDataExtLinkRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtLinkRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtLinkRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtLinkRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtLinkRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtLinkRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtLinkReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go index bd2fa0ff3c3..f474225f1ae 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtLinkResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtLinkResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtLinkResponse) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtLinkResponse() *ApduDataExt { +// NewApduDataExtLinkResponse factory function for ApduDataExtLinkResponse +func NewApduDataExtLinkResponse(length uint8) *ApduDataExt { child := &ApduDataExtLinkResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtLinkResponse) GetTypeName() string { return "ApduDataExtLinkResponse" } -func (m *ApduDataExtLinkResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtLinkResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtLinkResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtLinkResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtLinkResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtLinkResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtLinkResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go index 15ebb86d7cf..66d8bb47d11 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtLinkWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtLinkWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtLinkWrite) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtLinkWrite() *ApduDataExt { +// NewApduDataExtLinkWrite factory function for ApduDataExtLinkWrite +func NewApduDataExtLinkWrite(length uint8) *ApduDataExt { child := &ApduDataExtLinkWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtLinkWrite) GetTypeName() string { return "ApduDataExtLinkWrite" } -func (m *ApduDataExtLinkWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtLinkWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtLinkWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtLinkWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtLinkWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtLinkWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtLinkWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go index 7295a86a7d7..cc1449ba601 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtMemoryBitWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtMemoryBitWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtMemoryBitWrite) InitializeParent(parent *ApduDataExt) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtMemoryBitWrite() *ApduDataExt { +// NewApduDataExtMemoryBitWrite factory function for ApduDataExtMemoryBitWrite +func NewApduDataExtMemoryBitWrite(length uint8) *ApduDataExt { child := &ApduDataExtMemoryBitWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtMemoryBitWrite) GetTypeName() string { return "ApduDataExtMemoryBitWrite" } -func (m *ApduDataExtMemoryBitWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtMemoryBitWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtMemoryBitWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtMemoryBitWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtMemoryBitWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtMemoryBitWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtMemoryBitWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go index f3190743b27..05e31cb4f7c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtNetworkParameterRead struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtNetworkParameterRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtNetworkParameterRead) InitializeParent(parent *ApduDataExt) // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtNetworkParameterRead() *ApduDataExt { +// NewApduDataExtNetworkParameterRead factory function for ApduDataExtNetworkParameterRead +func NewApduDataExtNetworkParameterRead(length uint8) *ApduDataExt { child := &ApduDataExtNetworkParameterRead{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtNetworkParameterRead) GetTypeName() string { return "ApduDataExtNetworkParameterRead" } -func (m *ApduDataExtNetworkParameterRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtNetworkParameterRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtNetworkParameterRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtNetworkParameterRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtNetworkParameterRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtNetworkParameterRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtNetworkParameterReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go index cccc38f02ee..f71478322f9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtNetworkParameterResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtNetworkParameterResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtNetworkParameterResponse) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtNetworkParameterResponse() *ApduDataExt { +// NewApduDataExtNetworkParameterResponse factory function for ApduDataExtNetworkParameterResponse +func NewApduDataExtNetworkParameterResponse(length uint8) *ApduDataExt { child := &ApduDataExtNetworkParameterResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtNetworkParameterResponse) GetTypeName() string { return "ApduDataExtNetworkParameterResponse" } -func (m *ApduDataExtNetworkParameterResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtNetworkParameterResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtNetworkParameterResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtNetworkParameterResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtNetworkParameterResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtNetworkParameterResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtNetworkParameterResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go index e096366b1e7..93ef15d1e2d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtNetworkParameterWrite struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtNetworkParameterWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtNetworkParameterWrite) InitializeParent(parent *ApduDataExt) // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtNetworkParameterWrite() *ApduDataExt { +// NewApduDataExtNetworkParameterWrite factory function for ApduDataExtNetworkParameterWrite +func NewApduDataExtNetworkParameterWrite(length uint8) *ApduDataExt { child := &ApduDataExtNetworkParameterWrite{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtNetworkParameterWrite) GetTypeName() string { return "ApduDataExtNetworkParameterWrite" } -func (m *ApduDataExtNetworkParameterWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtNetworkParameterWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtNetworkParameterWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtNetworkParameterWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtNetworkParameterWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtNetworkParameterWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtNetworkParameterWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go index 5481e46056b..409e58d8d2f 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtOpenRoutingTableRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtOpenRoutingTableRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtOpenRoutingTableRequest) InitializeParent(parent *ApduDataEx // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtOpenRoutingTableRequest() *ApduDataExt { +// NewApduDataExtOpenRoutingTableRequest factory function for ApduDataExtOpenRoutingTableRequest +func NewApduDataExtOpenRoutingTableRequest(length uint8) *ApduDataExt { child := &ApduDataExtOpenRoutingTableRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtOpenRoutingTableRequest) GetTypeName() string { return "ApduDataExtOpenRoutingTableRequest" } -func (m *ApduDataExtOpenRoutingTableRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtOpenRoutingTableRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtOpenRoutingTableRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtOpenRoutingTableRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtOpenRoutingTableRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtOpenRoutingTableRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtOpenRoutingTableRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go index 4dd7b2db90a..4d265bf4d63 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go @@ -32,6 +32,9 @@ type ApduDataExtPropertyDescriptionRead struct { ObjectIndex uint8 PropertyId uint8 Index uint8 + + // Arguments. + Length uint8 } // The corresponding interface @@ -42,10 +45,10 @@ type IApduDataExtPropertyDescriptionRead interface { GetPropertyId() uint8 // GetIndex returns Index GetIndex() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,12 +85,13 @@ func (m *ApduDataExtPropertyDescriptionRead) GetIndex() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtPropertyDescriptionRead(objectIndex uint8, propertyId uint8, index uint8) *ApduDataExt { +// NewApduDataExtPropertyDescriptionRead factory function for ApduDataExtPropertyDescriptionRead +func NewApduDataExtPropertyDescriptionRead(objectIndex uint8, propertyId uint8, index uint8, length uint8) *ApduDataExt { child := &ApduDataExtPropertyDescriptionRead{ ObjectIndex: objectIndex, PropertyId: propertyId, Index: index, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -116,12 +120,12 @@ func (m *ApduDataExtPropertyDescriptionRead) GetTypeName() string { return "ApduDataExtPropertyDescriptionRead" } -func (m *ApduDataExtPropertyDescriptionRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtPropertyDescriptionRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtPropertyDescriptionRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtPropertyDescriptionRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIndex) lengthInBits += 8 @@ -135,8 +139,8 @@ func (m *ApduDataExtPropertyDescriptionRead) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *ApduDataExtPropertyDescriptionRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtPropertyDescriptionRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtPropertyDescriptionReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go index a9680fb48e8..fb27a6341d5 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go @@ -38,6 +38,9 @@ type ApduDataExtPropertyDescriptionResponse struct { MaxNrOfElements uint16 ReadLevel AccessLevel WriteLevel AccessLevel + + // Arguments. + Length uint8 } // The corresponding interface @@ -58,10 +61,10 @@ type IApduDataExtPropertyDescriptionResponse interface { GetReadLevel() AccessLevel // GetWriteLevel returns WriteLevel GetWriteLevel() AccessLevel - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -118,7 +121,8 @@ func (m *ApduDataExtPropertyDescriptionResponse) GetWriteLevel() AccessLevel { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtPropertyDescriptionResponse(objectIndex uint8, propertyId uint8, index uint8, writeEnabled bool, propertyDataType KnxPropertyDataType, maxNrOfElements uint16, readLevel AccessLevel, writeLevel AccessLevel) *ApduDataExt { +// NewApduDataExtPropertyDescriptionResponse factory function for ApduDataExtPropertyDescriptionResponse +func NewApduDataExtPropertyDescriptionResponse(objectIndex uint8, propertyId uint8, index uint8, writeEnabled bool, propertyDataType KnxPropertyDataType, maxNrOfElements uint16, readLevel AccessLevel, writeLevel AccessLevel, length uint8) *ApduDataExt { child := &ApduDataExtPropertyDescriptionResponse{ ObjectIndex: objectIndex, PropertyId: propertyId, @@ -128,7 +132,7 @@ func NewApduDataExtPropertyDescriptionResponse(objectIndex uint8, propertyId uin MaxNrOfElements: maxNrOfElements, ReadLevel: readLevel, WriteLevel: writeLevel, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -157,12 +161,12 @@ func (m *ApduDataExtPropertyDescriptionResponse) GetTypeName() string { return "ApduDataExtPropertyDescriptionResponse" } -func (m *ApduDataExtPropertyDescriptionResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtPropertyDescriptionResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtPropertyDescriptionResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtPropertyDescriptionResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIndex) lengthInBits += 8 @@ -197,8 +201,8 @@ func (m *ApduDataExtPropertyDescriptionResponse) LengthInBitsConditional(lastIte return lengthInBits } -func (m *ApduDataExtPropertyDescriptionResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtPropertyDescriptionResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtPropertyDescriptionResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go index 6d150587c73..9c30b2810c6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go @@ -33,6 +33,9 @@ type ApduDataExtPropertyValueRead struct { PropertyId uint8 Count uint8 Index uint16 + + // Arguments. + Length uint8 } // The corresponding interface @@ -45,10 +48,10 @@ type IApduDataExtPropertyValueRead interface { GetCount() uint8 // GetIndex returns Index GetIndex() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,13 +92,14 @@ func (m *ApduDataExtPropertyValueRead) GetIndex() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtPropertyValueRead(objectIndex uint8, propertyId uint8, count uint8, index uint16) *ApduDataExt { +// NewApduDataExtPropertyValueRead factory function for ApduDataExtPropertyValueRead +func NewApduDataExtPropertyValueRead(objectIndex uint8, propertyId uint8, count uint8, index uint16, length uint8) *ApduDataExt { child := &ApduDataExtPropertyValueRead{ ObjectIndex: objectIndex, PropertyId: propertyId, Count: count, Index: index, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -124,12 +128,12 @@ func (m *ApduDataExtPropertyValueRead) GetTypeName() string { return "ApduDataExtPropertyValueRead" } -func (m *ApduDataExtPropertyValueRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtPropertyValueRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtPropertyValueRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtPropertyValueRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIndex) lengthInBits += 8 @@ -146,8 +150,8 @@ func (m *ApduDataExtPropertyValueRead) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *ApduDataExtPropertyValueRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtPropertyValueRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtPropertyValueReadParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go index 7078bfd52ae..69cdcfa265c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go @@ -34,6 +34,9 @@ type ApduDataExtPropertyValueResponse struct { Count uint8 Index uint16 Data []byte + + // Arguments. + Length uint8 } // The corresponding interface @@ -48,10 +51,10 @@ type IApduDataExtPropertyValueResponse interface { GetIndex() uint16 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -96,14 +99,15 @@ func (m *ApduDataExtPropertyValueResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtPropertyValueResponse(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte) *ApduDataExt { +// NewApduDataExtPropertyValueResponse factory function for ApduDataExtPropertyValueResponse +func NewApduDataExtPropertyValueResponse(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte, length uint8) *ApduDataExt { child := &ApduDataExtPropertyValueResponse{ ObjectIndex: objectIndex, PropertyId: propertyId, Count: count, Index: index, Data: data, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -132,12 +136,12 @@ func (m *ApduDataExtPropertyValueResponse) GetTypeName() string { return "ApduDataExtPropertyValueResponse" } -func (m *ApduDataExtPropertyValueResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtPropertyValueResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtPropertyValueResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtPropertyValueResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIndex) lengthInBits += 8 @@ -159,8 +163,8 @@ func (m *ApduDataExtPropertyValueResponse) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *ApduDataExtPropertyValueResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtPropertyValueResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtPropertyValueResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go index f8251e2ba7c..4d1537b8327 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go @@ -34,6 +34,9 @@ type ApduDataExtPropertyValueWrite struct { Count uint8 Index uint16 Data []byte + + // Arguments. + Length uint8 } // The corresponding interface @@ -48,10 +51,10 @@ type IApduDataExtPropertyValueWrite interface { GetIndex() uint16 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -96,14 +99,15 @@ func (m *ApduDataExtPropertyValueWrite) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtPropertyValueWrite(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte) *ApduDataExt { +// NewApduDataExtPropertyValueWrite factory function for ApduDataExtPropertyValueWrite +func NewApduDataExtPropertyValueWrite(objectIndex uint8, propertyId uint8, count uint8, index uint16, data []byte, length uint8) *ApduDataExt { child := &ApduDataExtPropertyValueWrite{ ObjectIndex: objectIndex, PropertyId: propertyId, Count: count, Index: index, Data: data, - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -132,12 +136,12 @@ func (m *ApduDataExtPropertyValueWrite) GetTypeName() string { return "ApduDataExtPropertyValueWrite" } -func (m *ApduDataExtPropertyValueWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtPropertyValueWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtPropertyValueWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtPropertyValueWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (objectIndex) lengthInBits += 8 @@ -159,8 +163,8 @@ func (m *ApduDataExtPropertyValueWrite) LengthInBitsConditional(lastItem bool) u return lengthInBits } -func (m *ApduDataExtPropertyValueWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtPropertyValueWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtPropertyValueWriteParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go index 0192f2d470b..3f4f0ab9308 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtReadRouterMemoryRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtReadRouterMemoryRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtReadRouterMemoryRequest) InitializeParent(parent *ApduDataEx // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtReadRouterMemoryRequest() *ApduDataExt { +// NewApduDataExtReadRouterMemoryRequest factory function for ApduDataExtReadRouterMemoryRequest +func NewApduDataExtReadRouterMemoryRequest(length uint8) *ApduDataExt { child := &ApduDataExtReadRouterMemoryRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtReadRouterMemoryRequest) GetTypeName() string { return "ApduDataExtReadRouterMemoryRequest" } -func (m *ApduDataExtReadRouterMemoryRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtReadRouterMemoryRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtReadRouterMemoryRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtReadRouterMemoryRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtReadRouterMemoryRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtReadRouterMemoryRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtReadRouterMemoryRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go index b777584dec7..b752d0b249e 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtReadRouterMemoryResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtReadRouterMemoryResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtReadRouterMemoryResponse) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtReadRouterMemoryResponse() *ApduDataExt { +// NewApduDataExtReadRouterMemoryResponse factory function for ApduDataExtReadRouterMemoryResponse +func NewApduDataExtReadRouterMemoryResponse(length uint8) *ApduDataExt { child := &ApduDataExtReadRouterMemoryResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtReadRouterMemoryResponse) GetTypeName() string { return "ApduDataExtReadRouterMemoryResponse" } -func (m *ApduDataExtReadRouterMemoryResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtReadRouterMemoryResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtReadRouterMemoryResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtReadRouterMemoryResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtReadRouterMemoryResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtReadRouterMemoryResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtReadRouterMemoryResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go index 353a2088453..f6db8ae342a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtReadRouterStatusRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtReadRouterStatusRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtReadRouterStatusRequest) InitializeParent(parent *ApduDataEx // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtReadRouterStatusRequest() *ApduDataExt { +// NewApduDataExtReadRouterStatusRequest factory function for ApduDataExtReadRouterStatusRequest +func NewApduDataExtReadRouterStatusRequest(length uint8) *ApduDataExt { child := &ApduDataExtReadRouterStatusRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtReadRouterStatusRequest) GetTypeName() string { return "ApduDataExtReadRouterStatusRequest" } -func (m *ApduDataExtReadRouterStatusRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtReadRouterStatusRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtReadRouterStatusRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtReadRouterStatusRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtReadRouterStatusRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtReadRouterStatusRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtReadRouterStatusRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go index e64270d238d..2f3a15c8305 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtReadRouterStatusResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtReadRouterStatusResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtReadRouterStatusResponse) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtReadRouterStatusResponse() *ApduDataExt { +// NewApduDataExtReadRouterStatusResponse factory function for ApduDataExtReadRouterStatusResponse +func NewApduDataExtReadRouterStatusResponse(length uint8) *ApduDataExt { child := &ApduDataExtReadRouterStatusResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtReadRouterStatusResponse) GetTypeName() string { return "ApduDataExtReadRouterStatusResponse" } -func (m *ApduDataExtReadRouterStatusResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtReadRouterStatusResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtReadRouterStatusResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtReadRouterStatusResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtReadRouterStatusResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtReadRouterStatusResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtReadRouterStatusResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go index b5b32bd088d..5941f3d881f 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtReadRoutingTableRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtReadRoutingTableRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtReadRoutingTableRequest) InitializeParent(parent *ApduDataEx // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtReadRoutingTableRequest() *ApduDataExt { +// NewApduDataExtReadRoutingTableRequest factory function for ApduDataExtReadRoutingTableRequest +func NewApduDataExtReadRoutingTableRequest(length uint8) *ApduDataExt { child := &ApduDataExtReadRoutingTableRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtReadRoutingTableRequest) GetTypeName() string { return "ApduDataExtReadRoutingTableRequest" } -func (m *ApduDataExtReadRoutingTableRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtReadRoutingTableRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtReadRoutingTableRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtReadRoutingTableRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtReadRoutingTableRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtReadRoutingTableRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtReadRoutingTableRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go index 1d9611ed8f7..312d0bb7909 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtReadRoutingTableResponse struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtReadRoutingTableResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtReadRoutingTableResponse) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtReadRoutingTableResponse() *ApduDataExt { +// NewApduDataExtReadRoutingTableResponse factory function for ApduDataExtReadRoutingTableResponse +func NewApduDataExtReadRoutingTableResponse(length uint8) *ApduDataExt { child := &ApduDataExtReadRoutingTableResponse{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtReadRoutingTableResponse) GetTypeName() string { return "ApduDataExtReadRoutingTableResponse" } -func (m *ApduDataExtReadRoutingTableResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtReadRoutingTableResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtReadRoutingTableResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtReadRoutingTableResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtReadRoutingTableResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtReadRoutingTableResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtReadRoutingTableResponseParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go index eb3074adda5..767d07728b5 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtWriteRouterMemoryRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtWriteRouterMemoryRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtWriteRouterMemoryRequest) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtWriteRouterMemoryRequest() *ApduDataExt { +// NewApduDataExtWriteRouterMemoryRequest factory function for ApduDataExtWriteRouterMemoryRequest +func NewApduDataExtWriteRouterMemoryRequest(length uint8) *ApduDataExt { child := &ApduDataExtWriteRouterMemoryRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtWriteRouterMemoryRequest) GetTypeName() string { return "ApduDataExtWriteRouterMemoryRequest" } -func (m *ApduDataExtWriteRouterMemoryRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtWriteRouterMemoryRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtWriteRouterMemoryRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtWriteRouterMemoryRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtWriteRouterMemoryRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtWriteRouterMemoryRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtWriteRouterMemoryRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go index 221b7873ca9..a8a898c5693 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtWriteRouterStatusRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtWriteRouterStatusRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtWriteRouterStatusRequest) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtWriteRouterStatusRequest() *ApduDataExt { +// NewApduDataExtWriteRouterStatusRequest factory function for ApduDataExtWriteRouterStatusRequest +func NewApduDataExtWriteRouterStatusRequest(length uint8) *ApduDataExt { child := &ApduDataExtWriteRouterStatusRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtWriteRouterStatusRequest) GetTypeName() string { return "ApduDataExtWriteRouterStatusRequest" } -func (m *ApduDataExtWriteRouterStatusRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtWriteRouterStatusRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtWriteRouterStatusRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtWriteRouterStatusRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtWriteRouterStatusRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtWriteRouterStatusRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtWriteRouterStatusRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go index ee6d5a4c930..10a564944f1 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataExtWriteRoutingTableRequest struct { *ApduDataExt + + // Arguments. + Length uint8 } // The corresponding interface type IApduDataExtWriteRoutingTableRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataExtWriteRoutingTableRequest) InitializeParent(parent *ApduDataE // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataExtWriteRoutingTableRequest() *ApduDataExt { +// NewApduDataExtWriteRoutingTableRequest factory function for ApduDataExtWriteRoutingTableRequest +func NewApduDataExtWriteRoutingTableRequest(length uint8) *ApduDataExt { child := &ApduDataExtWriteRoutingTableRequest{ - ApduDataExt: NewApduDataExt(), + ApduDataExt: NewApduDataExt(length), } child.Child = child return child.ApduDataExt @@ -92,18 +96,18 @@ func (m *ApduDataExtWriteRoutingTableRequest) GetTypeName() string { return "ApduDataExtWriteRoutingTableRequest" } -func (m *ApduDataExtWriteRoutingTableRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataExtWriteRoutingTableRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataExtWriteRoutingTableRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataExtWriteRoutingTableRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataExtWriteRoutingTableRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataExtWriteRoutingTableRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataExtWriteRoutingTableRequestParse(readBuffer utils.ReadBuffer, length uint8) (*ApduDataExt, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go index 13928f88a37..ab9387ac3ac 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go @@ -30,14 +30,17 @@ import ( // The data-structure of this message type ApduDataGroupValueRead struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataGroupValueRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,9 +66,10 @@ func (m *ApduDataGroupValueRead) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataGroupValueRead() *ApduData { +// NewApduDataGroupValueRead factory function for ApduDataGroupValueRead +func NewApduDataGroupValueRead(dataLength uint8) *ApduData { child := &ApduDataGroupValueRead{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -94,12 +98,12 @@ func (m *ApduDataGroupValueRead) GetTypeName() string { return "ApduDataGroupValueRead" } -func (m *ApduDataGroupValueRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataGroupValueRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataGroupValueRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataGroupValueRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 6 @@ -107,8 +111,8 @@ func (m *ApduDataGroupValueRead) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *ApduDataGroupValueRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataGroupValueRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataGroupValueReadParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go index 4ee0c0df0f5..c189b8f4c58 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go @@ -31,6 +31,9 @@ type ApduDataGroupValueResponse struct { *ApduData DataFirstByte int8 Data []byte + + // Arguments. + DataLength uint8 } // The corresponding interface @@ -39,10 +42,10 @@ type IApduDataGroupValueResponse interface { GetDataFirstByte() int8 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *ApduDataGroupValueResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataGroupValueResponse(dataFirstByte int8, data []byte) *ApduData { +// NewApduDataGroupValueResponse factory function for ApduDataGroupValueResponse +func NewApduDataGroupValueResponse(dataFirstByte int8, data []byte, dataLength uint8) *ApduData { child := &ApduDataGroupValueResponse{ DataFirstByte: dataFirstByte, Data: data, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -108,12 +112,12 @@ func (m *ApduDataGroupValueResponse) GetTypeName() string { return "ApduDataGroupValueResponse" } -func (m *ApduDataGroupValueResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataGroupValueResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataGroupValueResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataGroupValueResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (dataFirstByte) lengthInBits += 6 @@ -126,8 +130,8 @@ func (m *ApduDataGroupValueResponse) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *ApduDataGroupValueResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataGroupValueResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataGroupValueResponseParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go index 6b3c0bac1b4..465bc7b4847 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go @@ -31,6 +31,9 @@ type ApduDataGroupValueWrite struct { *ApduData DataFirstByte int8 Data []byte + + // Arguments. + DataLength uint8 } // The corresponding interface @@ -39,10 +42,10 @@ type IApduDataGroupValueWrite interface { GetDataFirstByte() int8 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *ApduDataGroupValueWrite) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataGroupValueWrite(dataFirstByte int8, data []byte) *ApduData { +// NewApduDataGroupValueWrite factory function for ApduDataGroupValueWrite +func NewApduDataGroupValueWrite(dataFirstByte int8, data []byte, dataLength uint8) *ApduData { child := &ApduDataGroupValueWrite{ DataFirstByte: dataFirstByte, Data: data, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -108,12 +112,12 @@ func (m *ApduDataGroupValueWrite) GetTypeName() string { return "ApduDataGroupValueWrite" } -func (m *ApduDataGroupValueWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataGroupValueWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataGroupValueWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataGroupValueWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (dataFirstByte) lengthInBits += 6 @@ -126,8 +130,8 @@ func (m *ApduDataGroupValueWrite) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *ApduDataGroupValueWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataGroupValueWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataGroupValueWriteParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go index 46437ddddd9..9dcbfa29855 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataIndividualAddressRead struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataIndividualAddressRead interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataIndividualAddressRead) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataIndividualAddressRead() *ApduData { +// NewApduDataIndividualAddressRead factory function for ApduDataIndividualAddressRead +func NewApduDataIndividualAddressRead(dataLength uint8) *ApduData { child := &ApduDataIndividualAddressRead{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataIndividualAddressRead) GetTypeName() string { return "ApduDataIndividualAddressRead" } -func (m *ApduDataIndividualAddressRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataIndividualAddressRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataIndividualAddressRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataIndividualAddressRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataIndividualAddressRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataIndividualAddressRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataIndividualAddressReadParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go index c0693c2073a..a75675dd862 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataIndividualAddressResponse struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataIndividualAddressResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataIndividualAddressResponse) InitializeParent(parent *ApduData) { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataIndividualAddressResponse() *ApduData { +// NewApduDataIndividualAddressResponse factory function for ApduDataIndividualAddressResponse +func NewApduDataIndividualAddressResponse(dataLength uint8) *ApduData { child := &ApduDataIndividualAddressResponse{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataIndividualAddressResponse) GetTypeName() string { return "ApduDataIndividualAddressResponse" } -func (m *ApduDataIndividualAddressResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataIndividualAddressResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataIndividualAddressResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataIndividualAddressResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataIndividualAddressResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataIndividualAddressResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataIndividualAddressResponseParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go index b0f73b150dc..0abede1c8d1 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataIndividualAddressWrite struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataIndividualAddressWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataIndividualAddressWrite) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataIndividualAddressWrite() *ApduData { +// NewApduDataIndividualAddressWrite factory function for ApduDataIndividualAddressWrite +func NewApduDataIndividualAddressWrite(dataLength uint8) *ApduData { child := &ApduDataIndividualAddressWrite{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataIndividualAddressWrite) GetTypeName() string { return "ApduDataIndividualAddressWrite" } -func (m *ApduDataIndividualAddressWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataIndividualAddressWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataIndividualAddressWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataIndividualAddressWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataIndividualAddressWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataIndividualAddressWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataIndividualAddressWriteParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go index b1edeb02912..b5a1646865c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go @@ -31,6 +31,9 @@ type ApduDataMemoryRead struct { *ApduData NumBytes uint8 Address uint16 + + // Arguments. + DataLength uint8 } // The corresponding interface @@ -39,10 +42,10 @@ type IApduDataMemoryRead interface { GetNumBytes() uint8 // GetAddress returns Address GetAddress() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *ApduDataMemoryRead) GetAddress() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataMemoryRead(numBytes uint8, address uint16) *ApduData { +// NewApduDataMemoryRead factory function for ApduDataMemoryRead +func NewApduDataMemoryRead(numBytes uint8, address uint16, dataLength uint8) *ApduData { child := &ApduDataMemoryRead{ NumBytes: numBytes, Address: address, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -108,12 +112,12 @@ func (m *ApduDataMemoryRead) GetTypeName() string { return "ApduDataMemoryRead" } -func (m *ApduDataMemoryRead) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataMemoryRead) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataMemoryRead) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataMemoryRead) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numBytes) lengthInBits += 6 @@ -124,8 +128,8 @@ func (m *ApduDataMemoryRead) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *ApduDataMemoryRead) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataMemoryRead) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataMemoryReadParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go index 6f480271230..6f1abf663b9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go @@ -31,6 +31,9 @@ type ApduDataMemoryResponse struct { *ApduData Address uint16 Data []byte + + // Arguments. + DataLength uint8 } // The corresponding interface @@ -39,10 +42,10 @@ type IApduDataMemoryResponse interface { GetAddress() uint16 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,11 +78,12 @@ func (m *ApduDataMemoryResponse) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataMemoryResponse(address uint16, data []byte) *ApduData { +// NewApduDataMemoryResponse factory function for ApduDataMemoryResponse +func NewApduDataMemoryResponse(address uint16, data []byte, dataLength uint8) *ApduData { child := &ApduDataMemoryResponse{ Address: address, Data: data, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -108,12 +112,12 @@ func (m *ApduDataMemoryResponse) GetTypeName() string { return "ApduDataMemoryResponse" } -func (m *ApduDataMemoryResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataMemoryResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataMemoryResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataMemoryResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (numBytes) lengthInBits += 6 @@ -129,8 +133,8 @@ func (m *ApduDataMemoryResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *ApduDataMemoryResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataMemoryResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataMemoryResponseParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { @@ -179,7 +183,7 @@ func (m *ApduDataMemoryResponse) Serialize(writeBuffer utils.WriteBuffer) error } // Implicit Field (numBytes) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - numBytes := uint8(uint8(len(m.Data))) + numBytes := uint8(uint8(len(m.GetData()))) _numBytesErr := writeBuffer.WriteUint8("numBytes", 6, (numBytes)) if _numBytesErr != nil { return errors.Wrap(_numBytesErr, "Error serializing 'numBytes' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go index e041f996099..f8fe0535590 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataMemoryWrite struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataMemoryWrite interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataMemoryWrite) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataMemoryWrite() *ApduData { +// NewApduDataMemoryWrite factory function for ApduDataMemoryWrite +func NewApduDataMemoryWrite(dataLength uint8) *ApduData { child := &ApduDataMemoryWrite{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataMemoryWrite) GetTypeName() string { return "ApduDataMemoryWrite" } -func (m *ApduDataMemoryWrite) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataMemoryWrite) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataMemoryWrite) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataMemoryWrite) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataMemoryWrite) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataMemoryWrite) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataMemoryWriteParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go index a32830533df..8215e8c5b49 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go @@ -30,16 +30,19 @@ import ( type ApduDataOther struct { *ApduData ExtendedApdu *ApduDataExt + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataOther interface { // GetExtendedApdu returns ExtendedApdu GetExtendedApdu() *ApduDataExt - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *ApduDataOther) GetExtendedApdu() *ApduDataExt { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataOther(extendedApdu *ApduDataExt) *ApduData { +// NewApduDataOther factory function for ApduDataOther +func NewApduDataOther(extendedApdu *ApduDataExt, dataLength uint8) *ApduData { child := &ApduDataOther{ ExtendedApdu: extendedApdu, - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -100,21 +104,21 @@ func (m *ApduDataOther) GetTypeName() string { return "ApduDataOther" } -func (m *ApduDataOther) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataOther) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataOther) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataOther) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (extendedApdu) - lengthInBits += m.ExtendedApdu.LengthInBits() + lengthInBits += m.ExtendedApdu.GetLengthInBits() return lengthInBits } -func (m *ApduDataOther) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataOther) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataOtherParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go index e4fc499fa9a..4165d9044bd 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataRestart struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataRestart interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataRestart) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataRestart() *ApduData { +// NewApduDataRestart factory function for ApduDataRestart +func NewApduDataRestart(dataLength uint8) *ApduData { child := &ApduDataRestart{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataRestart) GetTypeName() string { return "ApduDataRestart" } -func (m *ApduDataRestart) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataRestart) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataRestart) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataRestart) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataRestart) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataRestart) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataRestartParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go index 3c66e026368..4359fee4fd2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type ApduDataUserMessage struct { *ApduData + + // Arguments. + DataLength uint8 } // The corresponding interface type IApduDataUserMessage interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *ApduDataUserMessage) InitializeParent(parent *ApduData) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewApduDataUserMessage() *ApduData { +// NewApduDataUserMessage factory function for ApduDataUserMessage +func NewApduDataUserMessage(dataLength uint8) *ApduData { child := &ApduDataUserMessage{ - ApduData: NewApduData(), + ApduData: NewApduData(dataLength), } child.Child = child return child.ApduData @@ -92,18 +96,18 @@ func (m *ApduDataUserMessage) GetTypeName() string { return "ApduDataUserMessage" } -func (m *ApduDataUserMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ApduDataUserMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ApduDataUserMessage) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ApduDataUserMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ApduDataUserMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ApduDataUserMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ApduDataUserMessageParse(readBuffer utils.ReadBuffer, dataLength uint8) (*ApduData, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go index bdbc4451d18..47e132c9324 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go @@ -28,6 +28,9 @@ import ( // The data-structure of this message type CEMI struct { + + // Arguments. + Size uint16 Child ICEMIChild } @@ -35,10 +38,10 @@ type CEMI struct { type ICEMI interface { // MessageCode returns MessageCode MessageCode() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type ICEMIChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCEMI() *CEMI { - return &CEMI{} +// NewCEMI factory function for CEMI +func NewCEMI(size uint16) *CEMI { + return &CEMI{Size: size} } func CastCEMI(structType interface{}) *CEMI { @@ -84,15 +88,15 @@ func (m *CEMI) GetTypeName() string { return "CEMI" } -func (m *CEMI) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CEMI) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CEMI) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *CEMI) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *CEMI) ParentLengthInBits() uint16 { +func (m *CEMI) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (messageCode) lengthInBits += 8 @@ -100,8 +104,8 @@ func (m *CEMI) ParentLengthInBits() uint16 { return lengthInBits } -func (m *CEMI) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CEMI) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CEMIParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go index bc7e417c3ef..76777717aa9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go @@ -35,10 +35,10 @@ type CEMIAdditionalInformation struct { type ICEMIAdditionalInformation interface { // AdditionalInformationType returns AdditionalInformationType AdditionalInformationType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type ICEMIAdditionalInformationChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCEMIAdditionalInformation factory function for CEMIAdditionalInformation func NewCEMIAdditionalInformation() *CEMIAdditionalInformation { return &CEMIAdditionalInformation{} } @@ -84,15 +85,15 @@ func (m *CEMIAdditionalInformation) GetTypeName() string { return "CEMIAdditionalInformation" } -func (m *CEMIAdditionalInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CEMIAdditionalInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CEMIAdditionalInformation) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *CEMIAdditionalInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *CEMIAdditionalInformation) ParentLengthInBits() uint16 { +func (m *CEMIAdditionalInformation) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (additionalInformationType) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *CEMIAdditionalInformation) ParentLengthInBits() uint16 { return lengthInBits } -func (m *CEMIAdditionalInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CEMIAdditionalInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CEMIAdditionalInformationParse(readBuffer utils.ReadBuffer) (*CEMIAdditionalInformation, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go index f919606f2cd..9bd5dc57e53 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go @@ -55,10 +55,10 @@ type ICEMIAdditionalInformationBusmonitorInfo interface { GetLostFlag() bool // GetSequenceNumber returns SequenceNumber GetSequenceNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -108,6 +108,7 @@ func (m *CEMIAdditionalInformationBusmonitorInfo) GetSequenceNumber() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCEMIAdditionalInformationBusmonitorInfo factory function for CEMIAdditionalInformationBusmonitorInfo func NewCEMIAdditionalInformationBusmonitorInfo(frameErrorFlag bool, bitErrorFlag bool, parityErrorFlag bool, unknownFlag bool, lostFlag bool, sequenceNumber uint8) *CEMIAdditionalInformation { child := &CEMIAdditionalInformationBusmonitorInfo{ FrameErrorFlag: frameErrorFlag, @@ -145,12 +146,12 @@ func (m *CEMIAdditionalInformationBusmonitorInfo) GetTypeName() string { return "CEMIAdditionalInformationBusmonitorInfo" } -func (m *CEMIAdditionalInformationBusmonitorInfo) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CEMIAdditionalInformationBusmonitorInfo) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CEMIAdditionalInformationBusmonitorInfo) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CEMIAdditionalInformationBusmonitorInfo) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (len) lengthInBits += 8 @@ -176,8 +177,8 @@ func (m *CEMIAdditionalInformationBusmonitorInfo) LengthInBitsConditional(lastIt return lengthInBits } -func (m *CEMIAdditionalInformationBusmonitorInfo) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CEMIAdditionalInformationBusmonitorInfo) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CEMIAdditionalInformationBusmonitorInfoParse(readBuffer utils.ReadBuffer) (*CEMIAdditionalInformation, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go index c6cea03943a..a68dd759ed5 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go @@ -40,10 +40,10 @@ type CEMIAdditionalInformationRelativeTimestamp struct { type ICEMIAdditionalInformationRelativeTimestamp interface { // GetRelativeTimestamp returns RelativeTimestamp GetRelativeTimestamp() *RelativeTimestamp - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -73,6 +73,7 @@ func (m *CEMIAdditionalInformationRelativeTimestamp) GetRelativeTimestamp() *Rel // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewCEMIAdditionalInformationRelativeTimestamp factory function for CEMIAdditionalInformationRelativeTimestamp func NewCEMIAdditionalInformationRelativeTimestamp(relativeTimestamp *RelativeTimestamp) *CEMIAdditionalInformation { child := &CEMIAdditionalInformationRelativeTimestamp{ RelativeTimestamp: relativeTimestamp, @@ -105,24 +106,24 @@ func (m *CEMIAdditionalInformationRelativeTimestamp) GetTypeName() string { return "CEMIAdditionalInformationRelativeTimestamp" } -func (m *CEMIAdditionalInformationRelativeTimestamp) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *CEMIAdditionalInformationRelativeTimestamp) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *CEMIAdditionalInformationRelativeTimestamp) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *CEMIAdditionalInformationRelativeTimestamp) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (len) lengthInBits += 8 // Simple field (relativeTimestamp) - lengthInBits += m.RelativeTimestamp.LengthInBits() + lengthInBits += m.RelativeTimestamp.GetLengthInBits() return lengthInBits } -func (m *CEMIAdditionalInformationRelativeTimestamp) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *CEMIAdditionalInformationRelativeTimestamp) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CEMIAdditionalInformationRelativeTimestampParse(readBuffer utils.ReadBuffer) (*CEMIAdditionalInformation, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPriority.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPriority.go index b1fc0870f1f..d8b11a881d3 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPriority.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPriority.go @@ -98,12 +98,12 @@ func CastCEMIPriority(structType interface{}) CEMIPriority { return castFunc(structType) } -func (m CEMIPriority) LengthInBits() uint16 { +func (m CEMIPriority) GetLengthInBits() uint16 { return 2 } -func (m CEMIPriority) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m CEMIPriority) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CEMIPriorityParse(readBuffer utils.ReadBuffer) (CEMIPriority, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go index 229618883b0..2884774ece6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go @@ -38,10 +38,10 @@ type IChannelInformation interface { GetNumChannels() uint8 // GetChannelCode returns ChannelCode GetChannelCode() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ChannelInformation) GetChannelCode() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewChannelInformation factory function for ChannelInformation func NewChannelInformation(numChannels uint8, channelCode uint16) *ChannelInformation { return &ChannelInformation{NumChannels: numChannels, ChannelCode: channelCode} } @@ -82,11 +83,11 @@ func (m *ChannelInformation) GetTypeName() string { return "ChannelInformation" } -func (m *ChannelInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ChannelInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ChannelInformation) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ChannelInformation) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (numChannels) @@ -98,8 +99,8 @@ func (m *ChannelInformation) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *ChannelInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ChannelInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ChannelInformationParse(readBuffer utils.ReadBuffer) (*ChannelInformation, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go index 0bfb5338dd5..24976507b77 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go @@ -35,10 +35,10 @@ type ComObjectTable struct { type IComObjectTable interface { // FirmwareType returns FirmwareType FirmwareType() FirmwareType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IComObjectTableChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewComObjectTable factory function for ComObjectTable func NewComObjectTable() *ComObjectTable { return &ComObjectTable{} } @@ -84,22 +85,22 @@ func (m *ComObjectTable) GetTypeName() string { return "ComObjectTable" } -func (m *ComObjectTable) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ComObjectTable) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ComObjectTable) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ComObjectTable) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ComObjectTable) ParentLengthInBits() uint16 { +func (m *ComObjectTable) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) return lengthInBits } -func (m *ComObjectTable) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ComObjectTable) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ComObjectTableParse(readBuffer utils.ReadBuffer, firmwareType FirmwareType) (*ComObjectTable, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableAddresses.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableAddresses.go index b657cfb9867..a6885fbb313 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableAddresses.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableAddresses.go @@ -18522,12 +18522,12 @@ func CastComObjectTableAddresses(structType interface{}) ComObjectTableAddresses return castFunc(structType) } -func (m ComObjectTableAddresses) LengthInBits() uint16 { +func (m ComObjectTableAddresses) GetLengthInBits() uint16 { return 16 } -func (m ComObjectTableAddresses) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ComObjectTableAddresses) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ComObjectTableAddressesParse(readBuffer utils.ReadBuffer) (ComObjectTableAddresses, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go index 09c65dcf6b4..85c7ceb1035 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go @@ -42,10 +42,10 @@ type IComObjectTableRealisationType1 interface { GetRamFlagsTablePointer() uint8 // GetComObjectDescriptors returns ComObjectDescriptors GetComObjectDescriptors() []*GroupObjectDescriptorRealisationType1 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *ComObjectTableRealisationType1) GetComObjectDescriptors() []*GroupObjec // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewComObjectTableRealisationType1 factory function for ComObjectTableRealisationType1 func NewComObjectTableRealisationType1(numEntries uint8, ramFlagsTablePointer uint8, comObjectDescriptors []*GroupObjectDescriptorRealisationType1) *ComObjectTable { child := &ComObjectTableRealisationType1{ NumEntries: numEntries, @@ -116,12 +117,12 @@ func (m *ComObjectTableRealisationType1) GetTypeName() string { return "ComObjectTableRealisationType1" } -func (m *ComObjectTableRealisationType1) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ComObjectTableRealisationType1) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ComObjectTableRealisationType1) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ComObjectTableRealisationType1) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numEntries) lengthInBits += 8 @@ -133,15 +134,15 @@ func (m *ComObjectTableRealisationType1) LengthInBitsConditional(lastItem bool) if len(m.ComObjectDescriptors) > 0 { for i, element := range m.ComObjectDescriptors { last := i == len(m.ComObjectDescriptors)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *ComObjectTableRealisationType1) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ComObjectTableRealisationType1) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ComObjectTableRealisationType1Parse(readBuffer utils.ReadBuffer, firmwareType FirmwareType) (*ComObjectTable, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go index 3ac54e2a504..cba0aa662b3 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go @@ -42,10 +42,10 @@ type IComObjectTableRealisationType2 interface { GetRamFlagsTablePointer() uint8 // GetComObjectDescriptors returns ComObjectDescriptors GetComObjectDescriptors() []*GroupObjectDescriptorRealisationType2 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *ComObjectTableRealisationType2) GetComObjectDescriptors() []*GroupObjec // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewComObjectTableRealisationType2 factory function for ComObjectTableRealisationType2 func NewComObjectTableRealisationType2(numEntries uint8, ramFlagsTablePointer uint8, comObjectDescriptors []*GroupObjectDescriptorRealisationType2) *ComObjectTable { child := &ComObjectTableRealisationType2{ NumEntries: numEntries, @@ -116,12 +117,12 @@ func (m *ComObjectTableRealisationType2) GetTypeName() string { return "ComObjectTableRealisationType2" } -func (m *ComObjectTableRealisationType2) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ComObjectTableRealisationType2) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ComObjectTableRealisationType2) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ComObjectTableRealisationType2) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numEntries) lengthInBits += 8 @@ -133,15 +134,15 @@ func (m *ComObjectTableRealisationType2) LengthInBitsConditional(lastItem bool) if len(m.ComObjectDescriptors) > 0 { for i, element := range m.ComObjectDescriptors { last := i == len(m.ComObjectDescriptors)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *ComObjectTableRealisationType2) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ComObjectTableRealisationType2) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ComObjectTableRealisationType2Parse(readBuffer utils.ReadBuffer, firmwareType FirmwareType) (*ComObjectTable, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go index d0fc9995585..9629b9c7c5b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go @@ -36,10 +36,10 @@ type ComObjectTableRealisationType6 struct { type IComObjectTableRealisationType6 interface { // GetComObjectDescriptors returns ComObjectDescriptors GetComObjectDescriptors() *GroupObjectDescriptorRealisationType6 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *ComObjectTableRealisationType6) GetComObjectDescriptors() *GroupObjectD // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewComObjectTableRealisationType6 factory function for ComObjectTableRealisationType6 func NewComObjectTableRealisationType6(comObjectDescriptors *GroupObjectDescriptorRealisationType6) *ComObjectTable { child := &ComObjectTableRealisationType6{ ComObjectDescriptors: comObjectDescriptors, @@ -100,21 +101,21 @@ func (m *ComObjectTableRealisationType6) GetTypeName() string { return "ComObjectTableRealisationType6" } -func (m *ComObjectTableRealisationType6) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ComObjectTableRealisationType6) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ComObjectTableRealisationType6) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ComObjectTableRealisationType6) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (comObjectDescriptors) - lengthInBits += m.ComObjectDescriptors.LengthInBits() + lengthInBits += m.ComObjectDescriptors.GetLengthInBits() return lengthInBits } -func (m *ComObjectTableRealisationType6) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ComObjectTableRealisationType6) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ComObjectTableRealisationType6Parse(readBuffer utils.ReadBuffer, firmwareType FirmwareType) (*ComObjectTable, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectValueType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectValueType.go index 140db5786e7..ff5760daee0 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectValueType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectValueType.go @@ -242,12 +242,12 @@ func CastComObjectValueType(structType interface{}) ComObjectValueType { return castFunc(structType) } -func (m ComObjectValueType) LengthInBits() uint16 { +func (m ComObjectValueType) GetLengthInBits() uint16 { return 8 } -func (m ComObjectValueType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ComObjectValueType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ComObjectValueTypeParse(readBuffer utils.ReadBuffer) (ComObjectValueType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go index 44b10f8413f..5e69b3416cf 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go @@ -42,10 +42,10 @@ type IConnectionRequest interface { GetHpaiDataEndpoint() *HPAIDataEndpoint // GetConnectionRequestInformation returns ConnectionRequestInformation GetConnectionRequestInformation() *ConnectionRequestInformation - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *ConnectionRequest) GetConnectionRequestInformation() *ConnectionRequest // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionRequest factory function for ConnectionRequest func NewConnectionRequest(hpaiDiscoveryEndpoint *HPAIDiscoveryEndpoint, hpaiDataEndpoint *HPAIDataEndpoint, connectionRequestInformation *ConnectionRequestInformation) *KnxNetIpMessage { child := &ConnectionRequest{ HpaiDiscoveryEndpoint: hpaiDiscoveryEndpoint, @@ -116,27 +117,27 @@ func (m *ConnectionRequest) GetTypeName() string { return "ConnectionRequest" } -func (m *ConnectionRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (hpaiDiscoveryEndpoint) - lengthInBits += m.HpaiDiscoveryEndpoint.LengthInBits() + lengthInBits += m.HpaiDiscoveryEndpoint.GetLengthInBits() // Simple field (hpaiDataEndpoint) - lengthInBits += m.HpaiDataEndpoint.LengthInBits() + lengthInBits += m.HpaiDataEndpoint.GetLengthInBits() // Simple field (connectionRequestInformation) - lengthInBits += m.ConnectionRequestInformation.LengthInBits() + lengthInBits += m.ConnectionRequestInformation.GetLengthInBits() return lengthInBits } -func (m *ConnectionRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionRequestParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go index 211dbdec322..b66931338cb 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go @@ -35,10 +35,10 @@ type ConnectionRequestInformation struct { type IConnectionRequestInformation interface { // ConnectionType returns ConnectionType ConnectionType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IConnectionRequestInformationChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionRequestInformation factory function for ConnectionRequestInformation func NewConnectionRequestInformation() *ConnectionRequestInformation { return &ConnectionRequestInformation{} } @@ -84,15 +85,15 @@ func (m *ConnectionRequestInformation) GetTypeName() string { return "ConnectionRequestInformation" } -func (m *ConnectionRequestInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionRequestInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionRequestInformation) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ConnectionRequestInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ConnectionRequestInformation) ParentLengthInBits() uint16 { +func (m *ConnectionRequestInformation) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -103,8 +104,8 @@ func (m *ConnectionRequestInformation) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ConnectionRequestInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionRequestInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionRequestInformationParse(readBuffer utils.ReadBuffer) (*ConnectionRequestInformation, error) { @@ -160,7 +161,7 @@ func (m *ConnectionRequestInformation) SerializeParent(writeBuffer utils.WriteBu } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go index 3a895873ec8..2ab4f05844c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go @@ -32,10 +32,10 @@ type ConnectionRequestInformationDeviceManagement struct { // The corresponding interface type IConnectionRequestInformationDeviceManagement interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *ConnectionRequestInformationDeviceManagement) InitializeParent(parent * // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionRequestInformationDeviceManagement factory function for ConnectionRequestInformationDeviceManagement func NewConnectionRequestInformationDeviceManagement() *ConnectionRequestInformation { child := &ConnectionRequestInformationDeviceManagement{ ConnectionRequestInformation: NewConnectionRequestInformation(), @@ -93,18 +94,18 @@ func (m *ConnectionRequestInformationDeviceManagement) GetTypeName() string { return "ConnectionRequestInformationDeviceManagement" } -func (m *ConnectionRequestInformationDeviceManagement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionRequestInformationDeviceManagement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionRequestInformationDeviceManagement) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionRequestInformationDeviceManagement) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ConnectionRequestInformationDeviceManagement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionRequestInformationDeviceManagement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionRequestInformationDeviceManagementParse(readBuffer utils.ReadBuffer) (*ConnectionRequestInformation, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go index 262614ad58b..cf3c3c94e57 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go @@ -37,10 +37,10 @@ type ConnectionRequestInformationTunnelConnection struct { type IConnectionRequestInformationTunnelConnection interface { // GetKnxLayer returns KnxLayer GetKnxLayer() KnxLayer - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -70,6 +70,7 @@ func (m *ConnectionRequestInformationTunnelConnection) GetKnxLayer() KnxLayer { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionRequestInformationTunnelConnection factory function for ConnectionRequestInformationTunnelConnection func NewConnectionRequestInformationTunnelConnection(knxLayer KnxLayer) *ConnectionRequestInformation { child := &ConnectionRequestInformationTunnelConnection{ KnxLayer: knxLayer, @@ -102,12 +103,12 @@ func (m *ConnectionRequestInformationTunnelConnection) GetTypeName() string { return "ConnectionRequestInformationTunnelConnection" } -func (m *ConnectionRequestInformationTunnelConnection) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionRequestInformationTunnelConnection) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionRequestInformationTunnelConnection) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionRequestInformationTunnelConnection) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (knxLayer) lengthInBits += 8 @@ -118,8 +119,8 @@ func (m *ConnectionRequestInformationTunnelConnection) LengthInBitsConditional(l return lengthInBits } -func (m *ConnectionRequestInformationTunnelConnection) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionRequestInformationTunnelConnection) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionRequestInformationTunnelConnectionParse(readBuffer utils.ReadBuffer) (*ConnectionRequestInformation, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go index be8f69fc9eb..0c82996241e 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go @@ -46,10 +46,10 @@ type IConnectionResponse interface { GetHpaiDataEndpoint() *HPAIDataEndpoint // GetConnectionResponseDataBlock returns ConnectionResponseDataBlock GetConnectionResponseDataBlock() *ConnectionResponseDataBlock - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -90,6 +90,7 @@ func (m *ConnectionResponse) GetConnectionResponseDataBlock() *ConnectionRespons // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionResponse factory function for ConnectionResponse func NewConnectionResponse(communicationChannelId uint8, status Status, hpaiDataEndpoint *HPAIDataEndpoint, connectionResponseDataBlock *ConnectionResponseDataBlock) *KnxNetIpMessage { child := &ConnectionResponse{ CommunicationChannelId: communicationChannelId, @@ -125,12 +126,12 @@ func (m *ConnectionResponse) GetTypeName() string { return "ConnectionResponse" } -func (m *ConnectionResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (communicationChannelId) lengthInBits += 8 @@ -140,19 +141,19 @@ func (m *ConnectionResponse) LengthInBitsConditional(lastItem bool) uint16 { // Optional Field (hpaiDataEndpoint) if m.HpaiDataEndpoint != nil { - lengthInBits += (*m.HpaiDataEndpoint).LengthInBits() + lengthInBits += (*m.HpaiDataEndpoint).GetLengthInBits() } // Optional Field (connectionResponseDataBlock) if m.ConnectionResponseDataBlock != nil { - lengthInBits += (*m.ConnectionResponseDataBlock).LengthInBits() + lengthInBits += (*m.ConnectionResponseDataBlock).GetLengthInBits() } return lengthInBits } -func (m *ConnectionResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionResponseParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go index 262f57ec548..8c7191047c4 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go @@ -35,10 +35,10 @@ type ConnectionResponseDataBlock struct { type IConnectionResponseDataBlock interface { // ConnectionType returns ConnectionType ConnectionType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IConnectionResponseDataBlockChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionResponseDataBlock factory function for ConnectionResponseDataBlock func NewConnectionResponseDataBlock() *ConnectionResponseDataBlock { return &ConnectionResponseDataBlock{} } @@ -84,15 +85,15 @@ func (m *ConnectionResponseDataBlock) GetTypeName() string { return "ConnectionResponseDataBlock" } -func (m *ConnectionResponseDataBlock) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionResponseDataBlock) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionResponseDataBlock) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ConnectionResponseDataBlock) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ConnectionResponseDataBlock) ParentLengthInBits() uint16 { +func (m *ConnectionResponseDataBlock) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -103,8 +104,8 @@ func (m *ConnectionResponseDataBlock) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ConnectionResponseDataBlock) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionResponseDataBlock) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionResponseDataBlockParse(readBuffer utils.ReadBuffer) (*ConnectionResponseDataBlock, error) { @@ -160,7 +161,7 @@ func (m *ConnectionResponseDataBlock) SerializeParent(writeBuffer utils.WriteBuf } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go index 67d5c782672..65c8bd2e70b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go @@ -32,10 +32,10 @@ type ConnectionResponseDataBlockDeviceManagement struct { // The corresponding interface type IConnectionResponseDataBlockDeviceManagement interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *ConnectionResponseDataBlockDeviceManagement) InitializeParent(parent *C // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionResponseDataBlockDeviceManagement factory function for ConnectionResponseDataBlockDeviceManagement func NewConnectionResponseDataBlockDeviceManagement() *ConnectionResponseDataBlock { child := &ConnectionResponseDataBlockDeviceManagement{ ConnectionResponseDataBlock: NewConnectionResponseDataBlock(), @@ -93,18 +94,18 @@ func (m *ConnectionResponseDataBlockDeviceManagement) GetTypeName() string { return "ConnectionResponseDataBlockDeviceManagement" } -func (m *ConnectionResponseDataBlockDeviceManagement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionResponseDataBlockDeviceManagement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionResponseDataBlockDeviceManagement) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionResponseDataBlockDeviceManagement) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ConnectionResponseDataBlockDeviceManagement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionResponseDataBlockDeviceManagement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionResponseDataBlockDeviceManagementParse(readBuffer utils.ReadBuffer) (*ConnectionResponseDataBlock, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go index 8c39f853c4f..4ef15f225da 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go @@ -36,10 +36,10 @@ type ConnectionResponseDataBlockTunnelConnection struct { type IConnectionResponseDataBlockTunnelConnection interface { // GetKnxAddress returns KnxAddress GetKnxAddress() *KnxAddress - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *ConnectionResponseDataBlockTunnelConnection) GetKnxAddress() *KnxAddres // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionResponseDataBlockTunnelConnection factory function for ConnectionResponseDataBlockTunnelConnection func NewConnectionResponseDataBlockTunnelConnection(knxAddress *KnxAddress) *ConnectionResponseDataBlock { child := &ConnectionResponseDataBlockTunnelConnection{ KnxAddress: knxAddress, @@ -101,21 +102,21 @@ func (m *ConnectionResponseDataBlockTunnelConnection) GetTypeName() string { return "ConnectionResponseDataBlockTunnelConnection" } -func (m *ConnectionResponseDataBlockTunnelConnection) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionResponseDataBlockTunnelConnection) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionResponseDataBlockTunnelConnection) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionResponseDataBlockTunnelConnection) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (knxAddress) - lengthInBits += m.KnxAddress.LengthInBits() + lengthInBits += m.KnxAddress.GetLengthInBits() return lengthInBits } -func (m *ConnectionResponseDataBlockTunnelConnection) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionResponseDataBlockTunnelConnection) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionResponseDataBlockTunnelConnectionParse(readBuffer utils.ReadBuffer) (*ConnectionResponseDataBlock, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go index 9df4d2ca61e..80ae6cc3c2c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go @@ -40,10 +40,10 @@ type IConnectionStateRequest interface { GetCommunicationChannelId() uint8 // GetHpaiControlEndpoint returns HpaiControlEndpoint GetHpaiControlEndpoint() *HPAIControlEndpoint - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *ConnectionStateRequest) GetHpaiControlEndpoint() *HPAIControlEndpoint { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionStateRequest factory function for ConnectionStateRequest func NewConnectionStateRequest(communicationChannelId uint8, hpaiControlEndpoint *HPAIControlEndpoint) *KnxNetIpMessage { child := &ConnectionStateRequest{ CommunicationChannelId: communicationChannelId, @@ -109,12 +110,12 @@ func (m *ConnectionStateRequest) GetTypeName() string { return "ConnectionStateRequest" } -func (m *ConnectionStateRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionStateRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionStateRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionStateRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (communicationChannelId) lengthInBits += 8 @@ -123,13 +124,13 @@ func (m *ConnectionStateRequest) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (hpaiControlEndpoint) - lengthInBits += m.HpaiControlEndpoint.LengthInBits() + lengthInBits += m.HpaiControlEndpoint.GetLengthInBits() return lengthInBits } -func (m *ConnectionStateRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionStateRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionStateRequestParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go index 77451f0260e..0405df26350 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go @@ -39,10 +39,10 @@ type IConnectionStateResponse interface { GetCommunicationChannelId() uint8 // GetStatus returns Status GetStatus() Status - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *ConnectionStateResponse) GetStatus() Status { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewConnectionStateResponse factory function for ConnectionStateResponse func NewConnectionStateResponse(communicationChannelId uint8, status Status) *KnxNetIpMessage { child := &ConnectionStateResponse{ CommunicationChannelId: communicationChannelId, @@ -108,12 +109,12 @@ func (m *ConnectionStateResponse) GetTypeName() string { return "ConnectionStateResponse" } -func (m *ConnectionStateResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ConnectionStateResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ConnectionStateResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ConnectionStateResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (communicationChannelId) lengthInBits += 8 @@ -124,8 +125,8 @@ func (m *ConnectionStateResponse) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *ConnectionStateResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ConnectionStateResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ConnectionStateResponseParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go index 6215f213c63..8b9b705089c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go @@ -59,10 +59,10 @@ type IDIBDeviceInfo interface { GetKnxNetIpDeviceMacAddress() *MACAddress // GetDeviceFriendlyName returns DeviceFriendlyName GetDeviceFriendlyName() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -110,6 +110,7 @@ func (m *DIBDeviceInfo) GetDeviceFriendlyName() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDIBDeviceInfo factory function for DIBDeviceInfo func NewDIBDeviceInfo(descriptionType uint8, knxMedium KnxMedium, deviceStatus *DeviceStatus, knxAddress *KnxAddress, projectInstallationIdentifier *ProjectInstallationIdentifier, knxNetIpDeviceSerialNumber []byte, knxNetIpDeviceMulticastAddress *IPAddress, knxNetIpDeviceMacAddress *MACAddress, deviceFriendlyName []byte) *DIBDeviceInfo { return &DIBDeviceInfo{DescriptionType: descriptionType, KnxMedium: knxMedium, DeviceStatus: deviceStatus, KnxAddress: knxAddress, ProjectInstallationIdentifier: projectInstallationIdentifier, KnxNetIpDeviceSerialNumber: knxNetIpDeviceSerialNumber, KnxNetIpDeviceMulticastAddress: knxNetIpDeviceMulticastAddress, KnxNetIpDeviceMacAddress: knxNetIpDeviceMacAddress, DeviceFriendlyName: deviceFriendlyName} } @@ -131,11 +132,11 @@ func (m *DIBDeviceInfo) GetTypeName() string { return "DIBDeviceInfo" } -func (m *DIBDeviceInfo) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DIBDeviceInfo) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DIBDeviceInfo) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DIBDeviceInfo) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -148,13 +149,13 @@ func (m *DIBDeviceInfo) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (deviceStatus) - lengthInBits += m.DeviceStatus.LengthInBits() + lengthInBits += m.DeviceStatus.GetLengthInBits() // Simple field (knxAddress) - lengthInBits += m.KnxAddress.LengthInBits() + lengthInBits += m.KnxAddress.GetLengthInBits() // Simple field (projectInstallationIdentifier) - lengthInBits += m.ProjectInstallationIdentifier.LengthInBits() + lengthInBits += m.ProjectInstallationIdentifier.GetLengthInBits() // Array field if len(m.KnxNetIpDeviceSerialNumber) > 0 { @@ -162,10 +163,10 @@ func (m *DIBDeviceInfo) LengthInBitsConditional(lastItem bool) uint16 { } // Simple field (knxNetIpDeviceMulticastAddress) - lengthInBits += m.KnxNetIpDeviceMulticastAddress.LengthInBits() + lengthInBits += m.KnxNetIpDeviceMulticastAddress.GetLengthInBits() // Simple field (knxNetIpDeviceMacAddress) - lengthInBits += m.KnxNetIpDeviceMacAddress.LengthInBits() + lengthInBits += m.KnxNetIpDeviceMacAddress.GetLengthInBits() // Array field if len(m.DeviceFriendlyName) > 0 { @@ -175,8 +176,8 @@ func (m *DIBDeviceInfo) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *DIBDeviceInfo) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DIBDeviceInfo) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DIBDeviceInfoParse(readBuffer utils.ReadBuffer) (*DIBDeviceInfo, error) { @@ -302,7 +303,7 @@ func (m *DIBDeviceInfo) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go index 5a30693b825..3ac4c33b3c9 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go @@ -38,10 +38,10 @@ type IDIBSuppSvcFamilies interface { GetDescriptionType() uint8 // GetServiceIds returns ServiceIds GetServiceIds() []*ServiceId - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *DIBSuppSvcFamilies) GetServiceIds() []*ServiceId { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDIBSuppSvcFamilies factory function for DIBSuppSvcFamilies func NewDIBSuppSvcFamilies(descriptionType uint8, serviceIds []*ServiceId) *DIBSuppSvcFamilies { return &DIBSuppSvcFamilies{DescriptionType: descriptionType, ServiceIds: serviceIds} } @@ -82,11 +83,11 @@ func (m *DIBSuppSvcFamilies) GetTypeName() string { return "DIBSuppSvcFamilies" } -func (m *DIBSuppSvcFamilies) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DIBSuppSvcFamilies) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DIBSuppSvcFamilies) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DIBSuppSvcFamilies) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -98,15 +99,15 @@ func (m *DIBSuppSvcFamilies) LengthInBitsConditional(lastItem bool) uint16 { // Array field if len(m.ServiceIds) > 0 { for _, element := range m.ServiceIds { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *DIBSuppSvcFamilies) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DIBSuppSvcFamilies) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DIBSuppSvcFamiliesParse(readBuffer utils.ReadBuffer) (*DIBSuppSvcFamilies, error) { @@ -163,7 +164,7 @@ func (m *DIBSuppSvcFamilies) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go index 19a7a8c7233..2737fc35ace 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go @@ -36,10 +36,10 @@ type DescriptionRequest struct { type IDescriptionRequest interface { // GetHpaiControlEndpoint returns HpaiControlEndpoint GetHpaiControlEndpoint() *HPAIControlEndpoint - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *DescriptionRequest) GetHpaiControlEndpoint() *HPAIControlEndpoint { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDescriptionRequest factory function for DescriptionRequest func NewDescriptionRequest(hpaiControlEndpoint *HPAIControlEndpoint) *KnxNetIpMessage { child := &DescriptionRequest{ HpaiControlEndpoint: hpaiControlEndpoint, @@ -100,21 +101,21 @@ func (m *DescriptionRequest) GetTypeName() string { return "DescriptionRequest" } -func (m *DescriptionRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DescriptionRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DescriptionRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DescriptionRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (hpaiControlEndpoint) - lengthInBits += m.HpaiControlEndpoint.LengthInBits() + lengthInBits += m.HpaiControlEndpoint.GetLengthInBits() return lengthInBits } -func (m *DescriptionRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DescriptionRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DescriptionRequestParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go index 06f39394be0..91e19008a2f 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go @@ -39,10 +39,10 @@ type IDescriptionResponse interface { GetDibDeviceInfo() *DIBDeviceInfo // GetDibSuppSvcFamilies returns DibSuppSvcFamilies GetDibSuppSvcFamilies() *DIBSuppSvcFamilies - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *DescriptionResponse) GetDibSuppSvcFamilies() *DIBSuppSvcFamilies { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDescriptionResponse factory function for DescriptionResponse func NewDescriptionResponse(dibDeviceInfo *DIBDeviceInfo, dibSuppSvcFamilies *DIBSuppSvcFamilies) *KnxNetIpMessage { child := &DescriptionResponse{ DibDeviceInfo: dibDeviceInfo, @@ -108,24 +109,24 @@ func (m *DescriptionResponse) GetTypeName() string { return "DescriptionResponse" } -func (m *DescriptionResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DescriptionResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DescriptionResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DescriptionResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (dibDeviceInfo) - lengthInBits += m.DibDeviceInfo.LengthInBits() + lengthInBits += m.DibDeviceInfo.GetLengthInBits() // Simple field (dibSuppSvcFamilies) - lengthInBits += m.DibSuppSvcFamilies.LengthInBits() + lengthInBits += m.DibSuppSvcFamilies.GetLengthInBits() return lengthInBits } -func (m *DescriptionResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DescriptionResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DescriptionResponseParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go index b4ccf1ad887..05fb45e5a35 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go @@ -36,10 +36,10 @@ type DeviceConfigurationAck struct { type IDeviceConfigurationAck interface { // GetDeviceConfigurationAckDataBlock returns DeviceConfigurationAckDataBlock GetDeviceConfigurationAckDataBlock() *DeviceConfigurationAckDataBlock - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *DeviceConfigurationAck) GetDeviceConfigurationAckDataBlock() *DeviceCon // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDeviceConfigurationAck factory function for DeviceConfigurationAck func NewDeviceConfigurationAck(deviceConfigurationAckDataBlock *DeviceConfigurationAckDataBlock) *KnxNetIpMessage { child := &DeviceConfigurationAck{ DeviceConfigurationAckDataBlock: deviceConfigurationAckDataBlock, @@ -100,21 +101,21 @@ func (m *DeviceConfigurationAck) GetTypeName() string { return "DeviceConfigurationAck" } -func (m *DeviceConfigurationAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DeviceConfigurationAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DeviceConfigurationAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DeviceConfigurationAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (deviceConfigurationAckDataBlock) - lengthInBits += m.DeviceConfigurationAckDataBlock.LengthInBits() + lengthInBits += m.DeviceConfigurationAckDataBlock.GetLengthInBits() return lengthInBits } -func (m *DeviceConfigurationAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DeviceConfigurationAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceConfigurationAckParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go index ea73e71ac1a..446156db97c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go @@ -41,10 +41,10 @@ type IDeviceConfigurationAckDataBlock interface { GetSequenceCounter() uint8 // GetStatus returns Status GetStatus() Status - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *DeviceConfigurationAckDataBlock) GetStatus() Status { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDeviceConfigurationAckDataBlock factory function for DeviceConfigurationAckDataBlock func NewDeviceConfigurationAckDataBlock(communicationChannelId uint8, sequenceCounter uint8, status Status) *DeviceConfigurationAckDataBlock { return &DeviceConfigurationAckDataBlock{CommunicationChannelId: communicationChannelId, SequenceCounter: sequenceCounter, Status: status} } @@ -89,11 +90,11 @@ func (m *DeviceConfigurationAckDataBlock) GetTypeName() string { return "DeviceConfigurationAckDataBlock" } -func (m *DeviceConfigurationAckDataBlock) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DeviceConfigurationAckDataBlock) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DeviceConfigurationAckDataBlock) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DeviceConfigurationAckDataBlock) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -111,8 +112,8 @@ func (m *DeviceConfigurationAckDataBlock) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *DeviceConfigurationAckDataBlock) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DeviceConfigurationAckDataBlock) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceConfigurationAckDataBlockParse(readBuffer utils.ReadBuffer) (*DeviceConfigurationAckDataBlock, error) { @@ -168,7 +169,7 @@ func (m *DeviceConfigurationAckDataBlock) Serialize(writeBuffer utils.WriteBuffe } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go index 5a039b61fea..6ca458d71a2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go @@ -31,6 +31,9 @@ type DeviceConfigurationRequest struct { *KnxNetIpMessage DeviceConfigurationRequestDataBlock *DeviceConfigurationRequestDataBlock Cemi *CEMI + + // Arguments. + TotalLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type IDeviceConfigurationRequest interface { GetDeviceConfigurationRequestDataBlock() *DeviceConfigurationRequestDataBlock // GetCemi returns Cemi GetCemi() *CEMI - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,7 +78,8 @@ func (m *DeviceConfigurationRequest) GetCemi() *CEMI { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewDeviceConfigurationRequest(deviceConfigurationRequestDataBlock *DeviceConfigurationRequestDataBlock, cemi *CEMI) *KnxNetIpMessage { +// NewDeviceConfigurationRequest factory function for DeviceConfigurationRequest +func NewDeviceConfigurationRequest(deviceConfigurationRequestDataBlock *DeviceConfigurationRequestDataBlock, cemi *CEMI, totalLength uint16) *KnxNetIpMessage { child := &DeviceConfigurationRequest{ DeviceConfigurationRequestDataBlock: deviceConfigurationRequestDataBlock, Cemi: cemi, @@ -108,24 +112,24 @@ func (m *DeviceConfigurationRequest) GetTypeName() string { return "DeviceConfigurationRequest" } -func (m *DeviceConfigurationRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DeviceConfigurationRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DeviceConfigurationRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DeviceConfigurationRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (deviceConfigurationRequestDataBlock) - lengthInBits += m.DeviceConfigurationRequestDataBlock.LengthInBits() + lengthInBits += m.DeviceConfigurationRequestDataBlock.GetLengthInBits() // Simple field (cemi) - lengthInBits += m.Cemi.LengthInBits() + lengthInBits += m.Cemi.GetLengthInBits() return lengthInBits } -func (m *DeviceConfigurationRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DeviceConfigurationRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceConfigurationRequestParse(readBuffer utils.ReadBuffer, totalLength uint16) (*KnxNetIpMessage, error) { @@ -150,7 +154,7 @@ func DeviceConfigurationRequestParse(readBuffer utils.ReadBuffer, totalLength ui if pullErr := readBuffer.PullContext("cemi"); pullErr != nil { return nil, pullErr } - _cemi, _cemiErr := CEMIParse(readBuffer, uint16(uint16(totalLength)-uint16(uint16(uint16(uint16(6))+uint16(deviceConfigurationRequestDataBlock.LengthInBytes()))))) + _cemi, _cemiErr := CEMIParse(readBuffer, uint16(uint16(totalLength)-uint16(uint16(uint16(uint16(6))+uint16(deviceConfigurationRequestDataBlock.GetLengthInBytes()))))) if _cemiErr != nil { return nil, errors.Wrap(_cemiErr, "Error parsing 'cemi' field") } diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go index bdb5a8388c2..9d7f1390afd 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go @@ -39,10 +39,10 @@ type IDeviceConfigurationRequestDataBlock interface { GetCommunicationChannelId() uint8 // GetSequenceCounter returns SequenceCounter GetSequenceCounter() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *DeviceConfigurationRequestDataBlock) GetSequenceCounter() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDeviceConfigurationRequestDataBlock factory function for DeviceConfigurationRequestDataBlock func NewDeviceConfigurationRequestDataBlock(communicationChannelId uint8, sequenceCounter uint8) *DeviceConfigurationRequestDataBlock { return &DeviceConfigurationRequestDataBlock{CommunicationChannelId: communicationChannelId, SequenceCounter: sequenceCounter} } @@ -83,11 +84,11 @@ func (m *DeviceConfigurationRequestDataBlock) GetTypeName() string { return "DeviceConfigurationRequestDataBlock" } -func (m *DeviceConfigurationRequestDataBlock) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DeviceConfigurationRequestDataBlock) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DeviceConfigurationRequestDataBlock) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DeviceConfigurationRequestDataBlock) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -105,8 +106,8 @@ func (m *DeviceConfigurationRequestDataBlock) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *DeviceConfigurationRequestDataBlock) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DeviceConfigurationRequestDataBlock) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceConfigurationRequestDataBlockParse(readBuffer utils.ReadBuffer) (*DeviceConfigurationRequestDataBlock, error) { @@ -163,7 +164,7 @@ func (m *DeviceConfigurationRequestDataBlock) Serialize(writeBuffer utils.WriteB } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptor.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptor.go index b7487542997..d0dbb1b3289 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptor.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptor.go @@ -517,12 +517,12 @@ func CastDeviceDescriptor(structType interface{}) DeviceDescriptor { return castFunc(structType) } -func (m DeviceDescriptor) LengthInBits() uint16 { +func (m DeviceDescriptor) GetLengthInBits() uint16 { return 16 } -func (m DeviceDescriptor) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m DeviceDescriptor) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceDescriptorParse(readBuffer utils.ReadBuffer) (DeviceDescriptor, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorMediumType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorMediumType.go index c264f6f4fc0..91f1bf53490 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorMediumType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorMediumType.go @@ -110,12 +110,12 @@ func CastDeviceDescriptorMediumType(structType interface{}) DeviceDescriptorMedi return castFunc(structType) } -func (m DeviceDescriptorMediumType) LengthInBits() uint16 { +func (m DeviceDescriptorMediumType) GetLengthInBits() uint16 { return 4 } -func (m DeviceDescriptorMediumType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m DeviceDescriptorMediumType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceDescriptorMediumTypeParse(readBuffer utils.ReadBuffer) (DeviceDescriptorMediumType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go index c33aa66f146..4128d1d285a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go @@ -62,10 +62,10 @@ type IDeviceDescriptorType2 interface { GetChannelInfo3() *ChannelInformation // GetChannelInfo4 returns ChannelInfo4 GetChannelInfo4() *ChannelInformation - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -117,6 +117,7 @@ func (m *DeviceDescriptorType2) GetChannelInfo4() *ChannelInformation { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDeviceDescriptorType2 factory function for DeviceDescriptorType2 func NewDeviceDescriptorType2(manufacturerId uint16, deviceType uint16, version uint8, readSupported bool, writeSupported bool, logicalTagBase uint8, channelInfo1 *ChannelInformation, channelInfo2 *ChannelInformation, channelInfo3 *ChannelInformation, channelInfo4 *ChannelInformation) *DeviceDescriptorType2 { return &DeviceDescriptorType2{ManufacturerId: manufacturerId, DeviceType: deviceType, Version: version, ReadSupported: readSupported, WriteSupported: writeSupported, LogicalTagBase: logicalTagBase, ChannelInfo1: channelInfo1, ChannelInfo2: channelInfo2, ChannelInfo3: channelInfo3, ChannelInfo4: channelInfo4} } @@ -138,11 +139,11 @@ func (m *DeviceDescriptorType2) GetTypeName() string { return "DeviceDescriptorType2" } -func (m *DeviceDescriptorType2) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DeviceDescriptorType2) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DeviceDescriptorType2) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DeviceDescriptorType2) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (manufacturerId) @@ -164,22 +165,22 @@ func (m *DeviceDescriptorType2) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 6 // Simple field (channelInfo1) - lengthInBits += m.ChannelInfo1.LengthInBits() + lengthInBits += m.ChannelInfo1.GetLengthInBits() // Simple field (channelInfo2) - lengthInBits += m.ChannelInfo2.LengthInBits() + lengthInBits += m.ChannelInfo2.GetLengthInBits() // Simple field (channelInfo3) - lengthInBits += m.ChannelInfo3.LengthInBits() + lengthInBits += m.ChannelInfo3.GetLengthInBits() // Simple field (channelInfo4) - lengthInBits += m.ChannelInfo4.LengthInBits() + lengthInBits += m.ChannelInfo4.GetLengthInBits() return lengthInBits } -func (m *DeviceDescriptorType2) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DeviceDescriptorType2) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceDescriptorType2Parse(readBuffer utils.ReadBuffer) (*DeviceDescriptorType2, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go index 9d7822ff45f..919caaabd2c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go @@ -36,10 +36,10 @@ type DeviceStatus struct { type IDeviceStatus interface { // GetProgramMode returns ProgramMode GetProgramMode() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -55,6 +55,7 @@ func (m *DeviceStatus) GetProgramMode() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDeviceStatus factory function for DeviceStatus func NewDeviceStatus(programMode bool) *DeviceStatus { return &DeviceStatus{ProgramMode: programMode} } @@ -76,11 +77,11 @@ func (m *DeviceStatus) GetTypeName() string { return "DeviceStatus" } -func (m *DeviceStatus) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DeviceStatus) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DeviceStatus) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DeviceStatus) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Reserved Field (reserved) @@ -92,8 +93,8 @@ func (m *DeviceStatus) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *DeviceStatus) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DeviceStatus) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceStatusParse(readBuffer utils.ReadBuffer) (*DeviceStatus, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go index 3152392c29c..eb080b45bff 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go @@ -40,10 +40,10 @@ type IDisconnectRequest interface { GetCommunicationChannelId() uint8 // GetHpaiControlEndpoint returns HpaiControlEndpoint GetHpaiControlEndpoint() *HPAIControlEndpoint - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *DisconnectRequest) GetHpaiControlEndpoint() *HPAIControlEndpoint { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDisconnectRequest factory function for DisconnectRequest func NewDisconnectRequest(communicationChannelId uint8, hpaiControlEndpoint *HPAIControlEndpoint) *KnxNetIpMessage { child := &DisconnectRequest{ CommunicationChannelId: communicationChannelId, @@ -109,12 +110,12 @@ func (m *DisconnectRequest) GetTypeName() string { return "DisconnectRequest" } -func (m *DisconnectRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DisconnectRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DisconnectRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DisconnectRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (communicationChannelId) lengthInBits += 8 @@ -123,13 +124,13 @@ func (m *DisconnectRequest) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (hpaiControlEndpoint) - lengthInBits += m.HpaiControlEndpoint.LengthInBits() + lengthInBits += m.HpaiControlEndpoint.GetLengthInBits() return lengthInBits } -func (m *DisconnectRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DisconnectRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DisconnectRequestParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go index bb71862a731..aa489492b73 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go @@ -39,10 +39,10 @@ type IDisconnectResponse interface { GetCommunicationChannelId() uint8 // GetStatus returns Status GetStatus() Status - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *DisconnectResponse) GetStatus() Status { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDisconnectResponse factory function for DisconnectResponse func NewDisconnectResponse(communicationChannelId uint8, status Status) *KnxNetIpMessage { child := &DisconnectResponse{ CommunicationChannelId: communicationChannelId, @@ -108,12 +109,12 @@ func (m *DisconnectResponse) GetTypeName() string { return "DisconnectResponse" } -func (m *DisconnectResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DisconnectResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DisconnectResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *DisconnectResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (communicationChannelId) lengthInBits += 8 @@ -124,8 +125,8 @@ func (m *DisconnectResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *DisconnectResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DisconnectResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DisconnectResponseParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/FirmwareType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/FirmwareType.go index 14446109065..52b20b1d9e2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/FirmwareType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/FirmwareType.go @@ -170,12 +170,12 @@ func CastFirmwareType(structType interface{}) FirmwareType { return castFunc(structType) } -func (m FirmwareType) LengthInBits() uint16 { +func (m FirmwareType) GetLengthInBits() uint16 { return 16 } -func (m FirmwareType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m FirmwareType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func FirmwareTypeParse(readBuffer utils.ReadBuffer) (FirmwareType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go index b1342c75bcc..361800f0c83 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go @@ -57,10 +57,10 @@ type IGroupObjectDescriptorRealisationType1 interface { GetPriority() CEMIPriority // GetValueType returns ValueType GetValueType() ComObjectValueType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -104,6 +104,7 @@ func (m *GroupObjectDescriptorRealisationType1) GetValueType() ComObjectValueTyp // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewGroupObjectDescriptorRealisationType1 factory function for GroupObjectDescriptorRealisationType1 func NewGroupObjectDescriptorRealisationType1(dataPointer uint8, transmitEnable bool, segmentSelectorEnable bool, writeEnable bool, readEnable bool, communicationEnable bool, priority CEMIPriority, valueType ComObjectValueType) *GroupObjectDescriptorRealisationType1 { return &GroupObjectDescriptorRealisationType1{DataPointer: dataPointer, TransmitEnable: transmitEnable, SegmentSelectorEnable: segmentSelectorEnable, WriteEnable: writeEnable, ReadEnable: readEnable, CommunicationEnable: communicationEnable, Priority: priority, ValueType: valueType} } @@ -125,11 +126,11 @@ func (m *GroupObjectDescriptorRealisationType1) GetTypeName() string { return "GroupObjectDescriptorRealisationType1" } -func (m *GroupObjectDescriptorRealisationType1) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *GroupObjectDescriptorRealisationType1) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *GroupObjectDescriptorRealisationType1) LengthInBitsConditional(lastItem bool) uint16 { +func (m *GroupObjectDescriptorRealisationType1) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (dataPointer) @@ -162,8 +163,8 @@ func (m *GroupObjectDescriptorRealisationType1) LengthInBitsConditional(lastItem return lengthInBits } -func (m *GroupObjectDescriptorRealisationType1) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *GroupObjectDescriptorRealisationType1) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func GroupObjectDescriptorRealisationType1Parse(readBuffer utils.ReadBuffer) (*GroupObjectDescriptorRealisationType1, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go index b0e4b0e2a47..4891cd72e0d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go @@ -59,10 +59,10 @@ type IGroupObjectDescriptorRealisationType2 interface { GetPriority() CEMIPriority // GetValueType returns ValueType GetValueType() ComObjectValueType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -110,6 +110,7 @@ func (m *GroupObjectDescriptorRealisationType2) GetValueType() ComObjectValueTyp // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewGroupObjectDescriptorRealisationType2 factory function for GroupObjectDescriptorRealisationType2 func NewGroupObjectDescriptorRealisationType2(dataPointer uint8, updateEnable bool, transmitEnable bool, segmentSelectorEnable bool, writeEnable bool, readEnable bool, communicationEnable bool, priority CEMIPriority, valueType ComObjectValueType) *GroupObjectDescriptorRealisationType2 { return &GroupObjectDescriptorRealisationType2{DataPointer: dataPointer, UpdateEnable: updateEnable, TransmitEnable: transmitEnable, SegmentSelectorEnable: segmentSelectorEnable, WriteEnable: writeEnable, ReadEnable: readEnable, CommunicationEnable: communicationEnable, Priority: priority, ValueType: valueType} } @@ -131,11 +132,11 @@ func (m *GroupObjectDescriptorRealisationType2) GetTypeName() string { return "GroupObjectDescriptorRealisationType2" } -func (m *GroupObjectDescriptorRealisationType2) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *GroupObjectDescriptorRealisationType2) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *GroupObjectDescriptorRealisationType2) LengthInBitsConditional(lastItem bool) uint16 { +func (m *GroupObjectDescriptorRealisationType2) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (dataPointer) @@ -168,8 +169,8 @@ func (m *GroupObjectDescriptorRealisationType2) LengthInBitsConditional(lastItem return lengthInBits } -func (m *GroupObjectDescriptorRealisationType2) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *GroupObjectDescriptorRealisationType2) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func GroupObjectDescriptorRealisationType2Parse(readBuffer utils.ReadBuffer) (*GroupObjectDescriptorRealisationType2, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go index c4f7205fc7a..b7a5c53ed2b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go @@ -31,10 +31,10 @@ type GroupObjectDescriptorRealisationType6 struct { // The corresponding interface type IGroupObjectDescriptorRealisationType6 interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -47,6 +47,7 @@ type IGroupObjectDescriptorRealisationType6 interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewGroupObjectDescriptorRealisationType6 factory function for GroupObjectDescriptorRealisationType6 func NewGroupObjectDescriptorRealisationType6() *GroupObjectDescriptorRealisationType6 { return &GroupObjectDescriptorRealisationType6{} } @@ -68,18 +69,18 @@ func (m *GroupObjectDescriptorRealisationType6) GetTypeName() string { return "GroupObjectDescriptorRealisationType6" } -func (m *GroupObjectDescriptorRealisationType6) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *GroupObjectDescriptorRealisationType6) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *GroupObjectDescriptorRealisationType6) LengthInBitsConditional(lastItem bool) uint16 { +func (m *GroupObjectDescriptorRealisationType6) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) return lengthInBits } -func (m *GroupObjectDescriptorRealisationType6) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *GroupObjectDescriptorRealisationType6) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func GroupObjectDescriptorRealisationType6Parse(readBuffer utils.ReadBuffer) (*GroupObjectDescriptorRealisationType6, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go index f15b4e4337f..260097aeb20 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go @@ -59,10 +59,10 @@ type IGroupObjectDescriptorRealisationType7 interface { GetPriority() CEMIPriority // GetValueType returns ValueType GetValueType() ComObjectValueType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -110,6 +110,7 @@ func (m *GroupObjectDescriptorRealisationType7) GetValueType() ComObjectValueTyp // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewGroupObjectDescriptorRealisationType7 factory function for GroupObjectDescriptorRealisationType7 func NewGroupObjectDescriptorRealisationType7(dataAddress uint16, updateEnable bool, transmitEnable bool, segmentSelectorEnable bool, writeEnable bool, readEnable bool, communicationEnable bool, priority CEMIPriority, valueType ComObjectValueType) *GroupObjectDescriptorRealisationType7 { return &GroupObjectDescriptorRealisationType7{DataAddress: dataAddress, UpdateEnable: updateEnable, TransmitEnable: transmitEnable, SegmentSelectorEnable: segmentSelectorEnable, WriteEnable: writeEnable, ReadEnable: readEnable, CommunicationEnable: communicationEnable, Priority: priority, ValueType: valueType} } @@ -131,11 +132,11 @@ func (m *GroupObjectDescriptorRealisationType7) GetTypeName() string { return "GroupObjectDescriptorRealisationType7" } -func (m *GroupObjectDescriptorRealisationType7) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *GroupObjectDescriptorRealisationType7) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *GroupObjectDescriptorRealisationType7) LengthInBitsConditional(lastItem bool) uint16 { +func (m *GroupObjectDescriptorRealisationType7) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (dataAddress) @@ -168,8 +169,8 @@ func (m *GroupObjectDescriptorRealisationType7) LengthInBitsConditional(lastItem return lengthInBits } -func (m *GroupObjectDescriptorRealisationType7) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *GroupObjectDescriptorRealisationType7) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func GroupObjectDescriptorRealisationType7Parse(readBuffer utils.ReadBuffer) (*GroupObjectDescriptorRealisationType7, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go index 14f1c496207..2f00b3ede24 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go @@ -56,10 +56,10 @@ type IGroupObjectDescriptorRealisationTypeB interface { GetPriority() CEMIPriority // GetValueType returns ValueType GetValueType() ComObjectValueType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -103,6 +103,7 @@ func (m *GroupObjectDescriptorRealisationTypeB) GetValueType() ComObjectValueTyp // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewGroupObjectDescriptorRealisationTypeB factory function for GroupObjectDescriptorRealisationTypeB func NewGroupObjectDescriptorRealisationTypeB(updateEnable bool, transmitEnable bool, segmentSelectorEnable bool, writeEnable bool, readEnable bool, communicationEnable bool, priority CEMIPriority, valueType ComObjectValueType) *GroupObjectDescriptorRealisationTypeB { return &GroupObjectDescriptorRealisationTypeB{UpdateEnable: updateEnable, TransmitEnable: transmitEnable, SegmentSelectorEnable: segmentSelectorEnable, WriteEnable: writeEnable, ReadEnable: readEnable, CommunicationEnable: communicationEnable, Priority: priority, ValueType: valueType} } @@ -124,11 +125,11 @@ func (m *GroupObjectDescriptorRealisationTypeB) GetTypeName() string { return "GroupObjectDescriptorRealisationTypeB" } -func (m *GroupObjectDescriptorRealisationTypeB) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *GroupObjectDescriptorRealisationTypeB) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *GroupObjectDescriptorRealisationTypeB) LengthInBitsConditional(lastItem bool) uint16 { +func (m *GroupObjectDescriptorRealisationTypeB) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (updateEnable) @@ -158,8 +159,8 @@ func (m *GroupObjectDescriptorRealisationTypeB) LengthInBitsConditional(lastItem return lengthInBits } -func (m *GroupObjectDescriptorRealisationTypeB) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *GroupObjectDescriptorRealisationTypeB) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func GroupObjectDescriptorRealisationTypeBParse(readBuffer utils.ReadBuffer) (*GroupObjectDescriptorRealisationTypeB, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go index f1c5d0d14fe..4e103946f3c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go @@ -41,10 +41,10 @@ type IHPAIControlEndpoint interface { GetIpAddress() *IPAddress // GetIpPort returns IpPort GetIpPort() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *HPAIControlEndpoint) GetIpPort() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewHPAIControlEndpoint factory function for HPAIControlEndpoint func NewHPAIControlEndpoint(hostProtocolCode HostProtocolCode, ipAddress *IPAddress, ipPort uint16) *HPAIControlEndpoint { return &HPAIControlEndpoint{HostProtocolCode: hostProtocolCode, IpAddress: ipAddress, IpPort: ipPort} } @@ -89,11 +90,11 @@ func (m *HPAIControlEndpoint) GetTypeName() string { return "HPAIControlEndpoint" } -func (m *HPAIControlEndpoint) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *HPAIControlEndpoint) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *HPAIControlEndpoint) LengthInBitsConditional(lastItem bool) uint16 { +func (m *HPAIControlEndpoint) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -103,7 +104,7 @@ func (m *HPAIControlEndpoint) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (ipAddress) - lengthInBits += m.IpAddress.LengthInBits() + lengthInBits += m.IpAddress.GetLengthInBits() // Simple field (ipPort) lengthInBits += 16 @@ -111,8 +112,8 @@ func (m *HPAIControlEndpoint) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *HPAIControlEndpoint) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *HPAIControlEndpoint) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func HPAIControlEndpointParse(readBuffer utils.ReadBuffer) (*HPAIControlEndpoint, error) { @@ -174,7 +175,7 @@ func (m *HPAIControlEndpoint) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go index b0011c28799..912328b5336 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go @@ -41,10 +41,10 @@ type IHPAIDataEndpoint interface { GetIpAddress() *IPAddress // GetIpPort returns IpPort GetIpPort() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *HPAIDataEndpoint) GetIpPort() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewHPAIDataEndpoint factory function for HPAIDataEndpoint func NewHPAIDataEndpoint(hostProtocolCode HostProtocolCode, ipAddress *IPAddress, ipPort uint16) *HPAIDataEndpoint { return &HPAIDataEndpoint{HostProtocolCode: hostProtocolCode, IpAddress: ipAddress, IpPort: ipPort} } @@ -89,11 +90,11 @@ func (m *HPAIDataEndpoint) GetTypeName() string { return "HPAIDataEndpoint" } -func (m *HPAIDataEndpoint) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *HPAIDataEndpoint) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *HPAIDataEndpoint) LengthInBitsConditional(lastItem bool) uint16 { +func (m *HPAIDataEndpoint) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -103,7 +104,7 @@ func (m *HPAIDataEndpoint) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (ipAddress) - lengthInBits += m.IpAddress.LengthInBits() + lengthInBits += m.IpAddress.GetLengthInBits() // Simple field (ipPort) lengthInBits += 16 @@ -111,8 +112,8 @@ func (m *HPAIDataEndpoint) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *HPAIDataEndpoint) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *HPAIDataEndpoint) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func HPAIDataEndpointParse(readBuffer utils.ReadBuffer) (*HPAIDataEndpoint, error) { @@ -174,7 +175,7 @@ func (m *HPAIDataEndpoint) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go index f2e9b972b54..d86af4f8277 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go @@ -41,10 +41,10 @@ type IHPAIDiscoveryEndpoint interface { GetIpAddress() *IPAddress // GetIpPort returns IpPort GetIpPort() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *HPAIDiscoveryEndpoint) GetIpPort() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewHPAIDiscoveryEndpoint factory function for HPAIDiscoveryEndpoint func NewHPAIDiscoveryEndpoint(hostProtocolCode HostProtocolCode, ipAddress *IPAddress, ipPort uint16) *HPAIDiscoveryEndpoint { return &HPAIDiscoveryEndpoint{HostProtocolCode: hostProtocolCode, IpAddress: ipAddress, IpPort: ipPort} } @@ -89,11 +90,11 @@ func (m *HPAIDiscoveryEndpoint) GetTypeName() string { return "HPAIDiscoveryEndpoint" } -func (m *HPAIDiscoveryEndpoint) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *HPAIDiscoveryEndpoint) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *HPAIDiscoveryEndpoint) LengthInBitsConditional(lastItem bool) uint16 { +func (m *HPAIDiscoveryEndpoint) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -103,7 +104,7 @@ func (m *HPAIDiscoveryEndpoint) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (ipAddress) - lengthInBits += m.IpAddress.LengthInBits() + lengthInBits += m.IpAddress.GetLengthInBits() // Simple field (ipPort) lengthInBits += 16 @@ -111,8 +112,8 @@ func (m *HPAIDiscoveryEndpoint) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *HPAIDiscoveryEndpoint) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *HPAIDiscoveryEndpoint) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func HPAIDiscoveryEndpointParse(readBuffer utils.ReadBuffer) (*HPAIDiscoveryEndpoint, error) { @@ -174,7 +175,7 @@ func (m *HPAIDiscoveryEndpoint) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HostProtocolCode.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HostProtocolCode.go index 36040bd1775..bb81c239fe2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HostProtocolCode.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HostProtocolCode.go @@ -86,12 +86,12 @@ func CastHostProtocolCode(structType interface{}) HostProtocolCode { return castFunc(structType) } -func (m HostProtocolCode) LengthInBits() uint16 { +func (m HostProtocolCode) GetLengthInBits() uint16 { return 8 } -func (m HostProtocolCode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m HostProtocolCode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func HostProtocolCodeParse(readBuffer utils.ReadBuffer) (HostProtocolCode, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go index 75d3fa413de..6c93ed9dfb8 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go @@ -35,10 +35,10 @@ type IPAddress struct { type IIPAddress interface { // GetAddr returns Addr GetAddr() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *IPAddress) GetAddr() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewIPAddress factory function for IPAddress func NewIPAddress(addr []byte) *IPAddress { return &IPAddress{Addr: addr} } @@ -75,11 +76,11 @@ func (m *IPAddress) GetTypeName() string { return "IPAddress" } -func (m *IPAddress) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *IPAddress) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *IPAddress) LengthInBitsConditional(lastItem bool) uint16 { +func (m *IPAddress) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Array field @@ -90,8 +91,8 @@ func (m *IPAddress) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *IPAddress) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *IPAddress) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func IPAddressParse(readBuffer utils.ReadBuffer) (*IPAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go index 04e8a0d76bf..4ee6006124d 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go @@ -41,10 +41,10 @@ type IKnxAddress interface { GetMiddleGroup() uint8 // GetSubGroup returns SubGroup GetSubGroup() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxAddress) GetSubGroup() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxAddress factory function for KnxAddress func NewKnxAddress(mainGroup uint8, middleGroup uint8, subGroup uint8) *KnxAddress { return &KnxAddress{MainGroup: mainGroup, MiddleGroup: middleGroup, SubGroup: subGroup} } @@ -89,11 +90,11 @@ func (m *KnxAddress) GetTypeName() string { return "KnxAddress" } -func (m *KnxAddress) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxAddress) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxAddress) LengthInBitsConditional(lastItem bool) uint16 { +func (m *KnxAddress) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (mainGroup) @@ -108,8 +109,8 @@ func (m *KnxAddress) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxAddress) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxAddress) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxAddressParse(readBuffer utils.ReadBuffer) (*KnxAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go index 3c4e993dc3d..a6dd4ce81e6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go @@ -5988,6 +5988,12 @@ func KnxDatapointParse(readBuffer utils.ReadBuffer, datapointType KnxDatapointTy } func KnxDatapointSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, datapointType KnxDatapointType) error { + m := struct { + DatapointType KnxDatapointType + }{ + DatapointType: datapointType, + } + _ = m writeBuffer.PushContext("KnxDatapoint") switch { case datapointType == KnxDatapointType_BOOL: // BOOL diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointMainType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointMainType.go index df9ca045332..733a9b20fbd 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointMainType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointMainType.go @@ -1210,12 +1210,12 @@ func CastKnxDatapointMainType(structType interface{}) KnxDatapointMainType { return castFunc(structType) } -func (m KnxDatapointMainType) LengthInBits() uint16 { +func (m KnxDatapointMainType) GetLengthInBits() uint16 { return 16 } -func (m KnxDatapointMainType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxDatapointMainType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxDatapointMainTypeParse(readBuffer utils.ReadBuffer) (KnxDatapointMainType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointType.go index 274909aa9b7..58c78a31285 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointType.go @@ -6394,12 +6394,12 @@ func CastKnxDatapointType(structType interface{}) KnxDatapointType { return castFunc(structType) } -func (m KnxDatapointType) LengthInBits() uint16 { +func (m KnxDatapointType) GetLengthInBits() uint16 { return 32 } -func (m KnxDatapointType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxDatapointType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxDatapointTypeParse(readBuffer utils.ReadBuffer) (KnxDatapointType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go index 4f6ebac3a3a..31255ce72cc 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go @@ -35,10 +35,10 @@ type KnxGroupAddress struct { type IKnxGroupAddress interface { // NumLevels returns NumLevels NumLevels() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IKnxGroupAddressChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxGroupAddress factory function for KnxGroupAddress func NewKnxGroupAddress() *KnxGroupAddress { return &KnxGroupAddress{} } @@ -84,22 +85,22 @@ func (m *KnxGroupAddress) GetTypeName() string { return "KnxGroupAddress" } -func (m *KnxGroupAddress) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxGroupAddress) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxGroupAddress) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *KnxGroupAddress) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *KnxGroupAddress) ParentLengthInBits() uint16 { +func (m *KnxGroupAddress) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) return lengthInBits } -func (m *KnxGroupAddress) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxGroupAddress) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxGroupAddressParse(readBuffer utils.ReadBuffer, numLevels uint8) (*KnxGroupAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go index 5ec25013b65..390593b25d5 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go @@ -39,10 +39,10 @@ type IKnxGroupAddress2Level interface { GetMainGroup() uint8 // GetSubGroup returns SubGroup GetSubGroup() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *KnxGroupAddress2Level) GetSubGroup() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxGroupAddress2Level factory function for KnxGroupAddress2Level func NewKnxGroupAddress2Level(mainGroup uint8, subGroup uint16) *KnxGroupAddress { child := &KnxGroupAddress2Level{ MainGroup: mainGroup, @@ -108,12 +109,12 @@ func (m *KnxGroupAddress2Level) GetTypeName() string { return "KnxGroupAddress2Level" } -func (m *KnxGroupAddress2Level) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxGroupAddress2Level) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxGroupAddress2Level) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxGroupAddress2Level) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (mainGroup) lengthInBits += 5 @@ -124,8 +125,8 @@ func (m *KnxGroupAddress2Level) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxGroupAddress2Level) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxGroupAddress2Level) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxGroupAddress2LevelParse(readBuffer utils.ReadBuffer, numLevels uint8) (*KnxGroupAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go index 5d5916331e6..b70aec1ce96 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go @@ -42,10 +42,10 @@ type IKnxGroupAddress3Level interface { GetMiddleGroup() uint8 // GetSubGroup returns SubGroup GetSubGroup() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *KnxGroupAddress3Level) GetSubGroup() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxGroupAddress3Level factory function for KnxGroupAddress3Level func NewKnxGroupAddress3Level(mainGroup uint8, middleGroup uint8, subGroup uint8) *KnxGroupAddress { child := &KnxGroupAddress3Level{ MainGroup: mainGroup, @@ -116,12 +117,12 @@ func (m *KnxGroupAddress3Level) GetTypeName() string { return "KnxGroupAddress3Level" } -func (m *KnxGroupAddress3Level) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxGroupAddress3Level) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxGroupAddress3Level) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxGroupAddress3Level) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (mainGroup) lengthInBits += 5 @@ -135,8 +136,8 @@ func (m *KnxGroupAddress3Level) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxGroupAddress3Level) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxGroupAddress3Level) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxGroupAddress3LevelParse(readBuffer utils.ReadBuffer, numLevels uint8) (*KnxGroupAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go index 65ce74343e4..d6120e4106f 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go @@ -36,10 +36,10 @@ type KnxGroupAddressFreeLevel struct { type IKnxGroupAddressFreeLevel interface { // GetSubGroup returns SubGroup GetSubGroup() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxGroupAddressFreeLevel) GetSubGroup() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxGroupAddressFreeLevel factory function for KnxGroupAddressFreeLevel func NewKnxGroupAddressFreeLevel(subGroup uint16) *KnxGroupAddress { child := &KnxGroupAddressFreeLevel{ SubGroup: subGroup, @@ -100,12 +101,12 @@ func (m *KnxGroupAddressFreeLevel) GetTypeName() string { return "KnxGroupAddressFreeLevel" } -func (m *KnxGroupAddressFreeLevel) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxGroupAddressFreeLevel) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxGroupAddressFreeLevel) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxGroupAddressFreeLevel) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (subGroup) lengthInBits += 16 @@ -113,8 +114,8 @@ func (m *KnxGroupAddressFreeLevel) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *KnxGroupAddressFreeLevel) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxGroupAddressFreeLevel) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxGroupAddressFreeLevelParse(readBuffer utils.ReadBuffer, numLevels uint8) (*KnxGroupAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go index 8b19cbc6e94..b17e4004835 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go @@ -4901,12 +4901,12 @@ func CastKnxInterfaceObjectProperty(structType interface{}) KnxInterfaceObjectPr return castFunc(structType) } -func (m KnxInterfaceObjectProperty) LengthInBits() uint16 { +func (m KnxInterfaceObjectProperty) GetLengthInBits() uint16 { return 32 } -func (m KnxInterfaceObjectProperty) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxInterfaceObjectProperty) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxInterfaceObjectPropertyParse(readBuffer utils.ReadBuffer) (KnxInterfaceObjectProperty, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectType.go index a70f78fa4cb..51bc69cdc30 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxInterfaceObjectType.go @@ -461,12 +461,12 @@ func CastKnxInterfaceObjectType(structType interface{}) KnxInterfaceObjectType { return castFunc(structType) } -func (m KnxInterfaceObjectType) LengthInBits() uint16 { +func (m KnxInterfaceObjectType) GetLengthInBits() uint16 { return 16 } -func (m KnxInterfaceObjectType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxInterfaceObjectType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxInterfaceObjectTypeParse(readBuffer utils.ReadBuffer) (KnxInterfaceObjectType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxLayer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxLayer.go index e778646b321..94f3da6ace2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxLayer.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxLayer.go @@ -92,12 +92,12 @@ func CastKnxLayer(structType interface{}) KnxLayer { return castFunc(structType) } -func (m KnxLayer) LengthInBits() uint16 { +func (m KnxLayer) GetLengthInBits() uint16 { return 8 } -func (m KnxLayer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxLayer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxLayerParse(readBuffer utils.ReadBuffer) (KnxLayer, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go index 51f1cc4805c..0ed292e7b25 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go @@ -8259,12 +8259,12 @@ func CastKnxManufacturer(structType interface{}) KnxManufacturer { return castFunc(structType) } -func (m KnxManufacturer) LengthInBits() uint16 { +func (m KnxManufacturer) GetLengthInBits() uint16 { return 16 } -func (m KnxManufacturer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxManufacturer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxManufacturerParse(readBuffer utils.ReadBuffer) (KnxManufacturer, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxMedium.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxMedium.go index 9c51f0f2494..d0f5f6082f4 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxMedium.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxMedium.go @@ -110,12 +110,12 @@ func CastKnxMedium(structType interface{}) KnxMedium { return castFunc(structType) } -func (m KnxMedium) LengthInBits() uint16 { +func (m KnxMedium) GetLengthInBits() uint16 { return 8 } -func (m KnxMedium) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxMedium) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxMediumParse(readBuffer utils.ReadBuffer) (KnxMedium, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go index 1665bbc1a67..d5d4f7e9b0a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go @@ -36,10 +36,10 @@ type KnxNetIpCore struct { type IKnxNetIpCore interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetIpCore) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetIpCore factory function for KnxNetIpCore func NewKnxNetIpCore(version uint8) *ServiceId { child := &KnxNetIpCore{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetIpCore) GetTypeName() string { return "KnxNetIpCore" } -func (m *KnxNetIpCore) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetIpCore) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetIpCore) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetIpCore) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetIpCore) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxNetIpCore) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetIpCore) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetIpCoreParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go index ba50bab86ce..170ab67f49e 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go @@ -36,10 +36,10 @@ type KnxNetIpDeviceManagement struct { type IKnxNetIpDeviceManagement interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetIpDeviceManagement) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetIpDeviceManagement factory function for KnxNetIpDeviceManagement func NewKnxNetIpDeviceManagement(version uint8) *ServiceId { child := &KnxNetIpDeviceManagement{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetIpDeviceManagement) GetTypeName() string { return "KnxNetIpDeviceManagement" } -func (m *KnxNetIpDeviceManagement) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetIpDeviceManagement) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetIpDeviceManagement) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetIpDeviceManagement) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetIpDeviceManagement) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *KnxNetIpDeviceManagement) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetIpDeviceManagement) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetIpDeviceManagementParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go index 8fcd026cefd..15cdec29d81 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go @@ -39,10 +39,10 @@ type KnxNetIpMessage struct { type IKnxNetIpMessage interface { // MsgType returns MsgType MsgType() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -67,6 +67,7 @@ type IKnxNetIpMessageChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetIpMessage factory function for KnxNetIpMessage func NewKnxNetIpMessage() *KnxNetIpMessage { return &KnxNetIpMessage{} } @@ -88,15 +89,15 @@ func (m *KnxNetIpMessage) GetTypeName() string { return "KnxNetIpMessage" } -func (m *KnxNetIpMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetIpMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetIpMessage) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *KnxNetIpMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *KnxNetIpMessage) ParentLengthInBits() uint16 { +func (m *KnxNetIpMessage) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Implicit Field (headerLength) @@ -113,8 +114,8 @@ func (m *KnxNetIpMessage) ParentLengthInBits() uint16 { return lengthInBits } -func (m *KnxNetIpMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetIpMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetIpMessageParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { @@ -235,7 +236,7 @@ func (m *KnxNetIpMessage) SerializeParent(writeBuffer utils.WriteBuffer, child I } // Implicit Field (totalLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - totalLength := uint16(uint16(m.LengthInBytes())) + totalLength := uint16(uint16(m.GetLengthInBytes())) _totalLengthErr := writeBuffer.WriteUint16("totalLength", 16, (totalLength)) if _totalLengthErr != nil { return errors.Wrap(_totalLengthErr, "Error serializing 'totalLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go index 6ae32d5cb48..919667bd261 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go @@ -36,10 +36,10 @@ type KnxNetIpRouting struct { type IKnxNetIpRouting interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetIpRouting) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetIpRouting factory function for KnxNetIpRouting func NewKnxNetIpRouting(version uint8) *ServiceId { child := &KnxNetIpRouting{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetIpRouting) GetTypeName() string { return "KnxNetIpRouting" } -func (m *KnxNetIpRouting) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetIpRouting) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetIpRouting) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetIpRouting) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetIpRouting) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxNetIpRouting) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetIpRouting) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetIpRoutingParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go index d4848259f9b..633d6f116b3 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go @@ -36,10 +36,10 @@ type KnxNetIpTunneling struct { type IKnxNetIpTunneling interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetIpTunneling) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetIpTunneling factory function for KnxNetIpTunneling func NewKnxNetIpTunneling(version uint8) *ServiceId { child := &KnxNetIpTunneling{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetIpTunneling) GetTypeName() string { return "KnxNetIpTunneling" } -func (m *KnxNetIpTunneling) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetIpTunneling) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetIpTunneling) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetIpTunneling) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetIpTunneling) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxNetIpTunneling) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetIpTunneling) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetIpTunnelingParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go index 9d3cce9f715..9bc2175513c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go @@ -36,10 +36,10 @@ type KnxNetObjectServer struct { type IKnxNetObjectServer interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetObjectServer) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetObjectServer factory function for KnxNetObjectServer func NewKnxNetObjectServer(version uint8) *ServiceId { child := &KnxNetObjectServer{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetObjectServer) GetTypeName() string { return "KnxNetObjectServer" } -func (m *KnxNetObjectServer) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetObjectServer) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetObjectServer) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetObjectServer) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetObjectServer) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxNetObjectServer) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetObjectServer) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetObjectServerParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go index 9068d95aba8..bc140119d0a 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go @@ -36,10 +36,10 @@ type KnxNetRemoteConfigurationAndDiagnosis struct { type IKnxNetRemoteConfigurationAndDiagnosis interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetRemoteConfigurationAndDiagnosis) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetRemoteConfigurationAndDiagnosis factory function for KnxNetRemoteConfigurationAndDiagnosis func NewKnxNetRemoteConfigurationAndDiagnosis(version uint8) *ServiceId { child := &KnxNetRemoteConfigurationAndDiagnosis{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetRemoteConfigurationAndDiagnosis) GetTypeName() string { return "KnxNetRemoteConfigurationAndDiagnosis" } -func (m *KnxNetRemoteConfigurationAndDiagnosis) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetRemoteConfigurationAndDiagnosis) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetRemoteConfigurationAndDiagnosis) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetRemoteConfigurationAndDiagnosis) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetRemoteConfigurationAndDiagnosis) LengthInBitsConditional(lastItem return lengthInBits } -func (m *KnxNetRemoteConfigurationAndDiagnosis) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetRemoteConfigurationAndDiagnosis) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetRemoteConfigurationAndDiagnosisParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go index f9eb38a9f70..75f5882738e 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go @@ -36,10 +36,10 @@ type KnxNetRemoteLogging struct { type IKnxNetRemoteLogging interface { // GetVersion returns Version GetVersion() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *KnxNetRemoteLogging) GetVersion() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewKnxNetRemoteLogging factory function for KnxNetRemoteLogging func NewKnxNetRemoteLogging(version uint8) *ServiceId { child := &KnxNetRemoteLogging{ Version: version, @@ -100,12 +101,12 @@ func (m *KnxNetRemoteLogging) GetTypeName() string { return "KnxNetRemoteLogging" } -func (m *KnxNetRemoteLogging) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *KnxNetRemoteLogging) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *KnxNetRemoteLogging) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *KnxNetRemoteLogging) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (version) lengthInBits += 8 @@ -113,8 +114,8 @@ func (m *KnxNetRemoteLogging) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *KnxNetRemoteLogging) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *KnxNetRemoteLogging) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxNetRemoteLoggingParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go index 248b9b6b25a..4b892bb7f51 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go @@ -837,6 +837,14 @@ func KnxPropertyParse(readBuffer utils.ReadBuffer, propertyType KnxPropertyDataT } func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, propertyType KnxPropertyDataType, dataLengthInBytes uint8) error { + m := struct { + PropertyType KnxPropertyDataType + DataLengthInBytes uint8 + }{ + PropertyType: propertyType, + DataLengthInBytes: dataLengthInBytes, + } + _ = m writeBuffer.PushContext("KnxProperty") switch { case propertyType == KnxPropertyDataType_PDT_CONTROL: // BOOL @@ -1382,7 +1390,7 @@ func KnxPropertySerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, pro } default: // List // Array Field (value) - for i := uint32(0); i < uint32(dataLengthInBytes); i++ { + for i := uint32(0); i < uint32(m.DataLengthInBytes); i++ { _itemErr := writeBuffer.WriteByte("", value.GetIndex(i).GetByte()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxPropertyDataType.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxPropertyDataType.go index 0e2e780e5f9..64161e6dbd6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxPropertyDataType.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxPropertyDataType.go @@ -1030,12 +1030,12 @@ func CastKnxPropertyDataType(structType interface{}) KnxPropertyDataType { return castFunc(structType) } -func (m KnxPropertyDataType) LengthInBits() uint16 { +func (m KnxPropertyDataType) GetLengthInBits() uint16 { return 8 } -func (m KnxPropertyDataType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m KnxPropertyDataType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func KnxPropertyDataTypeParse(readBuffer utils.ReadBuffer) (KnxPropertyDataType, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go index 289865ba227..68090c5c478 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go @@ -33,6 +33,9 @@ type LBusmonInd struct { AdditionalInformation []*CEMIAdditionalInformation DataFrame *LDataFrame Crc *uint8 + + // Arguments. + Size uint16 } // The corresponding interface @@ -45,10 +48,10 @@ type ILBusmonInd interface { GetDataFrame() *LDataFrame // GetCrc returns Crc GetCrc() *uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,13 +92,14 @@ func (m *LBusmonInd) GetCrc() *uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLBusmonInd(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame, crc *uint8) *CEMI { +// NewLBusmonInd factory function for LBusmonInd +func NewLBusmonInd(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame, crc *uint8, size uint16) *CEMI { child := &LBusmonInd{ AdditionalInformationLength: additionalInformationLength, AdditionalInformation: additionalInformation, DataFrame: dataFrame, Crc: crc, - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -124,12 +128,12 @@ func (m *LBusmonInd) GetTypeName() string { return "LBusmonInd" } -func (m *LBusmonInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LBusmonInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LBusmonInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LBusmonInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (additionalInformationLength) lengthInBits += 8 @@ -137,12 +141,12 @@ func (m *LBusmonInd) LengthInBitsConditional(lastItem bool) uint16 { // Array field if len(m.AdditionalInformation) > 0 { for _, element := range m.AdditionalInformation { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (dataFrame) - lengthInBits += m.DataFrame.LengthInBits() + lengthInBits += m.DataFrame.GetLengthInBits() // Optional Field (crc) if m.Crc != nil { @@ -152,8 +156,8 @@ func (m *LBusmonInd) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *LBusmonInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LBusmonInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LBusmonIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go index f33cf763c2a..d666ec9a5bb 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go @@ -32,6 +32,9 @@ type LDataCon struct { AdditionalInformationLength uint8 AdditionalInformation []*CEMIAdditionalInformation DataFrame *LDataFrame + + // Arguments. + Size uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ILDataCon interface { GetAdditionalInformation() []*CEMIAdditionalInformation // GetDataFrame returns DataFrame GetDataFrame() *LDataFrame - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,12 +85,13 @@ func (m *LDataCon) GetDataFrame() *LDataFrame { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLDataCon(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame) *CEMI { +// NewLDataCon factory function for LDataCon +func NewLDataCon(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame, size uint16) *CEMI { child := &LDataCon{ AdditionalInformationLength: additionalInformationLength, AdditionalInformation: additionalInformation, DataFrame: dataFrame, - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -116,12 +120,12 @@ func (m *LDataCon) GetTypeName() string { return "LDataCon" } -func (m *LDataCon) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LDataCon) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LDataCon) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LDataCon) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (additionalInformationLength) lengthInBits += 8 @@ -129,18 +133,18 @@ func (m *LDataCon) LengthInBitsConditional(lastItem bool) uint16 { // Array field if len(m.AdditionalInformation) > 0 { for _, element := range m.AdditionalInformation { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (dataFrame) - lengthInBits += m.DataFrame.LengthInBits() + lengthInBits += m.DataFrame.GetLengthInBits() return lengthInBits } -func (m *LDataCon) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LDataCon) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LDataConParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go index 436d9413bd5..11cfc2ee33f 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go @@ -51,10 +51,10 @@ type ILDataExtended interface { GetDestinationAddress() []byte // GetApdu returns Apdu GetApdu() *Apdu - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -117,6 +117,7 @@ func (m *LDataExtended) GetApdu() *Apdu { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewLDataExtended factory function for LDataExtended func NewLDataExtended(groupAddress bool, hopCount uint8, extendedFrameFormat uint8, sourceAddress *KnxAddress, destinationAddress []byte, apdu *Apdu, frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame { child := &LDataExtended{ GroupAddress: groupAddress, @@ -154,12 +155,12 @@ func (m *LDataExtended) GetTypeName() string { return "LDataExtended" } -func (m *LDataExtended) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LDataExtended) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LDataExtended) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LDataExtended) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (groupAddress) lengthInBits += 1 @@ -171,7 +172,7 @@ func (m *LDataExtended) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 4 // Simple field (sourceAddress) - lengthInBits += m.SourceAddress.LengthInBits() + lengthInBits += m.SourceAddress.GetLengthInBits() // Array field if len(m.DestinationAddress) > 0 { @@ -182,13 +183,13 @@ func (m *LDataExtended) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (apdu) - lengthInBits += m.Apdu.LengthInBits() + lengthInBits += m.Apdu.GetLengthInBits() return lengthInBits } -func (m *LDataExtended) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LDataExtended) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LDataExtendedParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) { @@ -323,7 +324,7 @@ func (m *LDataExtended) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - dataLength := uint8(uint8(m.Apdu.LengthInBytes()) - uint8(uint8(1))) + dataLength := uint8(uint8(m.GetApdu().GetLengthInBytes()) - uint8(uint8(1))) _dataLengthErr := writeBuffer.WriteUint8("dataLength", 8, (dataLength)) if _dataLengthErr != nil { return errors.Wrap(_dataLengthErr, "Error serializing 'dataLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go index 28ffa9e6ce3..17693f9c1b0 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go @@ -52,10 +52,10 @@ type ILDataFrame interface { GetAcknowledgeRequested() bool // GetErrorFlag returns ErrorFlag GetErrorFlag() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -99,6 +99,7 @@ func (m *LDataFrame) GetErrorFlag() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewLDataFrame factory function for LDataFrame func NewLDataFrame(frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame { return &LDataFrame{FrameType: frameType, NotRepeated: notRepeated, Priority: priority, AcknowledgeRequested: acknowledgeRequested, ErrorFlag: errorFlag} } @@ -120,15 +121,15 @@ func (m *LDataFrame) GetTypeName() string { return "LDataFrame" } -func (m *LDataFrame) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LDataFrame) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LDataFrame) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *LDataFrame) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *LDataFrame) ParentLengthInBits() uint16 { +func (m *LDataFrame) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (frameType) @@ -153,8 +154,8 @@ func (m *LDataFrame) ParentLengthInBits() uint16 { return lengthInBits } -func (m *LDataFrame) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LDataFrame) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LDataFrameParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go index dbb3c2447c2..d21c02d2dbb 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go @@ -32,10 +32,10 @@ type LDataFrameACK struct { // The corresponding interface type ILDataFrameACK interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *LDataFrameACK) InitializeParent(parent *LDataFrame, frameType bool, not // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewLDataFrameACK factory function for LDataFrameACK func NewLDataFrameACK(frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame { child := &LDataFrameACK{ LDataFrame: NewLDataFrame(frameType, notRepeated, priority, acknowledgeRequested, errorFlag), @@ -106,18 +107,18 @@ func (m *LDataFrameACK) GetTypeName() string { return "LDataFrameACK" } -func (m *LDataFrameACK) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LDataFrameACK) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LDataFrameACK) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LDataFrameACK) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *LDataFrameACK) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LDataFrameACK) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LDataFrameACKParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go index 79d4c7e83b6..9aa4f93c588 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go @@ -32,6 +32,9 @@ type LDataInd struct { AdditionalInformationLength uint8 AdditionalInformation []*CEMIAdditionalInformation DataFrame *LDataFrame + + // Arguments. + Size uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ILDataInd interface { GetAdditionalInformation() []*CEMIAdditionalInformation // GetDataFrame returns DataFrame GetDataFrame() *LDataFrame - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,12 +85,13 @@ func (m *LDataInd) GetDataFrame() *LDataFrame { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLDataInd(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame) *CEMI { +// NewLDataInd factory function for LDataInd +func NewLDataInd(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame, size uint16) *CEMI { child := &LDataInd{ AdditionalInformationLength: additionalInformationLength, AdditionalInformation: additionalInformation, DataFrame: dataFrame, - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -116,12 +120,12 @@ func (m *LDataInd) GetTypeName() string { return "LDataInd" } -func (m *LDataInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LDataInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LDataInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LDataInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (additionalInformationLength) lengthInBits += 8 @@ -129,18 +133,18 @@ func (m *LDataInd) LengthInBitsConditional(lastItem bool) uint16 { // Array field if len(m.AdditionalInformation) > 0 { for _, element := range m.AdditionalInformation { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (dataFrame) - lengthInBits += m.DataFrame.LengthInBits() + lengthInBits += m.DataFrame.GetLengthInBits() return lengthInBits } -func (m *LDataInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LDataInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LDataIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go index 290135ac7e0..89bca6136d3 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go @@ -32,6 +32,9 @@ type LDataReq struct { AdditionalInformationLength uint8 AdditionalInformation []*CEMIAdditionalInformation DataFrame *LDataFrame + + // Arguments. + Size uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ILDataReq interface { GetAdditionalInformation() []*CEMIAdditionalInformation // GetDataFrame returns DataFrame GetDataFrame() *LDataFrame - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,12 +85,13 @@ func (m *LDataReq) GetDataFrame() *LDataFrame { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLDataReq(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame) *CEMI { +// NewLDataReq factory function for LDataReq +func NewLDataReq(additionalInformationLength uint8, additionalInformation []*CEMIAdditionalInformation, dataFrame *LDataFrame, size uint16) *CEMI { child := &LDataReq{ AdditionalInformationLength: additionalInformationLength, AdditionalInformation: additionalInformation, DataFrame: dataFrame, - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -116,12 +120,12 @@ func (m *LDataReq) GetTypeName() string { return "LDataReq" } -func (m *LDataReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LDataReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LDataReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LDataReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (additionalInformationLength) lengthInBits += 8 @@ -129,18 +133,18 @@ func (m *LDataReq) LengthInBitsConditional(lastItem bool) uint16 { // Array field if len(m.AdditionalInformation) > 0 { for _, element := range m.AdditionalInformation { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Simple field (dataFrame) - lengthInBits += m.DataFrame.LengthInBits() + lengthInBits += m.DataFrame.GetLengthInBits() return lengthInBits } -func (m *LDataReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LDataReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LDataReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go index 598a00daa63..372a9003a84 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go @@ -43,10 +43,10 @@ type ILPollData interface { GetTargetAddress() []byte // GetNumberExpectedPollData returns NumberExpectedPollData GetNumberExpectedPollData() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -97,6 +97,7 @@ func (m *LPollData) GetNumberExpectedPollData() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewLPollData factory function for LPollData func NewLPollData(sourceAddress *KnxAddress, targetAddress []byte, numberExpectedPollData uint8, frameType bool, notRepeated bool, priority CEMIPriority, acknowledgeRequested bool, errorFlag bool) *LDataFrame { child := &LPollData{ SourceAddress: sourceAddress, @@ -131,15 +132,15 @@ func (m *LPollData) GetTypeName() string { return "LPollData" } -func (m *LPollData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LPollData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LPollData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LPollData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (sourceAddress) - lengthInBits += m.SourceAddress.LengthInBits() + lengthInBits += m.SourceAddress.GetLengthInBits() // Array field if len(m.TargetAddress) > 0 { @@ -155,8 +156,8 @@ func (m *LPollData) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *LPollData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LPollData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LPollDataParse(readBuffer utils.ReadBuffer) (*LDataFrame, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go index 8ac53c4e113..07495651920 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type LPollDataCon struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ILPollDataCon interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *LPollDataCon) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLPollDataCon() *CEMI { +// NewLPollDataCon factory function for LPollDataCon +func NewLPollDataCon(size uint16) *CEMI { child := &LPollDataCon{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *LPollDataCon) GetTypeName() string { return "LPollDataCon" } -func (m *LPollDataCon) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LPollDataCon) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LPollDataCon) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LPollDataCon) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *LPollDataCon) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LPollDataCon) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LPollDataConParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go index eeea22be3a3..c58117065af 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type LPollDataReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ILPollDataReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *LPollDataReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLPollDataReq() *CEMI { +// NewLPollDataReq factory function for LPollDataReq +func NewLPollDataReq(size uint16) *CEMI { child := &LPollDataReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *LPollDataReq) GetTypeName() string { return "LPollDataReq" } -func (m *LPollDataReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LPollDataReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LPollDataReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LPollDataReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *LPollDataReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LPollDataReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LPollDataReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go index 6b7005debbb..b1c30229b4c 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type LRawCon struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ILRawCon interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *LRawCon) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLRawCon() *CEMI { +// NewLRawCon factory function for LRawCon +func NewLRawCon(size uint16) *CEMI { child := &LRawCon{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *LRawCon) GetTypeName() string { return "LRawCon" } -func (m *LRawCon) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LRawCon) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LRawCon) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LRawCon) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *LRawCon) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LRawCon) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LRawConParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go index 787dc0694c9..0abafe801ac 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type LRawInd struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ILRawInd interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *LRawInd) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLRawInd() *CEMI { +// NewLRawInd factory function for LRawInd +func NewLRawInd(size uint16) *CEMI { child := &LRawInd{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *LRawInd) GetTypeName() string { return "LRawInd" } -func (m *LRawInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LRawInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LRawInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LRawInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *LRawInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LRawInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LRawIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go index 5a5b0224f06..bf80d032f62 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type LRawReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ILRawReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *LRawReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewLRawReq() *CEMI { +// NewLRawReq factory function for LRawReq +func NewLRawReq(size uint16) *CEMI { child := &LRawReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *LRawReq) GetTypeName() string { return "LRawReq" } -func (m *LRawReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *LRawReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *LRawReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *LRawReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *LRawReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *LRawReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func LRawReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go index 0fc45be3e10..2e7b98246fa 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go @@ -35,10 +35,10 @@ type MACAddress struct { type IMACAddress interface { // GetAddr returns Addr GetAddr() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *MACAddress) GetAddr() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewMACAddress factory function for MACAddress func NewMACAddress(addr []byte) *MACAddress { return &MACAddress{Addr: addr} } @@ -75,11 +76,11 @@ func (m *MACAddress) GetTypeName() string { return "MACAddress" } -func (m *MACAddress) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MACAddress) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MACAddress) LengthInBitsConditional(lastItem bool) uint16 { +func (m *MACAddress) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Array field @@ -90,8 +91,8 @@ func (m *MACAddress) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *MACAddress) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MACAddress) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MACAddressParse(readBuffer utils.ReadBuffer) (*MACAddress, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go index bb40ddbf94b..27bf639c666 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MFuncPropCommandReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMFuncPropCommandReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MFuncPropCommandReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMFuncPropCommandReq() *CEMI { +// NewMFuncPropCommandReq factory function for MFuncPropCommandReq +func NewMFuncPropCommandReq(size uint16) *CEMI { child := &MFuncPropCommandReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MFuncPropCommandReq) GetTypeName() string { return "MFuncPropCommandReq" } -func (m *MFuncPropCommandReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MFuncPropCommandReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MFuncPropCommandReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MFuncPropCommandReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MFuncPropCommandReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MFuncPropCommandReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MFuncPropCommandReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go index 2bc935c1d34..7053d797b2f 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MFuncPropCon struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMFuncPropCon interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MFuncPropCon) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMFuncPropCon() *CEMI { +// NewMFuncPropCon factory function for MFuncPropCon +func NewMFuncPropCon(size uint16) *CEMI { child := &MFuncPropCon{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MFuncPropCon) GetTypeName() string { return "MFuncPropCon" } -func (m *MFuncPropCon) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MFuncPropCon) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MFuncPropCon) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MFuncPropCon) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MFuncPropCon) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MFuncPropCon) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MFuncPropConParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go index a881a6a02ea..49b946778ae 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MFuncPropStateReadReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMFuncPropStateReadReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MFuncPropStateReadReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMFuncPropStateReadReq() *CEMI { +// NewMFuncPropStateReadReq factory function for MFuncPropStateReadReq +func NewMFuncPropStateReadReq(size uint16) *CEMI { child := &MFuncPropStateReadReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MFuncPropStateReadReq) GetTypeName() string { return "MFuncPropStateReadReq" } -func (m *MFuncPropStateReadReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MFuncPropStateReadReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MFuncPropStateReadReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MFuncPropStateReadReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MFuncPropStateReadReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MFuncPropStateReadReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MFuncPropStateReadReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go index 4f38ea1eed7..bb6735456fa 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MPropInfoInd struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMPropInfoInd interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MPropInfoInd) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMPropInfoInd() *CEMI { +// NewMPropInfoInd factory function for MPropInfoInd +func NewMPropInfoInd(size uint16) *CEMI { child := &MPropInfoInd{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MPropInfoInd) GetTypeName() string { return "MPropInfoInd" } -func (m *MPropInfoInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MPropInfoInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MPropInfoInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MPropInfoInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MPropInfoInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MPropInfoInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MPropInfoIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go index 88c5bd49599..8164f59dbf1 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go @@ -35,6 +35,9 @@ type MPropReadCon struct { NumberOfElements uint8 StartIndex uint16 Data uint16 + + // Arguments. + Size uint16 } // The corresponding interface @@ -51,10 +54,10 @@ type IMPropReadCon interface { GetStartIndex() uint16 // GetData returns Data GetData() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -103,7 +106,8 @@ func (m *MPropReadCon) GetData() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMPropReadCon(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16, data uint16) *CEMI { +// NewMPropReadCon factory function for MPropReadCon +func NewMPropReadCon(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16, data uint16, size uint16) *CEMI { child := &MPropReadCon{ InterfaceObjectType: interfaceObjectType, ObjectInstance: objectInstance, @@ -111,7 +115,7 @@ func NewMPropReadCon(interfaceObjectType uint16, objectInstance uint8, propertyI NumberOfElements: numberOfElements, StartIndex: startIndex, Data: data, - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -140,12 +144,12 @@ func (m *MPropReadCon) GetTypeName() string { return "MPropReadCon" } -func (m *MPropReadCon) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MPropReadCon) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MPropReadCon) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MPropReadCon) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (interfaceObjectType) lengthInBits += 16 @@ -168,8 +172,8 @@ func (m *MPropReadCon) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *MPropReadCon) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MPropReadCon) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MPropReadConParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go index 9f2dcc2f0d3..6a00961f4ea 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go @@ -34,6 +34,9 @@ type MPropReadReq struct { PropertyId uint8 NumberOfElements uint8 StartIndex uint16 + + // Arguments. + Size uint16 } // The corresponding interface @@ -48,10 +51,10 @@ type IMPropReadReq interface { GetNumberOfElements() uint8 // GetStartIndex returns StartIndex GetStartIndex() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -96,14 +99,15 @@ func (m *MPropReadReq) GetStartIndex() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMPropReadReq(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16) *CEMI { +// NewMPropReadReq factory function for MPropReadReq +func NewMPropReadReq(interfaceObjectType uint16, objectInstance uint8, propertyId uint8, numberOfElements uint8, startIndex uint16, size uint16) *CEMI { child := &MPropReadReq{ InterfaceObjectType: interfaceObjectType, ObjectInstance: objectInstance, PropertyId: propertyId, NumberOfElements: numberOfElements, StartIndex: startIndex, - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -132,12 +136,12 @@ func (m *MPropReadReq) GetTypeName() string { return "MPropReadReq" } -func (m *MPropReadReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MPropReadReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MPropReadReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MPropReadReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (interfaceObjectType) lengthInBits += 16 @@ -157,8 +161,8 @@ func (m *MPropReadReq) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *MPropReadReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MPropReadReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MPropReadReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go index 2ad2da64b9b..627745e5f70 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MPropWriteCon struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMPropWriteCon interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MPropWriteCon) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMPropWriteCon() *CEMI { +// NewMPropWriteCon factory function for MPropWriteCon +func NewMPropWriteCon(size uint16) *CEMI { child := &MPropWriteCon{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MPropWriteCon) GetTypeName() string { return "MPropWriteCon" } -func (m *MPropWriteCon) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MPropWriteCon) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MPropWriteCon) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MPropWriteCon) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MPropWriteCon) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MPropWriteCon) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MPropWriteConParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go index c2ab4364e2d..c58d5b31441 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MPropWriteReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMPropWriteReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MPropWriteReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMPropWriteReq() *CEMI { +// NewMPropWriteReq factory function for MPropWriteReq +func NewMPropWriteReq(size uint16) *CEMI { child := &MPropWriteReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MPropWriteReq) GetTypeName() string { return "MPropWriteReq" } -func (m *MPropWriteReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MPropWriteReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MPropWriteReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MPropWriteReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MPropWriteReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MPropWriteReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MPropWriteReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go index ce5c1f85381..2ca0d52fbf6 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MResetInd struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMResetInd interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MResetInd) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMResetInd() *CEMI { +// NewMResetInd factory function for MResetInd +func NewMResetInd(size uint16) *CEMI { child := &MResetInd{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MResetInd) GetTypeName() string { return "MResetInd" } -func (m *MResetInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MResetInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MResetInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MResetInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MResetInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MResetInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MResetIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go index 88c835f59e9..93df5937385 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type MResetReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type IMResetReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *MResetReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewMResetReq() *CEMI { +// NewMResetReq factory function for MResetReq +func NewMResetReq(size uint16) *CEMI { child := &MResetReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *MResetReq) GetTypeName() string { return "MResetReq" } -func (m *MResetReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *MResetReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *MResetReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *MResetReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *MResetReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *MResetReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MResetReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go index 8da41cf49d9..249cb3489d2 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go @@ -38,10 +38,10 @@ type IProjectInstallationIdentifier interface { GetProjectNumber() uint8 // GetInstallationNumber returns InstallationNumber GetInstallationNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ProjectInstallationIdentifier) GetInstallationNumber() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewProjectInstallationIdentifier factory function for ProjectInstallationIdentifier func NewProjectInstallationIdentifier(projectNumber uint8, installationNumber uint8) *ProjectInstallationIdentifier { return &ProjectInstallationIdentifier{ProjectNumber: projectNumber, InstallationNumber: installationNumber} } @@ -82,11 +83,11 @@ func (m *ProjectInstallationIdentifier) GetTypeName() string { return "ProjectInstallationIdentifier" } -func (m *ProjectInstallationIdentifier) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ProjectInstallationIdentifier) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ProjectInstallationIdentifier) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ProjectInstallationIdentifier) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (projectNumber) @@ -98,8 +99,8 @@ func (m *ProjectInstallationIdentifier) LengthInBitsConditional(lastItem bool) u return lengthInBits } -func (m *ProjectInstallationIdentifier) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ProjectInstallationIdentifier) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ProjectInstallationIdentifierParse(readBuffer utils.ReadBuffer) (*ProjectInstallationIdentifier, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go index fa321587dd5..9a2a5714d17 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go @@ -35,10 +35,10 @@ type RelativeTimestamp struct { type IRelativeTimestamp interface { // GetTimestamp returns Timestamp GetTimestamp() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *RelativeTimestamp) GetTimestamp() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewRelativeTimestamp factory function for RelativeTimestamp func NewRelativeTimestamp(timestamp uint16) *RelativeTimestamp { return &RelativeTimestamp{Timestamp: timestamp} } @@ -75,11 +76,11 @@ func (m *RelativeTimestamp) GetTypeName() string { return "RelativeTimestamp" } -func (m *RelativeTimestamp) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *RelativeTimestamp) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *RelativeTimestamp) LengthInBitsConditional(lastItem bool) uint16 { +func (m *RelativeTimestamp) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (timestamp) @@ -88,8 +89,8 @@ func (m *RelativeTimestamp) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *RelativeTimestamp) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *RelativeTimestamp) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func RelativeTimestampParse(readBuffer utils.ReadBuffer) (*RelativeTimestamp, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go index ee0f1011672..664a55cb71b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go @@ -32,10 +32,10 @@ type RoutingIndication struct { // The corresponding interface type IRoutingIndication interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *RoutingIndication) InitializeParent(parent *KnxNetIpMessage) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewRoutingIndication factory function for RoutingIndication func NewRoutingIndication() *KnxNetIpMessage { child := &RoutingIndication{ KnxNetIpMessage: NewKnxNetIpMessage(), @@ -92,18 +93,18 @@ func (m *RoutingIndication) GetTypeName() string { return "RoutingIndication" } -func (m *RoutingIndication) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *RoutingIndication) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *RoutingIndication) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *RoutingIndication) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *RoutingIndication) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *RoutingIndication) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func RoutingIndicationParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go index 96f878e949c..35c6cef9727 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go @@ -36,10 +36,10 @@ type SearchRequest struct { type ISearchRequest interface { // GetHpaiIDiscoveryEndpoint returns HpaiIDiscoveryEndpoint GetHpaiIDiscoveryEndpoint() *HPAIDiscoveryEndpoint - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *SearchRequest) GetHpaiIDiscoveryEndpoint() *HPAIDiscoveryEndpoint { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSearchRequest factory function for SearchRequest func NewSearchRequest(hpaiIDiscoveryEndpoint *HPAIDiscoveryEndpoint) *KnxNetIpMessage { child := &SearchRequest{ HpaiIDiscoveryEndpoint: hpaiIDiscoveryEndpoint, @@ -100,21 +101,21 @@ func (m *SearchRequest) GetTypeName() string { return "SearchRequest" } -func (m *SearchRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SearchRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SearchRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SearchRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (hpaiIDiscoveryEndpoint) - lengthInBits += m.HpaiIDiscoveryEndpoint.LengthInBits() + lengthInBits += m.HpaiIDiscoveryEndpoint.GetLengthInBits() return lengthInBits } -func (m *SearchRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SearchRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SearchRequestParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go index f8dbee415ee..a8af379a862 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go @@ -42,10 +42,10 @@ type ISearchResponse interface { GetDibDeviceInfo() *DIBDeviceInfo // GetDibSuppSvcFamilies returns DibSuppSvcFamilies GetDibSuppSvcFamilies() *DIBSuppSvcFamilies - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *SearchResponse) GetDibSuppSvcFamilies() *DIBSuppSvcFamilies { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSearchResponse factory function for SearchResponse func NewSearchResponse(hpaiControlEndpoint *HPAIControlEndpoint, dibDeviceInfo *DIBDeviceInfo, dibSuppSvcFamilies *DIBSuppSvcFamilies) *KnxNetIpMessage { child := &SearchResponse{ HpaiControlEndpoint: hpaiControlEndpoint, @@ -116,27 +117,27 @@ func (m *SearchResponse) GetTypeName() string { return "SearchResponse" } -func (m *SearchResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SearchResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SearchResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *SearchResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (hpaiControlEndpoint) - lengthInBits += m.HpaiControlEndpoint.LengthInBits() + lengthInBits += m.HpaiControlEndpoint.GetLengthInBits() // Simple field (dibDeviceInfo) - lengthInBits += m.DibDeviceInfo.LengthInBits() + lengthInBits += m.DibDeviceInfo.GetLengthInBits() // Simple field (dibSuppSvcFamilies) - lengthInBits += m.DibSuppSvcFamilies.LengthInBits() + lengthInBits += m.DibSuppSvcFamilies.GetLengthInBits() return lengthInBits } -func (m *SearchResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SearchResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SearchResponseParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go index 896eca35250..5cd6fe690ad 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go @@ -35,10 +35,10 @@ type ServiceId struct { type IServiceId interface { // ServiceType returns ServiceType ServiceType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IServiceIdChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewServiceId factory function for ServiceId func NewServiceId() *ServiceId { return &ServiceId{} } @@ -84,15 +85,15 @@ func (m *ServiceId) GetTypeName() string { return "ServiceId" } -func (m *ServiceId) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ServiceId) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ServiceId) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ServiceId) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ServiceId) ParentLengthInBits() uint16 { +func (m *ServiceId) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (serviceType) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *ServiceId) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ServiceId) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ServiceId) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ServiceIdParse(readBuffer utils.ReadBuffer) (*ServiceId, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/Status.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/Status.go index 604949e7852..35ed8bb3c17 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/Status.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/Status.go @@ -146,12 +146,12 @@ func CastStatus(structType interface{}) Status { return castFunc(structType) } -func (m Status) LengthInBits() uint16 { +func (m Status) GetLengthInBits() uint16 { return 8 } -func (m Status) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m Status) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func StatusParse(readBuffer utils.ReadBuffer) (Status, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SupportedPhysicalMedia.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SupportedPhysicalMedia.go index 14c832926f0..9381499a766 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SupportedPhysicalMedia.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SupportedPhysicalMedia.go @@ -405,12 +405,12 @@ func CastSupportedPhysicalMedia(structType interface{}) SupportedPhysicalMedia { return castFunc(structType) } -func (m SupportedPhysicalMedia) LengthInBits() uint16 { +func (m SupportedPhysicalMedia) GetLengthInBits() uint16 { return 8 } -func (m SupportedPhysicalMedia) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m SupportedPhysicalMedia) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SupportedPhysicalMediaParse(readBuffer utils.ReadBuffer) (SupportedPhysicalMedia, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go index 110b6f12d5e..c334ee9f3ba 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type TDataConnectedInd struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ITDataConnectedInd interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *TDataConnectedInd) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewTDataConnectedInd() *CEMI { +// NewTDataConnectedInd factory function for TDataConnectedInd +func NewTDataConnectedInd(size uint16) *CEMI { child := &TDataConnectedInd{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *TDataConnectedInd) GetTypeName() string { return "TDataConnectedInd" } -func (m *TDataConnectedInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TDataConnectedInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TDataConnectedInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *TDataConnectedInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *TDataConnectedInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TDataConnectedInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TDataConnectedIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go index 2aec7bbcd9f..5b45b53508e 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type TDataConnectedReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ITDataConnectedReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *TDataConnectedReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewTDataConnectedReq() *CEMI { +// NewTDataConnectedReq factory function for TDataConnectedReq +func NewTDataConnectedReq(size uint16) *CEMI { child := &TDataConnectedReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *TDataConnectedReq) GetTypeName() string { return "TDataConnectedReq" } -func (m *TDataConnectedReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TDataConnectedReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TDataConnectedReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *TDataConnectedReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *TDataConnectedReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TDataConnectedReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TDataConnectedReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go index 5b03d2cb862..fa56cdd3e29 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type TDataIndividualInd struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ITDataIndividualInd interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *TDataIndividualInd) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewTDataIndividualInd() *CEMI { +// NewTDataIndividualInd factory function for TDataIndividualInd +func NewTDataIndividualInd(size uint16) *CEMI { child := &TDataIndividualInd{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *TDataIndividualInd) GetTypeName() string { return "TDataIndividualInd" } -func (m *TDataIndividualInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TDataIndividualInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TDataIndividualInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *TDataIndividualInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *TDataIndividualInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TDataIndividualInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TDataIndividualIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go index 7da887b509c..a071962ce38 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go @@ -28,14 +28,17 @@ import ( // The data-structure of this message type TDataIndividualReq struct { *CEMI + + // Arguments. + Size uint16 } // The corresponding interface type ITDataIndividualReq interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,9 +64,10 @@ func (m *TDataIndividualReq) InitializeParent(parent *CEMI) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewTDataIndividualReq() *CEMI { +// NewTDataIndividualReq factory function for TDataIndividualReq +func NewTDataIndividualReq(size uint16) *CEMI { child := &TDataIndividualReq{ - CEMI: NewCEMI(), + CEMI: NewCEMI(size), } child.Child = child return child.CEMI @@ -92,18 +96,18 @@ func (m *TDataIndividualReq) GetTypeName() string { return "TDataIndividualReq" } -func (m *TDataIndividualReq) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TDataIndividualReq) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TDataIndividualReq) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *TDataIndividualReq) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *TDataIndividualReq) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TDataIndividualReq) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TDataIndividualReqParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go index a1a52a9be33..5d1cbdc0383 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go @@ -31,6 +31,9 @@ type TunnelingRequest struct { *KnxNetIpMessage TunnelingRequestDataBlock *TunnelingRequestDataBlock Cemi *CEMI + + // Arguments. + TotalLength uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type ITunnelingRequest interface { GetTunnelingRequestDataBlock() *TunnelingRequestDataBlock // GetCemi returns Cemi GetCemi() *CEMI - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,7 +78,8 @@ func (m *TunnelingRequest) GetCemi() *CEMI { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewTunnelingRequest(tunnelingRequestDataBlock *TunnelingRequestDataBlock, cemi *CEMI) *KnxNetIpMessage { +// NewTunnelingRequest factory function for TunnelingRequest +func NewTunnelingRequest(tunnelingRequestDataBlock *TunnelingRequestDataBlock, cemi *CEMI, totalLength uint16) *KnxNetIpMessage { child := &TunnelingRequest{ TunnelingRequestDataBlock: tunnelingRequestDataBlock, Cemi: cemi, @@ -108,24 +112,24 @@ func (m *TunnelingRequest) GetTypeName() string { return "TunnelingRequest" } -func (m *TunnelingRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TunnelingRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TunnelingRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *TunnelingRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (tunnelingRequestDataBlock) - lengthInBits += m.TunnelingRequestDataBlock.LengthInBits() + lengthInBits += m.TunnelingRequestDataBlock.GetLengthInBits() // Simple field (cemi) - lengthInBits += m.Cemi.LengthInBits() + lengthInBits += m.Cemi.GetLengthInBits() return lengthInBits } -func (m *TunnelingRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TunnelingRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TunnelingRequestParse(readBuffer utils.ReadBuffer, totalLength uint16) (*KnxNetIpMessage, error) { @@ -150,7 +154,7 @@ func TunnelingRequestParse(readBuffer utils.ReadBuffer, totalLength uint16) (*Kn if pullErr := readBuffer.PullContext("cemi"); pullErr != nil { return nil, pullErr } - _cemi, _cemiErr := CEMIParse(readBuffer, uint16(uint16(totalLength)-uint16(uint16(uint16(uint16(6))+uint16(tunnelingRequestDataBlock.LengthInBytes()))))) + _cemi, _cemiErr := CEMIParse(readBuffer, uint16(uint16(totalLength)-uint16(uint16(uint16(uint16(6))+uint16(tunnelingRequestDataBlock.GetLengthInBytes()))))) if _cemiErr != nil { return nil, errors.Wrap(_cemiErr, "Error parsing 'cemi' field") } diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go index db81587efcf..05b647d5f15 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go @@ -39,10 +39,10 @@ type ITunnelingRequestDataBlock interface { GetCommunicationChannelId() uint8 // GetSequenceCounter returns SequenceCounter GetSequenceCounter() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -62,6 +62,7 @@ func (m *TunnelingRequestDataBlock) GetSequenceCounter() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewTunnelingRequestDataBlock factory function for TunnelingRequestDataBlock func NewTunnelingRequestDataBlock(communicationChannelId uint8, sequenceCounter uint8) *TunnelingRequestDataBlock { return &TunnelingRequestDataBlock{CommunicationChannelId: communicationChannelId, SequenceCounter: sequenceCounter} } @@ -83,11 +84,11 @@ func (m *TunnelingRequestDataBlock) GetTypeName() string { return "TunnelingRequestDataBlock" } -func (m *TunnelingRequestDataBlock) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TunnelingRequestDataBlock) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TunnelingRequestDataBlock) LengthInBitsConditional(lastItem bool) uint16 { +func (m *TunnelingRequestDataBlock) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -105,8 +106,8 @@ func (m *TunnelingRequestDataBlock) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *TunnelingRequestDataBlock) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TunnelingRequestDataBlock) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TunnelingRequestDataBlockParse(readBuffer utils.ReadBuffer) (*TunnelingRequestDataBlock, error) { @@ -163,7 +164,7 @@ func (m *TunnelingRequestDataBlock) Serialize(writeBuffer utils.WriteBuffer) err } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go index c4065b0e701..d74dcef8533 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go @@ -36,10 +36,10 @@ type TunnelingResponse struct { type ITunnelingResponse interface { // GetTunnelingResponseDataBlock returns TunnelingResponseDataBlock GetTunnelingResponseDataBlock() *TunnelingResponseDataBlock - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *TunnelingResponse) GetTunnelingResponseDataBlock() *TunnelingResponseDa // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewTunnelingResponse factory function for TunnelingResponse func NewTunnelingResponse(tunnelingResponseDataBlock *TunnelingResponseDataBlock) *KnxNetIpMessage { child := &TunnelingResponse{ TunnelingResponseDataBlock: tunnelingResponseDataBlock, @@ -100,21 +101,21 @@ func (m *TunnelingResponse) GetTypeName() string { return "TunnelingResponse" } -func (m *TunnelingResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TunnelingResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TunnelingResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *TunnelingResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (tunnelingResponseDataBlock) - lengthInBits += m.TunnelingResponseDataBlock.LengthInBits() + lengthInBits += m.TunnelingResponseDataBlock.GetLengthInBits() return lengthInBits } -func (m *TunnelingResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TunnelingResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TunnelingResponseParse(readBuffer utils.ReadBuffer) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go index 584d950b499..3bf59e68f55 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go @@ -41,10 +41,10 @@ type ITunnelingResponseDataBlock interface { GetSequenceCounter() uint8 // GetStatus returns Status GetStatus() Status - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *TunnelingResponseDataBlock) GetStatus() Status { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewTunnelingResponseDataBlock factory function for TunnelingResponseDataBlock func NewTunnelingResponseDataBlock(communicationChannelId uint8, sequenceCounter uint8, status Status) *TunnelingResponseDataBlock { return &TunnelingResponseDataBlock{CommunicationChannelId: communicationChannelId, SequenceCounter: sequenceCounter, Status: status} } @@ -89,11 +90,11 @@ func (m *TunnelingResponseDataBlock) GetTypeName() string { return "TunnelingResponseDataBlock" } -func (m *TunnelingResponseDataBlock) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TunnelingResponseDataBlock) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TunnelingResponseDataBlock) LengthInBitsConditional(lastItem bool) uint16 { +func (m *TunnelingResponseDataBlock) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (structureLength) @@ -111,8 +112,8 @@ func (m *TunnelingResponseDataBlock) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *TunnelingResponseDataBlock) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TunnelingResponseDataBlock) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TunnelingResponseDataBlockParse(readBuffer utils.ReadBuffer) (*TunnelingResponseDataBlock, error) { @@ -168,7 +169,7 @@ func (m *TunnelingResponseDataBlock) Serialize(writeBuffer utils.WriteBuffer) er } // Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - structureLength := uint8(uint8(m.LengthInBytes())) + structureLength := uint8(uint8(m.GetLengthInBytes())) _structureLengthErr := writeBuffer.WriteUint8("structureLength", 8, (structureLength)) if _structureLengthErr != nil { return errors.Wrap(_structureLengthErr, "Error serializing 'structureLength' field") diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go index ee55daf85b3..cd726cf2b57 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go @@ -30,16 +30,19 @@ import ( type UnknownMessage struct { *KnxNetIpMessage UnknownData []byte + + // Arguments. + TotalLength uint16 } // The corresponding interface type IUnknownMessage interface { // GetUnknownData returns UnknownData GetUnknownData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,7 +71,8 @@ func (m *UnknownMessage) GetUnknownData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewUnknownMessage(unknownData []byte) *KnxNetIpMessage { +// NewUnknownMessage factory function for UnknownMessage +func NewUnknownMessage(unknownData []byte, totalLength uint16) *KnxNetIpMessage { child := &UnknownMessage{ UnknownData: unknownData, KnxNetIpMessage: NewKnxNetIpMessage(), @@ -100,12 +104,12 @@ func (m *UnknownMessage) GetTypeName() string { return "UnknownMessage" } -func (m *UnknownMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *UnknownMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *UnknownMessage) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *UnknownMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.UnknownData) > 0 { @@ -115,8 +119,8 @@ func (m *UnknownMessage) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *UnknownMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *UnknownMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func UnknownMessageParse(readBuffer utils.ReadBuffer, totalLength uint16) (*KnxNetIpMessage, error) { diff --git a/plc4go/internal/plc4go/modbus/Connection.go b/plc4go/internal/plc4go/modbus/Connection.go index 0d26174c8bb..9eb0a2b760f 100644 --- a/plc4go/internal/plc4go/modbus/Connection.go +++ b/plc4go/internal/plc4go/modbus/Connection.go @@ -94,7 +94,7 @@ func (m *Connection) Ping() <-chan plc4go.PlcConnectionPingResult { result := make(chan plc4go.PlcConnectionPingResult) go func() { diagnosticRequestPdu := readWriteModel.NewModbusPDUDiagnosticRequest(0, 0x42) - pingRequest := readWriteModel.NewModbusTcpADU(1, m.unitIdentifier, diagnosticRequestPdu) + pingRequest := readWriteModel.NewModbusTcpADU(1, m.unitIdentifier, diagnosticRequestPdu, false) if err := m.messageCodec.SendRequest( pingRequest, func(message interface{}) bool { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/DataItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/DataItem.go index 1fc8b894d40..bda7c71b536 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/DataItem.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/DataItem.go @@ -382,6 +382,14 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataType ModbusDataType, numberO } func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataType ModbusDataType, numberOfValues uint16) error { + m := struct { + DataType ModbusDataType + NumberOfValues uint16 + }{ + DataType: dataType, + NumberOfValues: numberOfValues, + } + _ = m writeBuffer.PushContext("DataItem") switch { case dataType == ModbusDataType_BOOL && numberOfValues == uint16(1): // BOOL @@ -396,7 +404,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_BOOL: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -409,7 +417,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_BYTE: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -422,7 +430,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_WORD: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint16("", 16, value.GetIndex(i).GetUint16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -435,7 +443,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_DWORD: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint32("", 32, value.GetIndex(i).GetUint32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -448,7 +456,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_LWORD: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint64("", 64, value.GetIndex(i).GetUint64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -461,7 +469,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_SINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt8("", 8, value.GetIndex(i).GetInt8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -474,7 +482,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_INT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt16("", 16, value.GetIndex(i).GetInt16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -487,7 +495,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_DINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt32("", 32, value.GetIndex(i).GetInt32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -500,7 +508,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_LINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt64("", 64, value.GetIndex(i).GetInt64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -513,7 +521,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_USINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -526,7 +534,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_UINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint16("", 16, value.GetIndex(i).GetUint16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -539,7 +547,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_UDINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint32("", 32, value.GetIndex(i).GetUint32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -552,7 +560,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_ULINT: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint64("", 64, value.GetIndex(i).GetUint64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -565,7 +573,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_REAL: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteFloat32("", 32, value.GetIndex(i).GetFloat32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -578,7 +586,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_LREAL: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteFloat64("", 64, value.GetIndex(i).GetFloat64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -591,7 +599,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_CHAR: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -604,7 +612,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == ModbusDataType_WCHAR: // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint16("", 16, value.GetIndex(i).GetUint16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusConstants.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusConstants.go index 23ccc059e2d..dc82ec19cb2 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusConstants.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusConstants.go @@ -36,10 +36,10 @@ type ModbusConstants struct { // The corresponding interface type IModbusConstants interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -52,6 +52,7 @@ type IModbusConstants interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusConstants factory function for ModbusConstants func NewModbusConstants() *ModbusConstants { return &ModbusConstants{} } @@ -73,11 +74,11 @@ func (m *ModbusConstants) GetTypeName() string { return "ModbusConstants" } -func (m *ModbusConstants) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusConstants) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusConstants) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusConstants) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Const Field (modbusTcpDefaultPort) @@ -86,8 +87,8 @@ func (m *ModbusConstants) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *ModbusConstants) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusConstants) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusConstantsParse(readBuffer utils.ReadBuffer) (*ModbusConstants, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDataType.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDataType.go index 4f247c0b102..92503d3cd6c 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDataType.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDataType.go @@ -362,12 +362,12 @@ func CastModbusDataType(structType interface{}) ModbusDataType { return castFunc(structType) } -func (m ModbusDataType) LengthInBits() uint16 { +func (m ModbusDataType) GetLengthInBits() uint16 { return 8 } -func (m ModbusDataType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ModbusDataType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusDataTypeParse(readBuffer utils.ReadBuffer) (ModbusDataType, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusErrorCode.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusErrorCode.go index 94d00f44ac9..3ea9c77e71c 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusErrorCode.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusErrorCode.go @@ -134,12 +134,12 @@ func CastModbusErrorCode(structType interface{}) ModbusErrorCode { return castFunc(structType) } -func (m ModbusErrorCode) LengthInBits() uint16 { +func (m ModbusErrorCode) GetLengthInBits() uint16 { return 8 } -func (m ModbusErrorCode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ModbusErrorCode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusErrorCodeParse(readBuffer utils.ReadBuffer) (ModbusErrorCode, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go index aa263326cb3..d21296aa5c7 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go @@ -39,10 +39,10 @@ type IModbusPDU interface { FunctionFlag() uint8 // Response returns Response Response() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -67,6 +67,7 @@ type IModbusPDUChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDU factory function for ModbusPDU func NewModbusPDU() *ModbusPDU { return &ModbusPDU{} } @@ -88,15 +89,15 @@ func (m *ModbusPDU) GetTypeName() string { return "ModbusPDU" } -func (m *ModbusPDU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDU) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *ModbusPDU) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *ModbusPDU) ParentLengthInBits() uint16 { +func (m *ModbusPDU) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (errorFlag) lengthInBits += 1 @@ -106,8 +107,8 @@ func (m *ModbusPDU) ParentLengthInBits() uint16 { return lengthInBits } -func (m *ModbusPDU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go index b402dbaabbf..506bcb27333 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go @@ -39,10 +39,10 @@ type IModbusPDUDiagnosticRequest interface { GetSubFunction() uint16 // GetData returns Data GetData() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUDiagnosticRequest) GetData() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUDiagnosticRequest factory function for ModbusPDUDiagnosticRequest func NewModbusPDUDiagnosticRequest(subFunction uint16, data uint16) *ModbusPDU { child := &ModbusPDUDiagnosticRequest{ SubFunction: subFunction, @@ -124,12 +125,12 @@ func (m *ModbusPDUDiagnosticRequest) GetTypeName() string { return "ModbusPDUDiagnosticRequest" } -func (m *ModbusPDUDiagnosticRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUDiagnosticRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUDiagnosticRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUDiagnosticRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (subFunction) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUDiagnosticRequest) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *ModbusPDUDiagnosticRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUDiagnosticRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUDiagnosticRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go index 630601f89db..508a213c8d9 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go @@ -39,10 +39,10 @@ type IModbusPDUDiagnosticResponse interface { GetSubFunction() uint16 // GetData returns Data GetData() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUDiagnosticResponse) GetData() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUDiagnosticResponse factory function for ModbusPDUDiagnosticResponse func NewModbusPDUDiagnosticResponse(subFunction uint16, data uint16) *ModbusPDU { child := &ModbusPDUDiagnosticResponse{ SubFunction: subFunction, @@ -124,12 +125,12 @@ func (m *ModbusPDUDiagnosticResponse) GetTypeName() string { return "ModbusPDUDiagnosticResponse" } -func (m *ModbusPDUDiagnosticResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUDiagnosticResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUDiagnosticResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUDiagnosticResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (subFunction) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUDiagnosticResponse) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *ModbusPDUDiagnosticResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUDiagnosticResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUDiagnosticResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go index 04c97cf6a52..9b4557d9265 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go @@ -36,10 +36,10 @@ type ModbusPDUError struct { type IModbusPDUError interface { // GetExceptionCode returns ExceptionCode GetExceptionCode() ModbusErrorCode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUError) GetExceptionCode() ModbusErrorCode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUError factory function for ModbusPDUError func NewModbusPDUError(exceptionCode ModbusErrorCode) *ModbusPDU { child := &ModbusPDUError{ ExceptionCode: exceptionCode, @@ -116,12 +117,12 @@ func (m *ModbusPDUError) GetTypeName() string { return "ModbusPDUError" } -func (m *ModbusPDUError) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUError) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUError) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUError) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (exceptionCode) lengthInBits += 8 @@ -129,8 +130,8 @@ func (m *ModbusPDUError) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *ModbusPDUError) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUError) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUErrorParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go index 957a941fa6b..c1c0266a533 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go @@ -32,10 +32,10 @@ type ModbusPDUGetComEventCounterRequest struct { // The corresponding interface type IModbusPDUGetComEventCounterRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,6 +77,7 @@ func (m *ModbusPDUGetComEventCounterRequest) InitializeParent(parent *ModbusPDU) // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUGetComEventCounterRequest factory function for ModbusPDUGetComEventCounterRequest func NewModbusPDUGetComEventCounterRequest() *ModbusPDU { child := &ModbusPDUGetComEventCounterRequest{ ModbusPDU: NewModbusPDU(), @@ -108,18 +109,18 @@ func (m *ModbusPDUGetComEventCounterRequest) GetTypeName() string { return "ModbusPDUGetComEventCounterRequest" } -func (m *ModbusPDUGetComEventCounterRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUGetComEventCounterRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUGetComEventCounterRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUGetComEventCounterRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ModbusPDUGetComEventCounterRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUGetComEventCounterRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUGetComEventCounterRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go index 6ac7ea24f2f..81876ad9dcd 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go @@ -39,10 +39,10 @@ type IModbusPDUGetComEventCounterResponse interface { GetStatus() uint16 // GetEventCount returns EventCount GetEventCount() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUGetComEventCounterResponse) GetEventCount() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUGetComEventCounterResponse factory function for ModbusPDUGetComEventCounterResponse func NewModbusPDUGetComEventCounterResponse(status uint16, eventCount uint16) *ModbusPDU { child := &ModbusPDUGetComEventCounterResponse{ Status: status, @@ -124,12 +125,12 @@ func (m *ModbusPDUGetComEventCounterResponse) GetTypeName() string { return "ModbusPDUGetComEventCounterResponse" } -func (m *ModbusPDUGetComEventCounterResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUGetComEventCounterResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUGetComEventCounterResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUGetComEventCounterResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (status) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUGetComEventCounterResponse) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUGetComEventCounterResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUGetComEventCounterResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUGetComEventCounterResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go index 1cee6096828..7a8bd806f00 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go @@ -32,10 +32,10 @@ type ModbusPDUGetComEventLogRequest struct { // The corresponding interface type IModbusPDUGetComEventLogRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,6 +77,7 @@ func (m *ModbusPDUGetComEventLogRequest) InitializeParent(parent *ModbusPDU) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUGetComEventLogRequest factory function for ModbusPDUGetComEventLogRequest func NewModbusPDUGetComEventLogRequest() *ModbusPDU { child := &ModbusPDUGetComEventLogRequest{ ModbusPDU: NewModbusPDU(), @@ -108,18 +109,18 @@ func (m *ModbusPDUGetComEventLogRequest) GetTypeName() string { return "ModbusPDUGetComEventLogRequest" } -func (m *ModbusPDUGetComEventLogRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUGetComEventLogRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUGetComEventLogRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUGetComEventLogRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ModbusPDUGetComEventLogRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUGetComEventLogRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUGetComEventLogRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go index 9f9c56ef138..c163ec7ceae 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go @@ -45,10 +45,10 @@ type IModbusPDUGetComEventLogResponse interface { GetMessageCount() uint16 // GetEvents returns Events GetEvents() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -105,6 +105,7 @@ func (m *ModbusPDUGetComEventLogResponse) GetEvents() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUGetComEventLogResponse factory function for ModbusPDUGetComEventLogResponse func NewModbusPDUGetComEventLogResponse(status uint16, eventCount uint16, messageCount uint16, events []byte) *ModbusPDU { child := &ModbusPDUGetComEventLogResponse{ Status: status, @@ -140,12 +141,12 @@ func (m *ModbusPDUGetComEventLogResponse) GetTypeName() string { return "ModbusPDUGetComEventLogResponse" } -func (m *ModbusPDUGetComEventLogResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUGetComEventLogResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUGetComEventLogResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUGetComEventLogResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -167,8 +168,8 @@ func (m *ModbusPDUGetComEventLogResponse) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *ModbusPDUGetComEventLogResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUGetComEventLogResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUGetComEventLogResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -233,7 +234,7 @@ func (m *ModbusPDUGetComEventLogResponse) Serialize(writeBuffer utils.WriteBuffe } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(uint8(len(m.Events))) + uint8(uint8(6))) + byteCount := uint8(uint8(uint8(len(m.GetEvents()))) + uint8(uint8(6))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go index 8ef03fce111..0a28732c5ef 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go @@ -42,10 +42,10 @@ type IModbusPDUMaskWriteHoldingRegisterRequest interface { GetAndMask() uint16 // GetOrMask returns OrMask GetOrMask() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -98,6 +98,7 @@ func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetOrMask() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUMaskWriteHoldingRegisterRequest factory function for ModbusPDUMaskWriteHoldingRegisterRequest func NewModbusPDUMaskWriteHoldingRegisterRequest(referenceAddress uint16, andMask uint16, orMask uint16) *ModbusPDU { child := &ModbusPDUMaskWriteHoldingRegisterRequest{ ReferenceAddress: referenceAddress, @@ -132,12 +133,12 @@ func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetTypeName() string { return "ModbusPDUMaskWriteHoldingRegisterRequest" } -func (m *ModbusPDUMaskWriteHoldingRegisterRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUMaskWriteHoldingRegisterRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (referenceAddress) lengthInBits += 16 @@ -151,8 +152,8 @@ func (m *ModbusPDUMaskWriteHoldingRegisterRequest) LengthInBitsConditional(lastI return lengthInBits } -func (m *ModbusPDUMaskWriteHoldingRegisterRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUMaskWriteHoldingRegisterRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go index 9c45c5edbf8..2075e04b793 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go @@ -42,10 +42,10 @@ type IModbusPDUMaskWriteHoldingRegisterResponse interface { GetAndMask() uint16 // GetOrMask returns OrMask GetOrMask() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -98,6 +98,7 @@ func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetOrMask() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUMaskWriteHoldingRegisterResponse factory function for ModbusPDUMaskWriteHoldingRegisterResponse func NewModbusPDUMaskWriteHoldingRegisterResponse(referenceAddress uint16, andMask uint16, orMask uint16) *ModbusPDU { child := &ModbusPDUMaskWriteHoldingRegisterResponse{ ReferenceAddress: referenceAddress, @@ -132,12 +133,12 @@ func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetTypeName() string { return "ModbusPDUMaskWriteHoldingRegisterResponse" } -func (m *ModbusPDUMaskWriteHoldingRegisterResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUMaskWriteHoldingRegisterResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (referenceAddress) lengthInBits += 16 @@ -151,8 +152,8 @@ func (m *ModbusPDUMaskWriteHoldingRegisterResponse) LengthInBitsConditional(last return lengthInBits } -func (m *ModbusPDUMaskWriteHoldingRegisterResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUMaskWriteHoldingRegisterResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go index 5ec24aef21c..664574e01b9 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go @@ -39,10 +39,10 @@ type IModbusPDUReadCoilsRequest interface { GetStartingAddress() uint16 // GetQuantity returns Quantity GetQuantity() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUReadCoilsRequest) GetQuantity() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadCoilsRequest factory function for ModbusPDUReadCoilsRequest func NewModbusPDUReadCoilsRequest(startingAddress uint16, quantity uint16) *ModbusPDU { child := &ModbusPDUReadCoilsRequest{ StartingAddress: startingAddress, @@ -124,12 +125,12 @@ func (m *ModbusPDUReadCoilsRequest) GetTypeName() string { return "ModbusPDUReadCoilsRequest" } -func (m *ModbusPDUReadCoilsRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadCoilsRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadCoilsRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadCoilsRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUReadCoilsRequest) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *ModbusPDUReadCoilsRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadCoilsRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadCoilsRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go index 27c18a671c3..8340e04ed7c 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadCoilsResponse struct { type IModbusPDUReadCoilsResponse interface { // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadCoilsResponse) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadCoilsResponse factory function for ModbusPDUReadCoilsResponse func NewModbusPDUReadCoilsResponse(value []byte) *ModbusPDU { child := &ModbusPDUReadCoilsResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadCoilsResponse) GetTypeName() string { return "ModbusPDUReadCoilsResponse" } -func (m *ModbusPDUReadCoilsResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadCoilsResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadCoilsResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadCoilsResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -134,8 +135,8 @@ func (m *ModbusPDUReadCoilsResponse) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *ModbusPDUReadCoilsResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadCoilsResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadCoilsResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -176,7 +177,7 @@ func (m *ModbusPDUReadCoilsResponse) Serialize(writeBuffer utils.WriteBuffer) er } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go index e1777710905..8c44b8dd96f 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go @@ -32,10 +32,10 @@ type ModbusPDUReadDeviceIdentificationRequest struct { // The corresponding interface type IModbusPDUReadDeviceIdentificationRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,6 +77,7 @@ func (m *ModbusPDUReadDeviceIdentificationRequest) InitializeParent(parent *Modb // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadDeviceIdentificationRequest factory function for ModbusPDUReadDeviceIdentificationRequest func NewModbusPDUReadDeviceIdentificationRequest() *ModbusPDU { child := &ModbusPDUReadDeviceIdentificationRequest{ ModbusPDU: NewModbusPDU(), @@ -108,18 +109,18 @@ func (m *ModbusPDUReadDeviceIdentificationRequest) GetTypeName() string { return "ModbusPDUReadDeviceIdentificationRequest" } -func (m *ModbusPDUReadDeviceIdentificationRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadDeviceIdentificationRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadDeviceIdentificationRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadDeviceIdentificationRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ModbusPDUReadDeviceIdentificationRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadDeviceIdentificationRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadDeviceIdentificationRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go index 64c94a6848a..95d3cf7d302 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go @@ -32,10 +32,10 @@ type ModbusPDUReadDeviceIdentificationResponse struct { // The corresponding interface type IModbusPDUReadDeviceIdentificationResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,6 +77,7 @@ func (m *ModbusPDUReadDeviceIdentificationResponse) InitializeParent(parent *Mod // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadDeviceIdentificationResponse factory function for ModbusPDUReadDeviceIdentificationResponse func NewModbusPDUReadDeviceIdentificationResponse() *ModbusPDU { child := &ModbusPDUReadDeviceIdentificationResponse{ ModbusPDU: NewModbusPDU(), @@ -108,18 +109,18 @@ func (m *ModbusPDUReadDeviceIdentificationResponse) GetTypeName() string { return "ModbusPDUReadDeviceIdentificationResponse" } -func (m *ModbusPDUReadDeviceIdentificationResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadDeviceIdentificationResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadDeviceIdentificationResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadDeviceIdentificationResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ModbusPDUReadDeviceIdentificationResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadDeviceIdentificationResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadDeviceIdentificationResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go index 9eccf015612..a12c51c8909 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go @@ -39,10 +39,10 @@ type IModbusPDUReadDiscreteInputsRequest interface { GetStartingAddress() uint16 // GetQuantity returns Quantity GetQuantity() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUReadDiscreteInputsRequest) GetQuantity() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadDiscreteInputsRequest factory function for ModbusPDUReadDiscreteInputsRequest func NewModbusPDUReadDiscreteInputsRequest(startingAddress uint16, quantity uint16) *ModbusPDU { child := &ModbusPDUReadDiscreteInputsRequest{ StartingAddress: startingAddress, @@ -124,12 +125,12 @@ func (m *ModbusPDUReadDiscreteInputsRequest) GetTypeName() string { return "ModbusPDUReadDiscreteInputsRequest" } -func (m *ModbusPDUReadDiscreteInputsRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadDiscreteInputsRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadDiscreteInputsRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadDiscreteInputsRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUReadDiscreteInputsRequest) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *ModbusPDUReadDiscreteInputsRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadDiscreteInputsRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadDiscreteInputsRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go index 28d8c2a1adc..bc948d6451e 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadDiscreteInputsResponse struct { type IModbusPDUReadDiscreteInputsResponse interface { // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadDiscreteInputsResponse) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadDiscreteInputsResponse factory function for ModbusPDUReadDiscreteInputsResponse func NewModbusPDUReadDiscreteInputsResponse(value []byte) *ModbusPDU { child := &ModbusPDUReadDiscreteInputsResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadDiscreteInputsResponse) GetTypeName() string { return "ModbusPDUReadDiscreteInputsResponse" } -func (m *ModbusPDUReadDiscreteInputsResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadDiscreteInputsResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadDiscreteInputsResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadDiscreteInputsResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -134,8 +135,8 @@ func (m *ModbusPDUReadDiscreteInputsResponse) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUReadDiscreteInputsResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadDiscreteInputsResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadDiscreteInputsResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -176,7 +177,7 @@ func (m *ModbusPDUReadDiscreteInputsResponse) Serialize(writeBuffer utils.WriteB } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go index 7f30253ae7a..f8ef5a9f638 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go @@ -32,10 +32,10 @@ type ModbusPDUReadExceptionStatusRequest struct { // The corresponding interface type IModbusPDUReadExceptionStatusRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,6 +77,7 @@ func (m *ModbusPDUReadExceptionStatusRequest) InitializeParent(parent *ModbusPDU // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadExceptionStatusRequest factory function for ModbusPDUReadExceptionStatusRequest func NewModbusPDUReadExceptionStatusRequest() *ModbusPDU { child := &ModbusPDUReadExceptionStatusRequest{ ModbusPDU: NewModbusPDU(), @@ -108,18 +109,18 @@ func (m *ModbusPDUReadExceptionStatusRequest) GetTypeName() string { return "ModbusPDUReadExceptionStatusRequest" } -func (m *ModbusPDUReadExceptionStatusRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadExceptionStatusRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadExceptionStatusRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadExceptionStatusRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ModbusPDUReadExceptionStatusRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadExceptionStatusRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadExceptionStatusRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go index f1b16715e2a..28cd2970ffc 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadExceptionStatusResponse struct { type IModbusPDUReadExceptionStatusResponse interface { // GetValue returns Value GetValue() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadExceptionStatusResponse) GetValue() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadExceptionStatusResponse factory function for ModbusPDUReadExceptionStatusResponse func NewModbusPDUReadExceptionStatusResponse(value uint8) *ModbusPDU { child := &ModbusPDUReadExceptionStatusResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadExceptionStatusResponse) GetTypeName() string { return "ModbusPDUReadExceptionStatusResponse" } -func (m *ModbusPDUReadExceptionStatusResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadExceptionStatusResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadExceptionStatusResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadExceptionStatusResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (value) lengthInBits += 8 @@ -129,8 +130,8 @@ func (m *ModbusPDUReadExceptionStatusResponse) LengthInBitsConditional(lastItem return lengthInBits } -func (m *ModbusPDUReadExceptionStatusResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadExceptionStatusResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadExceptionStatusResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go index ae8eb84f552..998804af3be 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go @@ -36,10 +36,10 @@ type ModbusPDUReadFifoQueueRequest struct { type IModbusPDUReadFifoQueueRequest interface { // GetFifoPointerAddress returns FifoPointerAddress GetFifoPointerAddress() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadFifoQueueRequest) GetFifoPointerAddress() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadFifoQueueRequest factory function for ModbusPDUReadFifoQueueRequest func NewModbusPDUReadFifoQueueRequest(fifoPointerAddress uint16) *ModbusPDU { child := &ModbusPDUReadFifoQueueRequest{ FifoPointerAddress: fifoPointerAddress, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadFifoQueueRequest) GetTypeName() string { return "ModbusPDUReadFifoQueueRequest" } -func (m *ModbusPDUReadFifoQueueRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadFifoQueueRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadFifoQueueRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadFifoQueueRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (fifoPointerAddress) lengthInBits += 16 @@ -129,8 +130,8 @@ func (m *ModbusPDUReadFifoQueueRequest) LengthInBitsConditional(lastItem bool) u return lengthInBits } -func (m *ModbusPDUReadFifoQueueRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadFifoQueueRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadFifoQueueRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go index c923769b1c1..977ea6d3447 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadFifoQueueResponse struct { type IModbusPDUReadFifoQueueResponse interface { // GetFifoValue returns FifoValue GetFifoValue() []uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadFifoQueueResponse) GetFifoValue() []uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadFifoQueueResponse factory function for ModbusPDUReadFifoQueueResponse func NewModbusPDUReadFifoQueueResponse(fifoValue []uint16) *ModbusPDU { child := &ModbusPDUReadFifoQueueResponse{ FifoValue: fifoValue, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadFifoQueueResponse) GetTypeName() string { return "ModbusPDUReadFifoQueueResponse" } -func (m *ModbusPDUReadFifoQueueResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadFifoQueueResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadFifoQueueResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadFifoQueueResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 16 @@ -137,8 +138,8 @@ func (m *ModbusPDUReadFifoQueueResponse) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *ModbusPDUReadFifoQueueResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadFifoQueueResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadFifoQueueResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -199,14 +200,14 @@ func (m *ModbusPDUReadFifoQueueResponse) Serialize(writeBuffer utils.WriteBuffer } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint16(uint16(uint16(uint16(uint16(len(m.FifoValue)))*uint16(uint16(2)))) + uint16(uint16(2))) + byteCount := uint16(uint16(uint16(uint16(uint16(len(m.GetFifoValue())))*uint16(uint16(2)))) + uint16(uint16(2))) _byteCountErr := writeBuffer.WriteUint16("byteCount", 16, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") } // Implicit Field (fifoCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - fifoCount := uint16(uint16(uint16(uint16(uint16(len(m.FifoValue)))*uint16(uint16(2)))) / uint16(uint16(2))) + fifoCount := uint16(uint16(uint16(uint16(uint16(len(m.GetFifoValue())))*uint16(uint16(2)))) / uint16(uint16(2))) _fifoCountErr := writeBuffer.WriteUint16("fifoCount", 16, (fifoCount)) if _fifoCountErr != nil { return errors.Wrap(_fifoCountErr, "Error serializing 'fifoCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go index bf30e748a01..597e77714a5 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go @@ -36,10 +36,10 @@ type ModbusPDUReadFileRecordRequest struct { type IModbusPDUReadFileRecordRequest interface { // GetItems returns Items GetItems() []*ModbusPDUReadFileRecordRequestItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadFileRecordRequest) GetItems() []*ModbusPDUReadFileRecordRe // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadFileRecordRequest factory function for ModbusPDUReadFileRecordRequest func NewModbusPDUReadFileRecordRequest(items []*ModbusPDUReadFileRecordRequestItem) *ModbusPDU { child := &ModbusPDUReadFileRecordRequest{ Items: items, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadFileRecordRequest) GetTypeName() string { return "ModbusPDUReadFileRecordRequest" } -func (m *ModbusPDUReadFileRecordRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadFileRecordRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadFileRecordRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadFileRecordRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -129,15 +130,15 @@ func (m *ModbusPDUReadFileRecordRequest) LengthInBitsConditional(lastItem bool) // Array field if len(m.Items) > 0 { for _, element := range m.Items { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *ModbusPDUReadFileRecordRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadFileRecordRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadFileRecordRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -190,7 +191,7 @@ func (m *ModbusPDUReadFileRecordRequest) Serialize(writeBuffer utils.WriteBuffer itemsArraySizeInBytes := func(items []*ModbusPDUReadFileRecordRequestItem) uint32 { var sizeInBytes uint32 = 0 for _, v := range items { - sizeInBytes += uint32(v.LengthInBytes()) + sizeInBytes += uint32(v.GetLengthInBytes()) } return sizeInBytes } @@ -200,7 +201,7 @@ func (m *ModbusPDUReadFileRecordRequest) Serialize(writeBuffer utils.WriteBuffer } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items))) + byteCount := uint8(uint8(itemsArraySizeInBytes(m.GetItems()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go index 7f78a31620d..2f2d9b9dd88 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go @@ -44,10 +44,10 @@ type IModbusPDUReadFileRecordRequestItem interface { GetRecordNumber() uint16 // GetRecordLength returns RecordLength GetRecordLength() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *ModbusPDUReadFileRecordRequestItem) GetRecordLength() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadFileRecordRequestItem factory function for ModbusPDUReadFileRecordRequestItem func NewModbusPDUReadFileRecordRequestItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordLength uint16) *ModbusPDUReadFileRecordRequestItem { return &ModbusPDUReadFileRecordRequestItem{ReferenceType: referenceType, FileNumber: fileNumber, RecordNumber: recordNumber, RecordLength: recordLength} } @@ -96,11 +97,11 @@ func (m *ModbusPDUReadFileRecordRequestItem) GetTypeName() string { return "ModbusPDUReadFileRecordRequestItem" } -func (m *ModbusPDUReadFileRecordRequestItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadFileRecordRequestItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadFileRecordRequestItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusPDUReadFileRecordRequestItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (referenceType) @@ -118,8 +119,8 @@ func (m *ModbusPDUReadFileRecordRequestItem) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *ModbusPDUReadFileRecordRequestItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadFileRecordRequestItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadFileRecordRequestItemParse(readBuffer utils.ReadBuffer) (*ModbusPDUReadFileRecordRequestItem, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go index 397394686f4..66fe29e813c 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadFileRecordResponse struct { type IModbusPDUReadFileRecordResponse interface { // GetItems returns Items GetItems() []*ModbusPDUReadFileRecordResponseItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadFileRecordResponse) GetItems() []*ModbusPDUReadFileRecordR // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadFileRecordResponse factory function for ModbusPDUReadFileRecordResponse func NewModbusPDUReadFileRecordResponse(items []*ModbusPDUReadFileRecordResponseItem) *ModbusPDU { child := &ModbusPDUReadFileRecordResponse{ Items: items, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadFileRecordResponse) GetTypeName() string { return "ModbusPDUReadFileRecordResponse" } -func (m *ModbusPDUReadFileRecordResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadFileRecordResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadFileRecordResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadFileRecordResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -129,15 +130,15 @@ func (m *ModbusPDUReadFileRecordResponse) LengthInBitsConditional(lastItem bool) // Array field if len(m.Items) > 0 { for _, element := range m.Items { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *ModbusPDUReadFileRecordResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadFileRecordResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadFileRecordResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -190,7 +191,7 @@ func (m *ModbusPDUReadFileRecordResponse) Serialize(writeBuffer utils.WriteBuffe itemsArraySizeInBytes := func(items []*ModbusPDUReadFileRecordResponseItem) uint32 { var sizeInBytes uint32 = 0 for _, v := range items { - sizeInBytes += uint32(v.LengthInBytes()) + sizeInBytes += uint32(v.GetLengthInBytes()) } return sizeInBytes } @@ -200,7 +201,7 @@ func (m *ModbusPDUReadFileRecordResponse) Serialize(writeBuffer utils.WriteBuffe } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items))) + byteCount := uint8(uint8(itemsArraySizeInBytes(m.GetItems()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go index 439ac38f143..e94114bd49d 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go @@ -38,10 +38,10 @@ type IModbusPDUReadFileRecordResponseItem interface { GetReferenceType() uint8 // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -61,6 +61,7 @@ func (m *ModbusPDUReadFileRecordResponseItem) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadFileRecordResponseItem factory function for ModbusPDUReadFileRecordResponseItem func NewModbusPDUReadFileRecordResponseItem(referenceType uint8, data []byte) *ModbusPDUReadFileRecordResponseItem { return &ModbusPDUReadFileRecordResponseItem{ReferenceType: referenceType, Data: data} } @@ -82,11 +83,11 @@ func (m *ModbusPDUReadFileRecordResponseItem) GetTypeName() string { return "ModbusPDUReadFileRecordResponseItem" } -func (m *ModbusPDUReadFileRecordResponseItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadFileRecordResponseItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadFileRecordResponseItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusPDUReadFileRecordResponseItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Implicit Field (dataLength) @@ -103,8 +104,8 @@ func (m *ModbusPDUReadFileRecordResponseItem) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUReadFileRecordResponseItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadFileRecordResponseItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadFileRecordResponseItemParse(readBuffer utils.ReadBuffer) (*ModbusPDUReadFileRecordResponseItem, error) { @@ -146,7 +147,7 @@ func (m *ModbusPDUReadFileRecordResponseItem) Serialize(writeBuffer utils.WriteB } // Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - dataLength := uint8(uint8(uint8(len(m.Data))) + uint8(uint8(1))) + dataLength := uint8(uint8(uint8(len(m.GetData()))) + uint8(uint8(1))) _dataLengthErr := writeBuffer.WriteUint8("dataLength", 8, (dataLength)) if _dataLengthErr != nil { return errors.Wrap(_dataLengthErr, "Error serializing 'dataLength' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go index 440f9f28109..e374434cfd3 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go @@ -39,10 +39,10 @@ type IModbusPDUReadHoldingRegistersRequest interface { GetStartingAddress() uint16 // GetQuantity returns Quantity GetQuantity() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUReadHoldingRegistersRequest) GetQuantity() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadHoldingRegistersRequest factory function for ModbusPDUReadHoldingRegistersRequest func NewModbusPDUReadHoldingRegistersRequest(startingAddress uint16, quantity uint16) *ModbusPDU { child := &ModbusPDUReadHoldingRegistersRequest{ StartingAddress: startingAddress, @@ -124,12 +125,12 @@ func (m *ModbusPDUReadHoldingRegistersRequest) GetTypeName() string { return "ModbusPDUReadHoldingRegistersRequest" } -func (m *ModbusPDUReadHoldingRegistersRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadHoldingRegistersRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadHoldingRegistersRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadHoldingRegistersRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUReadHoldingRegistersRequest) LengthInBitsConditional(lastItem return lengthInBits } -func (m *ModbusPDUReadHoldingRegistersRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadHoldingRegistersRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadHoldingRegistersRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go index d35ff683453..147d9f336b5 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadHoldingRegistersResponse struct { type IModbusPDUReadHoldingRegistersResponse interface { // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadHoldingRegistersResponse) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadHoldingRegistersResponse factory function for ModbusPDUReadHoldingRegistersResponse func NewModbusPDUReadHoldingRegistersResponse(value []byte) *ModbusPDU { child := &ModbusPDUReadHoldingRegistersResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadHoldingRegistersResponse) GetTypeName() string { return "ModbusPDUReadHoldingRegistersResponse" } -func (m *ModbusPDUReadHoldingRegistersResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadHoldingRegistersResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadHoldingRegistersResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadHoldingRegistersResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -134,8 +135,8 @@ func (m *ModbusPDUReadHoldingRegistersResponse) LengthInBitsConditional(lastItem return lengthInBits } -func (m *ModbusPDUReadHoldingRegistersResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadHoldingRegistersResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadHoldingRegistersResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -176,7 +177,7 @@ func (m *ModbusPDUReadHoldingRegistersResponse) Serialize(writeBuffer utils.Writ } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go index 1ba787f16e0..dd2c30f3d2b 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go @@ -39,10 +39,10 @@ type IModbusPDUReadInputRegistersRequest interface { GetStartingAddress() uint16 // GetQuantity returns Quantity GetQuantity() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUReadInputRegistersRequest) GetQuantity() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadInputRegistersRequest factory function for ModbusPDUReadInputRegistersRequest func NewModbusPDUReadInputRegistersRequest(startingAddress uint16, quantity uint16) *ModbusPDU { child := &ModbusPDUReadInputRegistersRequest{ StartingAddress: startingAddress, @@ -124,12 +125,12 @@ func (m *ModbusPDUReadInputRegistersRequest) GetTypeName() string { return "ModbusPDUReadInputRegistersRequest" } -func (m *ModbusPDUReadInputRegistersRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadInputRegistersRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadInputRegistersRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadInputRegistersRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUReadInputRegistersRequest) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *ModbusPDUReadInputRegistersRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadInputRegistersRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadInputRegistersRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go index b898a66fe5f..4f8e91dd0ca 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadInputRegistersResponse struct { type IModbusPDUReadInputRegistersResponse interface { // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadInputRegistersResponse) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadInputRegistersResponse factory function for ModbusPDUReadInputRegistersResponse func NewModbusPDUReadInputRegistersResponse(value []byte) *ModbusPDU { child := &ModbusPDUReadInputRegistersResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadInputRegistersResponse) GetTypeName() string { return "ModbusPDUReadInputRegistersResponse" } -func (m *ModbusPDUReadInputRegistersResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadInputRegistersResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadInputRegistersResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadInputRegistersResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -134,8 +135,8 @@ func (m *ModbusPDUReadInputRegistersResponse) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUReadInputRegistersResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadInputRegistersResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadInputRegistersResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -176,7 +177,7 @@ func (m *ModbusPDUReadInputRegistersResponse) Serialize(writeBuffer utils.WriteB } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go index 2e3a90f9ebe..4fbaa613b0c 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go @@ -48,10 +48,10 @@ type IModbusPDUReadWriteMultipleHoldingRegistersRequest interface { GetWriteQuantity() uint16 // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -112,6 +112,7 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadWriteMultipleHoldingRegistersRequest factory function for ModbusPDUReadWriteMultipleHoldingRegistersRequest func NewModbusPDUReadWriteMultipleHoldingRegistersRequest(readStartingAddress uint16, readQuantity uint16, writeStartingAddress uint16, writeQuantity uint16, value []byte) *ModbusPDU { child := &ModbusPDUReadWriteMultipleHoldingRegistersRequest{ ReadStartingAddress: readStartingAddress, @@ -148,12 +149,12 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetTypeName() string return "ModbusPDUReadWriteMultipleHoldingRegistersRequest" } -func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (readStartingAddress) lengthInBits += 16 @@ -178,8 +179,8 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) LengthInBitsConditio return lengthInBits } -func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadWriteMultipleHoldingRegistersRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -280,7 +281,7 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) Serialize(writeBuffe } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go index d4753ed81f7..aac51125ce5 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReadWriteMultipleHoldingRegistersResponse struct { type IModbusPDUReadWriteMultipleHoldingRegistersResponse interface { // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReadWriteMultipleHoldingRegistersResponse factory function for ModbusPDUReadWriteMultipleHoldingRegistersResponse func NewModbusPDUReadWriteMultipleHoldingRegistersResponse(value []byte) *ModbusPDU { child := &ModbusPDUReadWriteMultipleHoldingRegistersResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetTypeName() strin return "ModbusPDUReadWriteMultipleHoldingRegistersResponse" } -func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -134,8 +135,8 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) LengthInBitsConditi return lengthInBits } -func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReadWriteMultipleHoldingRegistersResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -176,7 +177,7 @@ func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) Serialize(writeBuff } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go index c3e9eda5dd2..e16402b5acd 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go @@ -32,10 +32,10 @@ type ModbusPDUReportServerIdRequest struct { // The corresponding interface type IModbusPDUReportServerIdRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,6 +77,7 @@ func (m *ModbusPDUReportServerIdRequest) InitializeParent(parent *ModbusPDU) {} // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReportServerIdRequest factory function for ModbusPDUReportServerIdRequest func NewModbusPDUReportServerIdRequest() *ModbusPDU { child := &ModbusPDUReportServerIdRequest{ ModbusPDU: NewModbusPDU(), @@ -108,18 +109,18 @@ func (m *ModbusPDUReportServerIdRequest) GetTypeName() string { return "ModbusPDUReportServerIdRequest" } -func (m *ModbusPDUReportServerIdRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReportServerIdRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReportServerIdRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReportServerIdRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *ModbusPDUReportServerIdRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReportServerIdRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReportServerIdRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go index c9837ca84c8..54a02005744 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go @@ -36,10 +36,10 @@ type ModbusPDUReportServerIdResponse struct { type IModbusPDUReportServerIdResponse interface { // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUReportServerIdResponse) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUReportServerIdResponse factory function for ModbusPDUReportServerIdResponse func NewModbusPDUReportServerIdResponse(value []byte) *ModbusPDU { child := &ModbusPDUReportServerIdResponse{ Value: value, @@ -116,12 +117,12 @@ func (m *ModbusPDUReportServerIdResponse) GetTypeName() string { return "ModbusPDUReportServerIdResponse" } -func (m *ModbusPDUReportServerIdResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUReportServerIdResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUReportServerIdResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUReportServerIdResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -134,8 +135,8 @@ func (m *ModbusPDUReportServerIdResponse) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *ModbusPDUReportServerIdResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUReportServerIdResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUReportServerIdResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -176,7 +177,7 @@ func (m *ModbusPDUReportServerIdResponse) Serialize(writeBuffer utils.WriteBuffe } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go index d493e8dad76..41f7fa7bae2 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go @@ -36,10 +36,10 @@ type ModbusPDUWriteFileRecordRequest struct { type IModbusPDUWriteFileRecordRequest interface { // GetItems returns Items GetItems() []*ModbusPDUWriteFileRecordRequestItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUWriteFileRecordRequest) GetItems() []*ModbusPDUWriteFileRecord // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteFileRecordRequest factory function for ModbusPDUWriteFileRecordRequest func NewModbusPDUWriteFileRecordRequest(items []*ModbusPDUWriteFileRecordRequestItem) *ModbusPDU { child := &ModbusPDUWriteFileRecordRequest{ Items: items, @@ -116,12 +117,12 @@ func (m *ModbusPDUWriteFileRecordRequest) GetTypeName() string { return "ModbusPDUWriteFileRecordRequest" } -func (m *ModbusPDUWriteFileRecordRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteFileRecordRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteFileRecordRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteFileRecordRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -129,15 +130,15 @@ func (m *ModbusPDUWriteFileRecordRequest) LengthInBitsConditional(lastItem bool) // Array field if len(m.Items) > 0 { for _, element := range m.Items { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *ModbusPDUWriteFileRecordRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteFileRecordRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteFileRecordRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -190,7 +191,7 @@ func (m *ModbusPDUWriteFileRecordRequest) Serialize(writeBuffer utils.WriteBuffe itemsArraySizeInBytes := func(items []*ModbusPDUWriteFileRecordRequestItem) uint32 { var sizeInBytes uint32 = 0 for _, v := range items { - sizeInBytes += uint32(v.LengthInBytes()) + sizeInBytes += uint32(v.GetLengthInBytes()) } return sizeInBytes } @@ -200,7 +201,7 @@ func (m *ModbusPDUWriteFileRecordRequest) Serialize(writeBuffer utils.WriteBuffe } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items))) + byteCount := uint8(uint8(itemsArraySizeInBytes(m.GetItems()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go index 963e48215c5..a7fb0ee0f75 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go @@ -44,10 +44,10 @@ type IModbusPDUWriteFileRecordRequestItem interface { GetRecordNumber() uint16 // GetRecordData returns RecordData GetRecordData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *ModbusPDUWriteFileRecordRequestItem) GetRecordData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteFileRecordRequestItem factory function for ModbusPDUWriteFileRecordRequestItem func NewModbusPDUWriteFileRecordRequestItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordData []byte) *ModbusPDUWriteFileRecordRequestItem { return &ModbusPDUWriteFileRecordRequestItem{ReferenceType: referenceType, FileNumber: fileNumber, RecordNumber: recordNumber, RecordData: recordData} } @@ -96,11 +97,11 @@ func (m *ModbusPDUWriteFileRecordRequestItem) GetTypeName() string { return "ModbusPDUWriteFileRecordRequestItem" } -func (m *ModbusPDUWriteFileRecordRequestItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteFileRecordRequestItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteFileRecordRequestItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusPDUWriteFileRecordRequestItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (referenceType) @@ -123,8 +124,8 @@ func (m *ModbusPDUWriteFileRecordRequestItem) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUWriteFileRecordRequestItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteFileRecordRequestItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteFileRecordRequestItemParse(readBuffer utils.ReadBuffer) (*ModbusPDUWriteFileRecordRequestItem, error) { @@ -201,7 +202,7 @@ func (m *ModbusPDUWriteFileRecordRequestItem) Serialize(writeBuffer utils.WriteB } // Implicit Field (recordLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - recordLength := uint16(uint16(uint16(len(m.RecordData))) / uint16(uint16(2))) + recordLength := uint16(uint16(uint16(len(m.GetRecordData()))) / uint16(uint16(2))) _recordLengthErr := writeBuffer.WriteUint16("recordLength", 16, (recordLength)) if _recordLengthErr != nil { return errors.Wrap(_recordLengthErr, "Error serializing 'recordLength' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go index 8b0aacabcbe..10821ef2a33 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go @@ -36,10 +36,10 @@ type ModbusPDUWriteFileRecordResponse struct { type IModbusPDUWriteFileRecordResponse interface { // GetItems returns Items GetItems() []*ModbusPDUWriteFileRecordResponseItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -84,6 +84,7 @@ func (m *ModbusPDUWriteFileRecordResponse) GetItems() []*ModbusPDUWriteFileRecor // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteFileRecordResponse factory function for ModbusPDUWriteFileRecordResponse func NewModbusPDUWriteFileRecordResponse(items []*ModbusPDUWriteFileRecordResponseItem) *ModbusPDU { child := &ModbusPDUWriteFileRecordResponse{ Items: items, @@ -116,12 +117,12 @@ func (m *ModbusPDUWriteFileRecordResponse) GetTypeName() string { return "ModbusPDUWriteFileRecordResponse" } -func (m *ModbusPDUWriteFileRecordResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteFileRecordResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteFileRecordResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteFileRecordResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (byteCount) lengthInBits += 8 @@ -129,15 +130,15 @@ func (m *ModbusPDUWriteFileRecordResponse) LengthInBitsConditional(lastItem bool // Array field if len(m.Items) > 0 { for _, element := range m.Items { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } return lengthInBits } -func (m *ModbusPDUWriteFileRecordResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteFileRecordResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteFileRecordResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -190,7 +191,7 @@ func (m *ModbusPDUWriteFileRecordResponse) Serialize(writeBuffer utils.WriteBuff itemsArraySizeInBytes := func(items []*ModbusPDUWriteFileRecordResponseItem) uint32 { var sizeInBytes uint32 = 0 for _, v := range items { - sizeInBytes += uint32(v.LengthInBytes()) + sizeInBytes += uint32(v.GetLengthInBytes()) } return sizeInBytes } @@ -200,7 +201,7 @@ func (m *ModbusPDUWriteFileRecordResponse) Serialize(writeBuffer utils.WriteBuff } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items))) + byteCount := uint8(uint8(itemsArraySizeInBytes(m.GetItems()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go index c3dd582877a..126a9ea5fa5 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go @@ -44,10 +44,10 @@ type IModbusPDUWriteFileRecordResponseItem interface { GetRecordNumber() uint16 // GetRecordData returns RecordData GetRecordData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *ModbusPDUWriteFileRecordResponseItem) GetRecordData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteFileRecordResponseItem factory function for ModbusPDUWriteFileRecordResponseItem func NewModbusPDUWriteFileRecordResponseItem(referenceType uint8, fileNumber uint16, recordNumber uint16, recordData []byte) *ModbusPDUWriteFileRecordResponseItem { return &ModbusPDUWriteFileRecordResponseItem{ReferenceType: referenceType, FileNumber: fileNumber, RecordNumber: recordNumber, RecordData: recordData} } @@ -96,11 +97,11 @@ func (m *ModbusPDUWriteFileRecordResponseItem) GetTypeName() string { return "ModbusPDUWriteFileRecordResponseItem" } -func (m *ModbusPDUWriteFileRecordResponseItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteFileRecordResponseItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteFileRecordResponseItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusPDUWriteFileRecordResponseItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (referenceType) @@ -123,8 +124,8 @@ func (m *ModbusPDUWriteFileRecordResponseItem) LengthInBitsConditional(lastItem return lengthInBits } -func (m *ModbusPDUWriteFileRecordResponseItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteFileRecordResponseItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteFileRecordResponseItemParse(readBuffer utils.ReadBuffer) (*ModbusPDUWriteFileRecordResponseItem, error) { @@ -201,7 +202,7 @@ func (m *ModbusPDUWriteFileRecordResponseItem) Serialize(writeBuffer utils.Write } // Implicit Field (recordLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - recordLength := uint16(uint16(uint16(len(m.RecordData))) / uint16(uint16(2))) + recordLength := uint16(uint16(uint16(len(m.GetRecordData()))) / uint16(uint16(2))) _recordLengthErr := writeBuffer.WriteUint16("recordLength", 16, (recordLength)) if _recordLengthErr != nil { return errors.Wrap(_recordLengthErr, "Error serializing 'recordLength' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go index 13d94500425..91ef8817575 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go @@ -42,10 +42,10 @@ type IModbusPDUWriteMultipleCoilsRequest interface { GetQuantity() uint16 // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -98,6 +98,7 @@ func (m *ModbusPDUWriteMultipleCoilsRequest) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteMultipleCoilsRequest factory function for ModbusPDUWriteMultipleCoilsRequest func NewModbusPDUWriteMultipleCoilsRequest(startingAddress uint16, quantity uint16, value []byte) *ModbusPDU { child := &ModbusPDUWriteMultipleCoilsRequest{ StartingAddress: startingAddress, @@ -132,12 +133,12 @@ func (m *ModbusPDUWriteMultipleCoilsRequest) GetTypeName() string { return "ModbusPDUWriteMultipleCoilsRequest" } -func (m *ModbusPDUWriteMultipleCoilsRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteMultipleCoilsRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteMultipleCoilsRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteMultipleCoilsRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -156,8 +157,8 @@ func (m *ModbusPDUWriteMultipleCoilsRequest) LengthInBitsConditional(lastItem bo return lengthInBits } -func (m *ModbusPDUWriteMultipleCoilsRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteMultipleCoilsRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteMultipleCoilsRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -228,7 +229,7 @@ func (m *ModbusPDUWriteMultipleCoilsRequest) Serialize(writeBuffer utils.WriteBu } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go index d327b09a215..713186440be 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go @@ -39,10 +39,10 @@ type IModbusPDUWriteMultipleCoilsResponse interface { GetStartingAddress() uint16 // GetQuantity returns Quantity GetQuantity() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUWriteMultipleCoilsResponse) GetQuantity() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteMultipleCoilsResponse factory function for ModbusPDUWriteMultipleCoilsResponse func NewModbusPDUWriteMultipleCoilsResponse(startingAddress uint16, quantity uint16) *ModbusPDU { child := &ModbusPDUWriteMultipleCoilsResponse{ StartingAddress: startingAddress, @@ -124,12 +125,12 @@ func (m *ModbusPDUWriteMultipleCoilsResponse) GetTypeName() string { return "ModbusPDUWriteMultipleCoilsResponse" } -func (m *ModbusPDUWriteMultipleCoilsResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteMultipleCoilsResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteMultipleCoilsResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteMultipleCoilsResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUWriteMultipleCoilsResponse) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUWriteMultipleCoilsResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteMultipleCoilsResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteMultipleCoilsResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go index 5805f0e96a1..34259bdea3f 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go @@ -42,10 +42,10 @@ type IModbusPDUWriteMultipleHoldingRegistersRequest interface { GetQuantity() uint16 // GetValue returns Value GetValue() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -98,6 +98,7 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetValue() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteMultipleHoldingRegistersRequest factory function for ModbusPDUWriteMultipleHoldingRegistersRequest func NewModbusPDUWriteMultipleHoldingRegistersRequest(startingAddress uint16, quantity uint16, value []byte) *ModbusPDU { child := &ModbusPDUWriteMultipleHoldingRegistersRequest{ StartingAddress: startingAddress, @@ -132,12 +133,12 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetTypeName() string { return "ModbusPDUWriteMultipleHoldingRegistersRequest" } -func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -156,8 +157,8 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) LengthInBitsConditional( return lengthInBits } -func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteMultipleHoldingRegistersRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { @@ -228,7 +229,7 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) Serialize(writeBuffer ut } // Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - byteCount := uint8(uint8(len(m.Value))) + byteCount := uint8(uint8(len(m.GetValue()))) _byteCountErr := writeBuffer.WriteUint8("byteCount", 8, (byteCount)) if _byteCountErr != nil { return errors.Wrap(_byteCountErr, "Error serializing 'byteCount' field") diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go index d5ffd368545..e7268416076 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go @@ -39,10 +39,10 @@ type IModbusPDUWriteMultipleHoldingRegistersResponse interface { GetStartingAddress() uint16 // GetQuantity returns Quantity GetQuantity() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetQuantity() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteMultipleHoldingRegistersResponse factory function for ModbusPDUWriteMultipleHoldingRegistersResponse func NewModbusPDUWriteMultipleHoldingRegistersResponse(startingAddress uint16, quantity uint16) *ModbusPDU { child := &ModbusPDUWriteMultipleHoldingRegistersResponse{ StartingAddress: startingAddress, @@ -124,12 +125,12 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetTypeName() string { return "ModbusPDUWriteMultipleHoldingRegistersResponse" } -func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (startingAddress) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) LengthInBitsConditional return lengthInBits } -func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteMultipleHoldingRegistersResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go index b3ddf6b08af..18e3a3e965e 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go @@ -39,10 +39,10 @@ type IModbusPDUWriteSingleCoilRequest interface { GetAddress() uint16 // GetValue returns Value GetValue() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUWriteSingleCoilRequest) GetValue() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteSingleCoilRequest factory function for ModbusPDUWriteSingleCoilRequest func NewModbusPDUWriteSingleCoilRequest(address uint16, value uint16) *ModbusPDU { child := &ModbusPDUWriteSingleCoilRequest{ Address: address, @@ -124,12 +125,12 @@ func (m *ModbusPDUWriteSingleCoilRequest) GetTypeName() string { return "ModbusPDUWriteSingleCoilRequest" } -func (m *ModbusPDUWriteSingleCoilRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteSingleCoilRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteSingleCoilRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteSingleCoilRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (address) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUWriteSingleCoilRequest) LengthInBitsConditional(lastItem bool) return lengthInBits } -func (m *ModbusPDUWriteSingleCoilRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteSingleCoilRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteSingleCoilRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go index 581583ce3cc..4682d8b4d6a 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go @@ -39,10 +39,10 @@ type IModbusPDUWriteSingleCoilResponse interface { GetAddress() uint16 // GetValue returns Value GetValue() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUWriteSingleCoilResponse) GetValue() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteSingleCoilResponse factory function for ModbusPDUWriteSingleCoilResponse func NewModbusPDUWriteSingleCoilResponse(address uint16, value uint16) *ModbusPDU { child := &ModbusPDUWriteSingleCoilResponse{ Address: address, @@ -124,12 +125,12 @@ func (m *ModbusPDUWriteSingleCoilResponse) GetTypeName() string { return "ModbusPDUWriteSingleCoilResponse" } -func (m *ModbusPDUWriteSingleCoilResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteSingleCoilResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteSingleCoilResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteSingleCoilResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (address) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUWriteSingleCoilResponse) LengthInBitsConditional(lastItem bool return lengthInBits } -func (m *ModbusPDUWriteSingleCoilResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteSingleCoilResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteSingleCoilResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go index 31d6e37d163..73f46f670a5 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go @@ -39,10 +39,10 @@ type IModbusPDUWriteSingleRegisterRequest interface { GetAddress() uint16 // GetValue returns Value GetValue() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUWriteSingleRegisterRequest) GetValue() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteSingleRegisterRequest factory function for ModbusPDUWriteSingleRegisterRequest func NewModbusPDUWriteSingleRegisterRequest(address uint16, value uint16) *ModbusPDU { child := &ModbusPDUWriteSingleRegisterRequest{ Address: address, @@ -124,12 +125,12 @@ func (m *ModbusPDUWriteSingleRegisterRequest) GetTypeName() string { return "ModbusPDUWriteSingleRegisterRequest" } -func (m *ModbusPDUWriteSingleRegisterRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteSingleRegisterRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteSingleRegisterRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteSingleRegisterRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (address) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUWriteSingleRegisterRequest) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *ModbusPDUWriteSingleRegisterRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteSingleRegisterRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteSingleRegisterRequestParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go index c184a18cf85..dc50e8a0f39 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go @@ -39,10 +39,10 @@ type IModbusPDUWriteSingleRegisterResponse interface { GetAddress() uint16 // GetValue returns Value GetValue() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *ModbusPDUWriteSingleRegisterResponse) GetValue() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewModbusPDUWriteSingleRegisterResponse factory function for ModbusPDUWriteSingleRegisterResponse func NewModbusPDUWriteSingleRegisterResponse(address uint16, value uint16) *ModbusPDU { child := &ModbusPDUWriteSingleRegisterResponse{ Address: address, @@ -124,12 +125,12 @@ func (m *ModbusPDUWriteSingleRegisterResponse) GetTypeName() string { return "ModbusPDUWriteSingleRegisterResponse" } -func (m *ModbusPDUWriteSingleRegisterResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusPDUWriteSingleRegisterResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusPDUWriteSingleRegisterResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *ModbusPDUWriteSingleRegisterResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (address) lengthInBits += 16 @@ -140,8 +141,8 @@ func (m *ModbusPDUWriteSingleRegisterResponse) LengthInBitsConditional(lastItem return lengthInBits } -func (m *ModbusPDUWriteSingleRegisterResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusPDUWriteSingleRegisterResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusPDUWriteSingleRegisterResponseParse(readBuffer utils.ReadBuffer, response bool) (*ModbusPDU, error) { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go index 304579d5196..e12aea86af6 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go @@ -33,6 +33,9 @@ type ModbusSerialADU struct { Length uint16 Address uint8 Pdu *ModbusPDU + + // Arguments. + Response bool } // The corresponding interface @@ -45,10 +48,10 @@ type IModbusSerialADU interface { GetAddress() uint8 // GetPdu returns Pdu GetPdu() *ModbusPDU - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,8 +79,9 @@ func (m *ModbusSerialADU) GetPdu() *ModbusPDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewModbusSerialADU(transactionId uint16, length uint16, address uint8, pdu *ModbusPDU) *ModbusSerialADU { - return &ModbusSerialADU{TransactionId: transactionId, Length: length, Address: address, Pdu: pdu} +// NewModbusSerialADU factory function for ModbusSerialADU +func NewModbusSerialADU(transactionId uint16, length uint16, address uint8, pdu *ModbusPDU, response bool) *ModbusSerialADU { + return &ModbusSerialADU{TransactionId: transactionId, Length: length, Address: address, Pdu: pdu, Response: response} } func CastModbusSerialADU(structType interface{}) *ModbusSerialADU { @@ -97,11 +101,11 @@ func (m *ModbusSerialADU) GetTypeName() string { return "ModbusSerialADU" } -func (m *ModbusSerialADU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusSerialADU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusSerialADU) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusSerialADU) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (transactionId) @@ -117,13 +121,13 @@ func (m *ModbusSerialADU) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (pdu) - lengthInBits += m.Pdu.LengthInBits() + lengthInBits += m.Pdu.GetLengthInBits() return lengthInBits } -func (m *ModbusSerialADU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusSerialADU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusSerialADUParse(readBuffer utils.ReadBuffer, response bool) (*ModbusSerialADU, error) { @@ -184,7 +188,7 @@ func ModbusSerialADUParse(readBuffer utils.ReadBuffer, response bool) (*ModbusSe } // Create the instance - return NewModbusSerialADU(transactionId, length, address, pdu), nil + return NewModbusSerialADU(transactionId, length, address, pdu, response), nil } func (m *ModbusSerialADU) Serialize(writeBuffer utils.WriteBuffer) error { diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go index 1138f72efe2..6d86b4a2aa7 100644 --- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go +++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go @@ -35,6 +35,9 @@ type ModbusTcpADU struct { TransactionIdentifier uint16 UnitIdentifier uint8 Pdu *ModbusPDU + + // Arguments. + Response bool } // The corresponding interface @@ -45,10 +48,10 @@ type IModbusTcpADU interface { GetUnitIdentifier() uint8 // GetPdu returns Pdu GetPdu() *ModbusPDU - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -72,8 +75,9 @@ func (m *ModbusTcpADU) GetPdu() *ModbusPDU { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewModbusTcpADU(transactionIdentifier uint16, unitIdentifier uint8, pdu *ModbusPDU) *ModbusTcpADU { - return &ModbusTcpADU{TransactionIdentifier: transactionIdentifier, UnitIdentifier: unitIdentifier, Pdu: pdu} +// NewModbusTcpADU factory function for ModbusTcpADU +func NewModbusTcpADU(transactionIdentifier uint16, unitIdentifier uint8, pdu *ModbusPDU, response bool) *ModbusTcpADU { + return &ModbusTcpADU{TransactionIdentifier: transactionIdentifier, UnitIdentifier: unitIdentifier, Pdu: pdu, Response: response} } func CastModbusTcpADU(structType interface{}) *ModbusTcpADU { @@ -93,11 +97,11 @@ func (m *ModbusTcpADU) GetTypeName() string { return "ModbusTcpADU" } -func (m *ModbusTcpADU) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *ModbusTcpADU) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *ModbusTcpADU) LengthInBitsConditional(lastItem bool) uint16 { +func (m *ModbusTcpADU) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (transactionIdentifier) @@ -113,13 +117,13 @@ func (m *ModbusTcpADU) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 8 // Simple field (pdu) - lengthInBits += m.Pdu.LengthInBits() + lengthInBits += m.Pdu.GetLengthInBits() return lengthInBits } -func (m *ModbusTcpADU) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *ModbusTcpADU) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModbusTcpADUParse(readBuffer utils.ReadBuffer, response bool) (*ModbusTcpADU, error) { @@ -175,7 +179,7 @@ func ModbusTcpADUParse(readBuffer utils.ReadBuffer, response bool) (*ModbusTcpAD } // Create the instance - return NewModbusTcpADU(transactionIdentifier, unitIdentifier, pdu), nil + return NewModbusTcpADU(transactionIdentifier, unitIdentifier, pdu, response), nil } func (m *ModbusTcpADU) Serialize(writeBuffer utils.WriteBuffer) error { @@ -197,7 +201,7 @@ func (m *ModbusTcpADU) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - length := uint16(uint16(m.Pdu.LengthInBytes()) + uint16(uint16(1))) + length := uint16(uint16(m.GetPdu().GetLengthInBytes()) + uint16(uint16(1))) _lengthErr := writeBuffer.WriteUint16("length", 16, (length)) if _lengthErr != nil { return errors.Wrap(_lengthErr, "Error serializing 'length' field") diff --git a/plc4go/internal/plc4go/s7/Connection.go b/plc4go/internal/plc4go/s7/Connection.go index 9ebe67ef990..1eed816261a 100644 --- a/plc4go/internal/plc4go/s7/Connection.go +++ b/plc4go/internal/plc4go/s7/Connection.go @@ -388,9 +388,10 @@ func (m *Connection) createIdentifyRemoteMessage() *readWriteModel.TPKTPacket { readWriteModel.DataTransportSize_OCTET_STRING, ), }, + *readWriteModel.NewS7Parameter(), ), ) - cotpPacketData := readWriteModel.NewCOTPPacketData(true, 2, nil, identifyRemoteMessage) + cotpPacketData := readWriteModel.NewCOTPPacketData(true, 2, nil, identifyRemoteMessage, 0) return readWriteModel.NewTPKTPacket(cotpPacketData) } @@ -418,7 +419,7 @@ func (m *Connection) createS7ConnectionRequest(cotpPacketConnectionResponse *rea m.driverContext.MaxAmqCaller, m.driverContext.MaxAmqCallee, m.driverContext.PduSize, ) s7Message := readWriteModel.NewS7MessageRequest(0, s7ParameterSetupCommunication, nil) - cotpPacketData := readWriteModel.NewCOTPPacketData(true, 1, nil, s7Message) + cotpPacketData := readWriteModel.NewCOTPPacketData(true, 1, nil, s7Message, 0) return readWriteModel.NewTPKTPacket(cotpPacketData) } @@ -428,11 +429,12 @@ func (m *Connection) createCOTPConnectionRequest() *readWriteModel.COTPPacket { 0x000F, readWriteModel.COTPProtocolClass_CLASS_0, []*readWriteModel.COTPParameter{ - readWriteModel.NewCOTPParameterCalledTsap(m.driverContext.CalledTsapId), - readWriteModel.NewCOTPParameterCallingTsap(m.driverContext.CallingTsapId), - readWriteModel.NewCOTPParameterTpduSize(m.driverContext.CotpTpduSize), + readWriteModel.NewCOTPParameterCalledTsap(m.driverContext.CalledTsapId, 0), + readWriteModel.NewCOTPParameterCallingTsap(m.driverContext.CallingTsapId, 0), + readWriteModel.NewCOTPParameterTpduSize(m.driverContext.CotpTpduSize, 0), }, nil, + 0, ) } diff --git a/plc4go/internal/plc4go/s7/Reader.go b/plc4go/internal/plc4go/s7/Reader.go index 0c44f159a46..0cae6da8825 100644 --- a/plc4go/internal/plc4go/s7/Reader.go +++ b/plc4go/internal/plc4go/s7/Reader.go @@ -88,6 +88,7 @@ func (m *Reader) Read(readRequest model.PlcReadRequest) <-chan model.PlcReadRequ uint8(tpduId), nil, s7MessageRequest, + 0, ), ) // Start a new request-transaction (Is ended in the response-handler) diff --git a/plc4go/internal/plc4go/s7/Writer.go b/plc4go/internal/plc4go/s7/Writer.go index 7d59a7451cf..a4a7491f374 100644 --- a/plc4go/internal/plc4go/s7/Writer.go +++ b/plc4go/internal/plc4go/s7/Writer.go @@ -80,7 +80,7 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR s7MessageRequest := readWriteModel.NewS7MessageRequest( tpduId, readWriteModel.NewS7ParameterWriteVarRequest(parameterItems), - readWriteModel.NewS7PayloadWriteVarRequest(payloadItems), + readWriteModel.NewS7PayloadWriteVarRequest(payloadItems, *readWriteModel.NewS7Parameter()), ) // Assemble the finished paket @@ -92,6 +92,7 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR uint8(tpduId), nil, s7MessageRequest, + 0, ), ) diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go index 2cff89986c0..bef255cb687 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go @@ -54,10 +54,10 @@ type IAlarmMessageAckObjectPushType interface { GetAckStateGoing() *State // GetAckStateComing returns AckStateComing GetAckStateComing() *State - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -93,6 +93,7 @@ func (m *AlarmMessageAckObjectPushType) GetAckStateComing() *State { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageAckObjectPushType factory function for AlarmMessageAckObjectPushType func NewAlarmMessageAckObjectPushType(lengthSpec uint8, syntaxId SyntaxIdType, numberOfValues uint8, eventId uint32, ackStateGoing *State, ackStateComing *State) *AlarmMessageAckObjectPushType { return &AlarmMessageAckObjectPushType{LengthSpec: lengthSpec, SyntaxId: syntaxId, NumberOfValues: numberOfValues, EventId: eventId, AckStateGoing: ackStateGoing, AckStateComing: ackStateComing} } @@ -114,11 +115,11 @@ func (m *AlarmMessageAckObjectPushType) GetTypeName() string { return "AlarmMessageAckObjectPushType" } -func (m *AlarmMessageAckObjectPushType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageAckObjectPushType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageAckObjectPushType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageAckObjectPushType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Const Field (variableSpec) @@ -137,16 +138,16 @@ func (m *AlarmMessageAckObjectPushType) LengthInBitsConditional(lastItem bool) u lengthInBits += 32 // Simple field (ackStateGoing) - lengthInBits += m.AckStateGoing.LengthInBits() + lengthInBits += m.AckStateGoing.GetLengthInBits() // Simple field (ackStateComing) - lengthInBits += m.AckStateComing.LengthInBits() + lengthInBits += m.AckStateComing.GetLengthInBits() return lengthInBits } -func (m *AlarmMessageAckObjectPushType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageAckObjectPushType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageAckObjectPushTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageAckObjectPushType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go index 28f384e14b2..44d7df3062a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go @@ -44,10 +44,10 @@ type IAlarmMessageAckPushType interface { GetNumberOfObjects() uint8 // GetMessageObjects returns MessageObjects GetMessageObjects() []*AlarmMessageAckObjectPushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *AlarmMessageAckPushType) GetMessageObjects() []*AlarmMessageAckObjectPu // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageAckPushType factory function for AlarmMessageAckPushType func NewAlarmMessageAckPushType(TimeStamp *DateAndTime, functionId uint8, numberOfObjects uint8, messageObjects []*AlarmMessageAckObjectPushType) *AlarmMessageAckPushType { return &AlarmMessageAckPushType{TimeStamp: TimeStamp, FunctionId: functionId, NumberOfObjects: numberOfObjects, MessageObjects: messageObjects} } @@ -96,15 +97,15 @@ func (m *AlarmMessageAckPushType) GetTypeName() string { return "AlarmMessageAckPushType" } -func (m *AlarmMessageAckPushType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageAckPushType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageAckPushType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageAckPushType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (TimeStamp) - lengthInBits += m.TimeStamp.LengthInBits() + lengthInBits += m.TimeStamp.GetLengthInBits() // Simple field (functionId) lengthInBits += 8 @@ -116,15 +117,15 @@ func (m *AlarmMessageAckPushType) LengthInBitsConditional(lastItem bool) uint16 if len(m.MessageObjects) > 0 { for i, element := range m.MessageObjects { last := i == len(m.MessageObjects)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AlarmMessageAckPushType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageAckPushType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageAckPushTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageAckPushType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go index 831d26737ba..db058907087 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go @@ -41,10 +41,10 @@ type IAlarmMessageAckResponseType interface { GetNumberOfObjects() uint8 // GetMessageObjects returns MessageObjects GetMessageObjects() []uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *AlarmMessageAckResponseType) GetMessageObjects() []uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageAckResponseType factory function for AlarmMessageAckResponseType func NewAlarmMessageAckResponseType(functionId uint8, numberOfObjects uint8, messageObjects []uint8) *AlarmMessageAckResponseType { return &AlarmMessageAckResponseType{FunctionId: functionId, NumberOfObjects: numberOfObjects, MessageObjects: messageObjects} } @@ -89,11 +90,11 @@ func (m *AlarmMessageAckResponseType) GetTypeName() string { return "AlarmMessageAckResponseType" } -func (m *AlarmMessageAckResponseType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageAckResponseType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageAckResponseType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageAckResponseType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (functionId) @@ -110,8 +111,8 @@ func (m *AlarmMessageAckResponseType) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *AlarmMessageAckResponseType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageAckResponseType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageAckResponseTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageAckResponseType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go index 85a2fae4cbf..1663150dea0 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go @@ -41,10 +41,10 @@ type IAlarmMessageAckType interface { GetNumberOfObjects() uint8 // GetMessageObjects returns MessageObjects GetMessageObjects() []*AlarmMessageObjectAckType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *AlarmMessageAckType) GetMessageObjects() []*AlarmMessageObjectAckType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageAckType factory function for AlarmMessageAckType func NewAlarmMessageAckType(functionId uint8, numberOfObjects uint8, messageObjects []*AlarmMessageObjectAckType) *AlarmMessageAckType { return &AlarmMessageAckType{FunctionId: functionId, NumberOfObjects: numberOfObjects, MessageObjects: messageObjects} } @@ -89,11 +90,11 @@ func (m *AlarmMessageAckType) GetTypeName() string { return "AlarmMessageAckType" } -func (m *AlarmMessageAckType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageAckType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageAckType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageAckType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (functionId) @@ -106,15 +107,15 @@ func (m *AlarmMessageAckType) LengthInBitsConditional(lastItem bool) uint16 { if len(m.MessageObjects) > 0 { for i, element := range m.MessageObjects { last := i == len(m.MessageObjects)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AlarmMessageAckType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageAckType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageAckTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageAckType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go index 6cd7dfc4dbe..dd54492e6d1 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go @@ -52,10 +52,10 @@ type IAlarmMessageObjectAckType interface { GetAckStateGoing() *State // GetAckStateComing returns AckStateComing GetAckStateComing() *State - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *AlarmMessageObjectAckType) GetAckStateComing() *State { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageObjectAckType factory function for AlarmMessageObjectAckType func NewAlarmMessageObjectAckType(syntaxId SyntaxIdType, numberOfValues uint8, eventId uint32, ackStateGoing *State, ackStateComing *State) *AlarmMessageObjectAckType { return &AlarmMessageObjectAckType{SyntaxId: syntaxId, NumberOfValues: numberOfValues, EventId: eventId, AckStateGoing: ackStateGoing, AckStateComing: ackStateComing} } @@ -108,11 +109,11 @@ func (m *AlarmMessageObjectAckType) GetTypeName() string { return "AlarmMessageObjectAckType" } -func (m *AlarmMessageObjectAckType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageObjectAckType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageObjectAckType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageObjectAckType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Const Field (variableSpec) @@ -131,16 +132,16 @@ func (m *AlarmMessageObjectAckType) LengthInBitsConditional(lastItem bool) uint1 lengthInBits += 32 // Simple field (ackStateGoing) - lengthInBits += m.AckStateGoing.LengthInBits() + lengthInBits += m.AckStateGoing.GetLengthInBits() // Simple field (ackStateComing) - lengthInBits += m.AckStateComing.LengthInBits() + lengthInBits += m.AckStateComing.GetLengthInBits() return lengthInBits } -func (m *AlarmMessageObjectAckType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageObjectAckType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageObjectAckTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageObjectAckType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go index 5ff15e2929a..72baf009020 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go @@ -63,10 +63,10 @@ type IAlarmMessageObjectPushType interface { GetAckStateComing() *State // GetAssociatedValues returns AssociatedValues GetAssociatedValues() []*AssociatedValueType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -114,6 +114,7 @@ func (m *AlarmMessageObjectPushType) GetAssociatedValues() []*AssociatedValueTyp // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageObjectPushType factory function for AlarmMessageObjectPushType func NewAlarmMessageObjectPushType(lengthSpec uint8, syntaxId SyntaxIdType, numberOfValues uint8, eventId uint32, eventState *State, localState *State, ackStateGoing *State, ackStateComing *State, AssociatedValues []*AssociatedValueType) *AlarmMessageObjectPushType { return &AlarmMessageObjectPushType{LengthSpec: lengthSpec, SyntaxId: syntaxId, NumberOfValues: numberOfValues, EventId: eventId, EventState: eventState, LocalState: localState, AckStateGoing: ackStateGoing, AckStateComing: ackStateComing, AssociatedValues: AssociatedValues} } @@ -135,11 +136,11 @@ func (m *AlarmMessageObjectPushType) GetTypeName() string { return "AlarmMessageObjectPushType" } -func (m *AlarmMessageObjectPushType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageObjectPushType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageObjectPushType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageObjectPushType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Const Field (variableSpec) @@ -158,30 +159,30 @@ func (m *AlarmMessageObjectPushType) LengthInBitsConditional(lastItem bool) uint lengthInBits += 32 // Simple field (eventState) - lengthInBits += m.EventState.LengthInBits() + lengthInBits += m.EventState.GetLengthInBits() // Simple field (localState) - lengthInBits += m.LocalState.LengthInBits() + lengthInBits += m.LocalState.GetLengthInBits() // Simple field (ackStateGoing) - lengthInBits += m.AckStateGoing.LengthInBits() + lengthInBits += m.AckStateGoing.GetLengthInBits() // Simple field (ackStateComing) - lengthInBits += m.AckStateComing.LengthInBits() + lengthInBits += m.AckStateComing.GetLengthInBits() // Array field if len(m.AssociatedValues) > 0 { for i, element := range m.AssociatedValues { last := i == len(m.AssociatedValues)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AlarmMessageObjectPushType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageObjectPushType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageObjectPushTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageObjectPushType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go index e0f35da6c2b..5a92df0ea66 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go @@ -61,10 +61,10 @@ type IAlarmMessageObjectQueryType interface { GetTimeGoing() *DateAndTime // GetValueGoing returns ValueGoing GetValueGoing() *AssociatedValueType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -108,6 +108,7 @@ func (m *AlarmMessageObjectQueryType) GetValueGoing() *AssociatedValueType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageObjectQueryType factory function for AlarmMessageObjectQueryType func NewAlarmMessageObjectQueryType(lengthDataset uint8, eventState *State, ackStateGoing *State, ackStateComing *State, timeComing *DateAndTime, valueComing *AssociatedValueType, timeGoing *DateAndTime, valueGoing *AssociatedValueType) *AlarmMessageObjectQueryType { return &AlarmMessageObjectQueryType{LengthDataset: lengthDataset, EventState: eventState, AckStateGoing: ackStateGoing, AckStateComing: ackStateComing, TimeComing: timeComing, ValueComing: valueComing, TimeGoing: timeGoing, ValueGoing: valueGoing} } @@ -129,11 +130,11 @@ func (m *AlarmMessageObjectQueryType) GetTypeName() string { return "AlarmMessageObjectQueryType" } -func (m *AlarmMessageObjectQueryType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageObjectQueryType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageObjectQueryType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageObjectQueryType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (lengthDataset) @@ -146,31 +147,31 @@ func (m *AlarmMessageObjectQueryType) LengthInBitsConditional(lastItem bool) uin lengthInBits += 8 // Simple field (eventState) - lengthInBits += m.EventState.LengthInBits() + lengthInBits += m.EventState.GetLengthInBits() // Simple field (ackStateGoing) - lengthInBits += m.AckStateGoing.LengthInBits() + lengthInBits += m.AckStateGoing.GetLengthInBits() // Simple field (ackStateComing) - lengthInBits += m.AckStateComing.LengthInBits() + lengthInBits += m.AckStateComing.GetLengthInBits() // Simple field (timeComing) - lengthInBits += m.TimeComing.LengthInBits() + lengthInBits += m.TimeComing.GetLengthInBits() // Simple field (valueComing) - lengthInBits += m.ValueComing.LengthInBits() + lengthInBits += m.ValueComing.GetLengthInBits() // Simple field (timeGoing) - lengthInBits += m.TimeGoing.LengthInBits() + lengthInBits += m.TimeGoing.GetLengthInBits() // Simple field (valueGoing) - lengthInBits += m.ValueGoing.LengthInBits() + lengthInBits += m.ValueGoing.GetLengthInBits() return lengthInBits } -func (m *AlarmMessageObjectQueryType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageObjectQueryType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageObjectQueryTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageObjectQueryType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go index c14983306cd..4b13212110c 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go @@ -44,10 +44,10 @@ type IAlarmMessagePushType interface { GetNumberOfObjects() uint8 // GetMessageObjects returns MessageObjects GetMessageObjects() []*AlarmMessageObjectPushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *AlarmMessagePushType) GetMessageObjects() []*AlarmMessageObjectPushType // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessagePushType factory function for AlarmMessagePushType func NewAlarmMessagePushType(TimeStamp *DateAndTime, functionId uint8, numberOfObjects uint8, messageObjects []*AlarmMessageObjectPushType) *AlarmMessagePushType { return &AlarmMessagePushType{TimeStamp: TimeStamp, FunctionId: functionId, NumberOfObjects: numberOfObjects, MessageObjects: messageObjects} } @@ -96,15 +97,15 @@ func (m *AlarmMessagePushType) GetTypeName() string { return "AlarmMessagePushType" } -func (m *AlarmMessagePushType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessagePushType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessagePushType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessagePushType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (TimeStamp) - lengthInBits += m.TimeStamp.LengthInBits() + lengthInBits += m.TimeStamp.GetLengthInBits() // Simple field (functionId) lengthInBits += 8 @@ -116,15 +117,15 @@ func (m *AlarmMessagePushType) LengthInBitsConditional(lastItem bool) uint16 { if len(m.MessageObjects) > 0 { for i, element := range m.MessageObjects { last := i == len(m.MessageObjects)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AlarmMessagePushType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessagePushType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessagePushTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessagePushType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go index e6ef2c7962d..fd96532c1be 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go @@ -51,10 +51,10 @@ type IAlarmMessageQueryType interface { GetTransportSize() DataTransportSize // GetMessageObjects returns MessageObjects GetMessageObjects() []*AlarmMessageObjectQueryType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -86,6 +86,7 @@ func (m *AlarmMessageQueryType) GetMessageObjects() []*AlarmMessageObjectQueryTy // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAlarmMessageQueryType factory function for AlarmMessageQueryType func NewAlarmMessageQueryType(functionId uint8, numberOfObjects uint8, returnCode DataTransportErrorCode, transportSize DataTransportSize, messageObjects []*AlarmMessageObjectQueryType) *AlarmMessageQueryType { return &AlarmMessageQueryType{FunctionId: functionId, NumberOfObjects: numberOfObjects, ReturnCode: returnCode, TransportSize: transportSize, MessageObjects: messageObjects} } @@ -107,11 +108,11 @@ func (m *AlarmMessageQueryType) GetTypeName() string { return "AlarmMessageQueryType" } -func (m *AlarmMessageQueryType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AlarmMessageQueryType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AlarmMessageQueryType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AlarmMessageQueryType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (functionId) @@ -133,15 +134,15 @@ func (m *AlarmMessageQueryType) LengthInBitsConditional(lastItem bool) uint16 { if len(m.MessageObjects) > 0 { for i, element := range m.MessageObjects { last := i == len(m.MessageObjects)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *AlarmMessageQueryType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AlarmMessageQueryType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmMessageQueryTypeParse(readBuffer utils.ReadBuffer) (*AlarmMessageQueryType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmStateType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmStateType.go index 94df2dc026a..50331e17138 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmStateType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmStateType.go @@ -110,12 +110,12 @@ func CastAlarmStateType(structType interface{}) AlarmStateType { return castFunc(structType) } -func (m AlarmStateType) LengthInBits() uint16 { +func (m AlarmStateType) GetLengthInBits() uint16 { return 8 } -func (m AlarmStateType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m AlarmStateType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmStateTypeParse(readBuffer utils.ReadBuffer) (AlarmStateType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmType.go index df4e0dd8c60..e943a020ddb 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmType.go @@ -92,12 +92,12 @@ func CastAlarmType(structType interface{}) AlarmType { return castFunc(structType) } -func (m AlarmType) LengthInBits() uint16 { +func (m AlarmType) GetLengthInBits() uint16 { return 8 } -func (m AlarmType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m AlarmType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AlarmTypeParse(readBuffer utils.ReadBuffer) (AlarmType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go b/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go index 9e2e0db9467..3ef1d9956a6 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go @@ -44,10 +44,10 @@ type IAssociatedValueType interface { GetValueLength() uint16 // GetData returns Data GetData() []uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -75,6 +75,7 @@ func (m *AssociatedValueType) GetData() []uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewAssociatedValueType factory function for AssociatedValueType func NewAssociatedValueType(returnCode DataTransportErrorCode, transportSize DataTransportSize, valueLength uint16, data []uint8) *AssociatedValueType { return &AssociatedValueType{ReturnCode: returnCode, TransportSize: transportSize, ValueLength: valueLength, Data: data} } @@ -96,11 +97,11 @@ func (m *AssociatedValueType) GetTypeName() string { return "AssociatedValueType" } -func (m *AssociatedValueType) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *AssociatedValueType) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *AssociatedValueType) LengthInBitsConditional(lastItem bool) uint16 { +func (m *AssociatedValueType) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (returnCode) @@ -120,8 +121,8 @@ func (m *AssociatedValueType) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *AssociatedValueType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *AssociatedValueType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func AssociatedValueTypeParse(readBuffer utils.ReadBuffer) (*AssociatedValueType, error) { @@ -218,7 +219,7 @@ func (m *AssociatedValueType) Serialize(writeBuffer utils.WriteBuffer) error { } // Manual Field (valueLength) - _valueLengthErr := LeftShift3(writeBuffer, m.ValueLength) + _valueLengthErr := LeftShift3(writeBuffer, m.GetValueLength()) if _valueLengthErr != nil { return errors.Wrap(_valueLengthErr, "Error serializing 'valueLength' field") } diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go index 7264f45fa48..86e9a62eeb7 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go @@ -31,7 +31,10 @@ import ( type COTPPacket struct { Parameters []*COTPParameter Payload *S7Message - Child ICOTPPacketChild + + // Arguments. + CotpLen uint16 + Child ICOTPPacketChild } // The corresponding interface @@ -42,10 +45,10 @@ type ICOTPPacket interface { GetParameters() []*COTPParameter // GetPayload returns Payload GetPayload() *S7Message - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -77,8 +80,9 @@ func (m *COTPPacket) GetPayload() *S7Message { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacket(parameters []*COTPParameter, payload *S7Message) *COTPPacket { - return &COTPPacket{Parameters: parameters, Payload: payload} +// NewCOTPPacket factory function for COTPPacket +func NewCOTPPacket(parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { + return &COTPPacket{Parameters: parameters, Payload: payload, CotpLen: cotpLen} } func CastCOTPPacket(structType interface{}) *COTPPacket { @@ -98,15 +102,15 @@ func (m *COTPPacket) GetTypeName() string { return "COTPPacket" } -func (m *COTPPacket) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacket) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacket) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *COTPPacket) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *COTPPacket) ParentLengthInBits() uint16 { +func (m *COTPPacket) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Implicit Field (headerLength) @@ -117,20 +121,20 @@ func (m *COTPPacket) ParentLengthInBits() uint16 { // Array field if len(m.Parameters) > 0 { for _, element := range m.Parameters { - lengthInBits += element.LengthInBits() + lengthInBits += element.GetLengthInBits() } } // Optional Field (payload) if m.Payload != nil { - lengthInBits += (*m.Payload).LengthInBits() + lengthInBits += (*m.Payload).GetLengthInBits() } return lengthInBits } -func (m *COTPPacket) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacket) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { @@ -241,7 +245,7 @@ func (m *COTPPacket) SerializeParent(writeBuffer utils.WriteBuffer, child ICOTPP } // Implicit Field (headerLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - headerLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(uint8(uint8(utils.InlineIf(bool(bool((m.Payload) != (nil))), func() interface{} { return uint8(m.Payload.LengthInBytes()) }, func() interface{} { return uint8(uint8(0)) }).(uint8)))+uint8(uint8(1))))) + headerLength := uint8(uint8(uint8(m.GetLengthInBytes())) - uint8(uint8(uint8(uint8(utils.InlineIf(bool(bool((m.GetPayload()) != (nil))), func() interface{} { return uint8((*m.GetPayload()).GetLengthInBytes()) }, func() interface{} { return uint8(uint8(0)) }).(uint8)))+uint8(uint8(1))))) _headerLengthErr := writeBuffer.WriteUint8("headerLength", 8, (headerLength)) if _headerLengthErr != nil { return errors.Wrap(_headerLengthErr, "Error serializing 'headerLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go index 9aab3277636..c373d6f73c1 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go @@ -32,6 +32,9 @@ type COTPPacketConnectionRequest struct { DestinationReference uint16 SourceReference uint16 ProtocolClass COTPProtocolClass + + // Arguments. + CotpLen uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ICOTPPacketConnectionRequest interface { GetSourceReference() uint16 // GetProtocolClass returns ProtocolClass GetProtocolClass() COTPProtocolClass - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -85,12 +88,13 @@ func (m *COTPPacketConnectionRequest) GetProtocolClass() COTPProtocolClass { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacketConnectionRequest(destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, parameters []*COTPParameter, payload *S7Message) *COTPPacket { +// NewCOTPPacketConnectionRequest factory function for COTPPacketConnectionRequest +func NewCOTPPacketConnectionRequest(destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { child := &COTPPacketConnectionRequest{ DestinationReference: destinationReference, SourceReference: sourceReference, ProtocolClass: protocolClass, - COTPPacket: NewCOTPPacket(parameters, payload), + COTPPacket: NewCOTPPacket(parameters, payload, cotpLen), } child.Child = child return child.COTPPacket @@ -119,12 +123,12 @@ func (m *COTPPacketConnectionRequest) GetTypeName() string { return "COTPPacketConnectionRequest" } -func (m *COTPPacketConnectionRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacketConnectionRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacketConnectionRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPPacketConnectionRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationReference) lengthInBits += 16 @@ -138,8 +142,8 @@ func (m *COTPPacketConnectionRequest) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *COTPPacketConnectionRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacketConnectionRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketConnectionRequestParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go index 516ee9bc304..ecc9424b52d 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go @@ -32,6 +32,9 @@ type COTPPacketConnectionResponse struct { DestinationReference uint16 SourceReference uint16 ProtocolClass COTPProtocolClass + + // Arguments. + CotpLen uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ICOTPPacketConnectionResponse interface { GetSourceReference() uint16 // GetProtocolClass returns ProtocolClass GetProtocolClass() COTPProtocolClass - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -85,12 +88,13 @@ func (m *COTPPacketConnectionResponse) GetProtocolClass() COTPProtocolClass { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacketConnectionResponse(destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, parameters []*COTPParameter, payload *S7Message) *COTPPacket { +// NewCOTPPacketConnectionResponse factory function for COTPPacketConnectionResponse +func NewCOTPPacketConnectionResponse(destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { child := &COTPPacketConnectionResponse{ DestinationReference: destinationReference, SourceReference: sourceReference, ProtocolClass: protocolClass, - COTPPacket: NewCOTPPacket(parameters, payload), + COTPPacket: NewCOTPPacket(parameters, payload, cotpLen), } child.Child = child return child.COTPPacket @@ -119,12 +123,12 @@ func (m *COTPPacketConnectionResponse) GetTypeName() string { return "COTPPacketConnectionResponse" } -func (m *COTPPacketConnectionResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacketConnectionResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacketConnectionResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPPacketConnectionResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationReference) lengthInBits += 16 @@ -138,8 +142,8 @@ func (m *COTPPacketConnectionResponse) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *COTPPacketConnectionResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacketConnectionResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketConnectionResponseParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go index 75765d97b50..4bdb5907511 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go @@ -31,6 +31,9 @@ type COTPPacketData struct { *COTPPacket Eot bool TpduRef uint8 + + // Arguments. + CotpLen uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type ICOTPPacketData interface { GetEot() bool // GetTpduRef returns TpduRef GetTpduRef() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -78,11 +81,12 @@ func (m *COTPPacketData) GetTpduRef() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacketData(eot bool, tpduRef uint8, parameters []*COTPParameter, payload *S7Message) *COTPPacket { +// NewCOTPPacketData factory function for COTPPacketData +func NewCOTPPacketData(eot bool, tpduRef uint8, parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { child := &COTPPacketData{ Eot: eot, TpduRef: tpduRef, - COTPPacket: NewCOTPPacket(parameters, payload), + COTPPacket: NewCOTPPacket(parameters, payload, cotpLen), } child.Child = child return child.COTPPacket @@ -111,12 +115,12 @@ func (m *COTPPacketData) GetTypeName() string { return "COTPPacketData" } -func (m *COTPPacketData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacketData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacketData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPPacketData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (eot) lengthInBits += 1 @@ -127,8 +131,8 @@ func (m *COTPPacketData) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *COTPPacketData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacketData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketDataParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go index 1330c6827ef..de0bf8e6200 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go @@ -32,6 +32,9 @@ type COTPPacketDisconnectRequest struct { DestinationReference uint16 SourceReference uint16 ProtocolClass COTPProtocolClass + + // Arguments. + CotpLen uint16 } // The corresponding interface @@ -42,10 +45,10 @@ type ICOTPPacketDisconnectRequest interface { GetSourceReference() uint16 // GetProtocolClass returns ProtocolClass GetProtocolClass() COTPProtocolClass - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -85,12 +88,13 @@ func (m *COTPPacketDisconnectRequest) GetProtocolClass() COTPProtocolClass { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacketDisconnectRequest(destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, parameters []*COTPParameter, payload *S7Message) *COTPPacket { +// NewCOTPPacketDisconnectRequest factory function for COTPPacketDisconnectRequest +func NewCOTPPacketDisconnectRequest(destinationReference uint16, sourceReference uint16, protocolClass COTPProtocolClass, parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { child := &COTPPacketDisconnectRequest{ DestinationReference: destinationReference, SourceReference: sourceReference, ProtocolClass: protocolClass, - COTPPacket: NewCOTPPacket(parameters, payload), + COTPPacket: NewCOTPPacket(parameters, payload, cotpLen), } child.Child = child return child.COTPPacket @@ -119,12 +123,12 @@ func (m *COTPPacketDisconnectRequest) GetTypeName() string { return "COTPPacketDisconnectRequest" } -func (m *COTPPacketDisconnectRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacketDisconnectRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacketDisconnectRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPPacketDisconnectRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationReference) lengthInBits += 16 @@ -138,8 +142,8 @@ func (m *COTPPacketDisconnectRequest) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *COTPPacketDisconnectRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacketDisconnectRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketDisconnectRequestParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go index 916319996c4..96219aafb63 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go @@ -31,6 +31,9 @@ type COTPPacketDisconnectResponse struct { *COTPPacket DestinationReference uint16 SourceReference uint16 + + // Arguments. + CotpLen uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type ICOTPPacketDisconnectResponse interface { GetDestinationReference() uint16 // GetSourceReference returns SourceReference GetSourceReference() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -78,11 +81,12 @@ func (m *COTPPacketDisconnectResponse) GetSourceReference() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacketDisconnectResponse(destinationReference uint16, sourceReference uint16, parameters []*COTPParameter, payload *S7Message) *COTPPacket { +// NewCOTPPacketDisconnectResponse factory function for COTPPacketDisconnectResponse +func NewCOTPPacketDisconnectResponse(destinationReference uint16, sourceReference uint16, parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { child := &COTPPacketDisconnectResponse{ DestinationReference: destinationReference, SourceReference: sourceReference, - COTPPacket: NewCOTPPacket(parameters, payload), + COTPPacket: NewCOTPPacket(parameters, payload, cotpLen), } child.Child = child return child.COTPPacket @@ -111,12 +115,12 @@ func (m *COTPPacketDisconnectResponse) GetTypeName() string { return "COTPPacketDisconnectResponse" } -func (m *COTPPacketDisconnectResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacketDisconnectResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacketDisconnectResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPPacketDisconnectResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationReference) lengthInBits += 16 @@ -127,8 +131,8 @@ func (m *COTPPacketDisconnectResponse) LengthInBitsConditional(lastItem bool) ui return lengthInBits } -func (m *COTPPacketDisconnectResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacketDisconnectResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketDisconnectResponseParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go index 8d7d5600d7b..873f9b4da0d 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go @@ -31,6 +31,9 @@ type COTPPacketTpduError struct { *COTPPacket DestinationReference uint16 RejectCause uint8 + + // Arguments. + CotpLen uint16 } // The corresponding interface @@ -39,10 +42,10 @@ type ICOTPPacketTpduError interface { GetDestinationReference() uint16 // GetRejectCause returns RejectCause GetRejectCause() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -78,11 +81,12 @@ func (m *COTPPacketTpduError) GetRejectCause() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPPacketTpduError(destinationReference uint16, rejectCause uint8, parameters []*COTPParameter, payload *S7Message) *COTPPacket { +// NewCOTPPacketTpduError factory function for COTPPacketTpduError +func NewCOTPPacketTpduError(destinationReference uint16, rejectCause uint8, parameters []*COTPParameter, payload *S7Message, cotpLen uint16) *COTPPacket { child := &COTPPacketTpduError{ DestinationReference: destinationReference, RejectCause: rejectCause, - COTPPacket: NewCOTPPacket(parameters, payload), + COTPPacket: NewCOTPPacket(parameters, payload, cotpLen), } child.Child = child return child.COTPPacket @@ -111,12 +115,12 @@ func (m *COTPPacketTpduError) GetTypeName() string { return "COTPPacketTpduError" } -func (m *COTPPacketTpduError) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPPacketTpduError) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPPacketTpduError) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPPacketTpduError) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (destinationReference) lengthInBits += 16 @@ -127,8 +131,8 @@ func (m *COTPPacketTpduError) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *COTPPacketTpduError) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPPacketTpduError) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPPacketTpduErrorParse(readBuffer utils.ReadBuffer, cotpLen uint16) (*COTPPacket, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go index c82232ca28a..335dfb5ed8a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go @@ -28,6 +28,9 @@ import ( // The data-structure of this message type COTPParameter struct { + + // Arguments. + Rest uint8 Child ICOTPParameterChild } @@ -35,10 +38,10 @@ type COTPParameter struct { type ICOTPParameter interface { // ParameterType returns ParameterType ParameterType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,8 +66,9 @@ type ICOTPParameterChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPParameter() *COTPParameter { - return &COTPParameter{} +// NewCOTPParameter factory function for COTPParameter +func NewCOTPParameter(rest uint8) *COTPParameter { + return &COTPParameter{Rest: rest} } func CastCOTPParameter(structType interface{}) *COTPParameter { @@ -84,15 +88,15 @@ func (m *COTPParameter) GetTypeName() string { return "COTPParameter" } -func (m *COTPParameter) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPParameter) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPParameter) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *COTPParameter) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *COTPParameter) ParentLengthInBits() uint16 { +func (m *COTPParameter) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (parameterType) lengthInBits += 8 @@ -103,8 +107,8 @@ func (m *COTPParameter) ParentLengthInBits() uint16 { return lengthInBits } -func (m *COTPParameter) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPParameter) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPParameterParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) { @@ -174,7 +178,7 @@ func (m *COTPParameter) SerializeParent(writeBuffer utils.WriteBuffer, child ICO } // Implicit Field (parameterLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - parameterLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(2))) + parameterLength := uint8(uint8(uint8(m.GetLengthInBytes())) - uint8(uint8(2))) _parameterLengthErr := writeBuffer.WriteUint8("parameterLength", 8, (parameterLength)) if _parameterLengthErr != nil { return errors.Wrap(_parameterLengthErr, "Error serializing 'parameterLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go index aa6c9be28ed..e477dc56254 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go @@ -30,16 +30,19 @@ import ( type COTPParameterCalledTsap struct { *COTPParameter TsapId uint16 + + // Arguments. + Rest uint8 } // The corresponding interface type ICOTPParameterCalledTsap interface { // GetTsapId returns TsapId GetTsapId() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *COTPParameterCalledTsap) GetTsapId() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPParameterCalledTsap(tsapId uint16) *COTPParameter { +// NewCOTPParameterCalledTsap factory function for COTPParameterCalledTsap +func NewCOTPParameterCalledTsap(tsapId uint16, rest uint8) *COTPParameter { child := &COTPParameterCalledTsap{ TsapId: tsapId, - COTPParameter: NewCOTPParameter(), + COTPParameter: NewCOTPParameter(rest), } child.Child = child return child.COTPParameter @@ -100,12 +104,12 @@ func (m *COTPParameterCalledTsap) GetTypeName() string { return "COTPParameterCalledTsap" } -func (m *COTPParameterCalledTsap) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPParameterCalledTsap) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPParameterCalledTsap) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPParameterCalledTsap) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (tsapId) lengthInBits += 16 @@ -113,8 +117,8 @@ func (m *COTPParameterCalledTsap) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *COTPParameterCalledTsap) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPParameterCalledTsap) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPParameterCalledTsapParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go index b797a8585f6..faf04591abe 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go @@ -30,16 +30,19 @@ import ( type COTPParameterCallingTsap struct { *COTPParameter TsapId uint16 + + // Arguments. + Rest uint8 } // The corresponding interface type ICOTPParameterCallingTsap interface { // GetTsapId returns TsapId GetTsapId() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *COTPParameterCallingTsap) GetTsapId() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPParameterCallingTsap(tsapId uint16) *COTPParameter { +// NewCOTPParameterCallingTsap factory function for COTPParameterCallingTsap +func NewCOTPParameterCallingTsap(tsapId uint16, rest uint8) *COTPParameter { child := &COTPParameterCallingTsap{ TsapId: tsapId, - COTPParameter: NewCOTPParameter(), + COTPParameter: NewCOTPParameter(rest), } child.Child = child return child.COTPParameter @@ -100,12 +104,12 @@ func (m *COTPParameterCallingTsap) GetTypeName() string { return "COTPParameterCallingTsap" } -func (m *COTPParameterCallingTsap) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPParameterCallingTsap) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPParameterCallingTsap) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPParameterCallingTsap) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (tsapId) lengthInBits += 16 @@ -113,8 +117,8 @@ func (m *COTPParameterCallingTsap) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *COTPParameterCallingTsap) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPParameterCallingTsap) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPParameterCallingTsapParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go index a79ec3d3cbd..502d446d74f 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go @@ -30,16 +30,19 @@ import ( type COTPParameterChecksum struct { *COTPParameter Crc uint8 + + // Arguments. + Rest uint8 } // The corresponding interface type ICOTPParameterChecksum interface { // GetCrc returns Crc GetCrc() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *COTPParameterChecksum) GetCrc() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPParameterChecksum(crc uint8) *COTPParameter { +// NewCOTPParameterChecksum factory function for COTPParameterChecksum +func NewCOTPParameterChecksum(crc uint8, rest uint8) *COTPParameter { child := &COTPParameterChecksum{ Crc: crc, - COTPParameter: NewCOTPParameter(), + COTPParameter: NewCOTPParameter(rest), } child.Child = child return child.COTPParameter @@ -100,12 +104,12 @@ func (m *COTPParameterChecksum) GetTypeName() string { return "COTPParameterChecksum" } -func (m *COTPParameterChecksum) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPParameterChecksum) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPParameterChecksum) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPParameterChecksum) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (crc) lengthInBits += 8 @@ -113,8 +117,8 @@ func (m *COTPParameterChecksum) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *COTPParameterChecksum) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPParameterChecksum) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPParameterChecksumParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go index 36cd38fcde7..e9f17ec862c 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go @@ -30,16 +30,19 @@ import ( type COTPParameterDisconnectAdditionalInformation struct { *COTPParameter Data []byte + + // Arguments. + Rest uint8 } // The corresponding interface type ICOTPParameterDisconnectAdditionalInformation interface { // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *COTPParameterDisconnectAdditionalInformation) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPParameterDisconnectAdditionalInformation(data []byte) *COTPParameter { +// NewCOTPParameterDisconnectAdditionalInformation factory function for COTPParameterDisconnectAdditionalInformation +func NewCOTPParameterDisconnectAdditionalInformation(data []byte, rest uint8) *COTPParameter { child := &COTPParameterDisconnectAdditionalInformation{ Data: data, - COTPParameter: NewCOTPParameter(), + COTPParameter: NewCOTPParameter(rest), } child.Child = child return child.COTPParameter @@ -100,12 +104,12 @@ func (m *COTPParameterDisconnectAdditionalInformation) GetTypeName() string { return "COTPParameterDisconnectAdditionalInformation" } -func (m *COTPParameterDisconnectAdditionalInformation) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPParameterDisconnectAdditionalInformation) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPParameterDisconnectAdditionalInformation) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPParameterDisconnectAdditionalInformation) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Data) > 0 { @@ -115,8 +119,8 @@ func (m *COTPParameterDisconnectAdditionalInformation) LengthInBitsConditional(l return lengthInBits } -func (m *COTPParameterDisconnectAdditionalInformation) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPParameterDisconnectAdditionalInformation) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPParameterDisconnectAdditionalInformationParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go index 21b1d336487..5e7c1cb7e34 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go @@ -30,16 +30,19 @@ import ( type COTPParameterTpduSize struct { *COTPParameter TpduSize COTPTpduSize + + // Arguments. + Rest uint8 } // The corresponding interface type ICOTPParameterTpduSize interface { // GetTpduSize returns TpduSize GetTpduSize() COTPTpduSize - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,10 +71,11 @@ func (m *COTPParameterTpduSize) GetTpduSize() COTPTpduSize { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewCOTPParameterTpduSize(tpduSize COTPTpduSize) *COTPParameter { +// NewCOTPParameterTpduSize factory function for COTPParameterTpduSize +func NewCOTPParameterTpduSize(tpduSize COTPTpduSize, rest uint8) *COTPParameter { child := &COTPParameterTpduSize{ TpduSize: tpduSize, - COTPParameter: NewCOTPParameter(), + COTPParameter: NewCOTPParameter(rest), } child.Child = child return child.COTPParameter @@ -100,12 +104,12 @@ func (m *COTPParameterTpduSize) GetTypeName() string { return "COTPParameterTpduSize" } -func (m *COTPParameterTpduSize) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *COTPParameterTpduSize) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *COTPParameterTpduSize) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *COTPParameterTpduSize) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (tpduSize) lengthInBits += 8 @@ -113,8 +117,8 @@ func (m *COTPParameterTpduSize) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *COTPParameterTpduSize) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *COTPParameterTpduSize) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPParameterTpduSizeParse(readBuffer utils.ReadBuffer, rest uint8) (*COTPParameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPProtocolClass.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPProtocolClass.go index 043cda704ca..b03a4b46ee1 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPProtocolClass.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPProtocolClass.go @@ -104,12 +104,12 @@ func CastCOTPProtocolClass(structType interface{}) COTPProtocolClass { return castFunc(structType) } -func (m COTPProtocolClass) LengthInBits() uint16 { +func (m COTPProtocolClass) GetLengthInBits() uint16 { return 8 } -func (m COTPProtocolClass) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m COTPProtocolClass) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPProtocolClassParse(readBuffer utils.ReadBuffer) (COTPProtocolClass, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPTpduSize.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPTpduSize.go index 154bf027b82..669e06706c8 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/COTPTpduSize.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPTpduSize.go @@ -162,12 +162,12 @@ func CastCOTPTpduSize(structType interface{}) COTPTpduSize { return castFunc(structType) } -func (m COTPTpduSize) LengthInBits() uint16 { +func (m COTPTpduSize) GetLengthInBits() uint16 { return 8 } -func (m COTPTpduSize) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m COTPTpduSize) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func COTPTpduSizeParse(readBuffer utils.ReadBuffer) (COTPTpduSize, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/CpuSubscribeEvents.go b/plc4go/internal/plc4go/s7/readwrite/model/CpuSubscribeEvents.go index 70a787d13fb..bb77f8942a8 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/CpuSubscribeEvents.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/CpuSubscribeEvents.go @@ -98,12 +98,12 @@ func CastCpuSubscribeEvents(structType interface{}) CpuSubscribeEvents { return castFunc(structType) } -func (m CpuSubscribeEvents) LengthInBits() uint16 { +func (m CpuSubscribeEvents) GetLengthInBits() uint16 { return 8 } -func (m CpuSubscribeEvents) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m CpuSubscribeEvents) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func CpuSubscribeEventsParse(readBuffer utils.ReadBuffer) (CpuSubscribeEvents, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go index ba98e1bbf43..7a5e849802b 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/DataItem.go @@ -294,6 +294,14 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataProtocolId string, stringLen } func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataProtocolId string, stringLength int32) error { + m := struct { + DataProtocolId string + StringLength int32 + }{ + DataProtocolId: dataProtocolId, + StringLength: stringLength, + } + _ = m writeBuffer.PushContext("DataItem") switch { case dataProtocolId == "IEC61131_BOOL": // BOOL @@ -402,13 +410,13 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataPr } case dataProtocolId == "IEC61131_STRING": // STRING // Manual Field (value) - _valueErr := SerializeS7String(writeBuffer, value, stringLength, "UTF-8") + _valueErr := SerializeS7String(writeBuffer, value, m.StringLength, "UTF-8") if _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } case dataProtocolId == "IEC61131_WSTRING": // STRING // Manual Field (value) - _valueErr := SerializeS7String(writeBuffer, value, stringLength, "UTF-16") + _valueErr := SerializeS7String(writeBuffer, value, m.StringLength, "UTF-16") if _valueErr != nil { return errors.Wrap(_valueErr, "Error serializing 'value' field") } diff --git a/plc4go/internal/plc4go/s7/readwrite/model/DataTransportErrorCode.go b/plc4go/internal/plc4go/s7/readwrite/model/DataTransportErrorCode.go index 98c27f6cbd0..98a5d8cc226 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/DataTransportErrorCode.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/DataTransportErrorCode.go @@ -110,12 +110,12 @@ func CastDataTransportErrorCode(structType interface{}) DataTransportErrorCode { return castFunc(structType) } -func (m DataTransportErrorCode) LengthInBits() uint16 { +func (m DataTransportErrorCode) GetLengthInBits() uint16 { return 8 } -func (m DataTransportErrorCode) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m DataTransportErrorCode) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DataTransportErrorCodeParse(readBuffer utils.ReadBuffer) (DataTransportErrorCode, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/DataTransportSize.go b/plc4go/internal/plc4go/s7/readwrite/model/DataTransportSize.go index 3b55c4d6224..5a3c19fa73f 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/DataTransportSize.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/DataTransportSize.go @@ -162,12 +162,12 @@ func CastDataTransportSize(structType interface{}) DataTransportSize { return castFunc(structType) } -func (m DataTransportSize) LengthInBits() uint16 { +func (m DataTransportSize) GetLengthInBits() uint16 { return 8 } -func (m DataTransportSize) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m DataTransportSize) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DataTransportSizeParse(readBuffer utils.ReadBuffer) (DataTransportSize, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/DateAndTime.go b/plc4go/internal/plc4go/s7/readwrite/model/DateAndTime.go index 0ff4fb38bb0..eca7d196ec2 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/DateAndTime.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/DateAndTime.go @@ -56,10 +56,10 @@ type IDateAndTime interface { GetMsec() uint16 // GetDow returns Dow GetDow() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -103,6 +103,7 @@ func (m *DateAndTime) GetDow() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDateAndTime factory function for DateAndTime func NewDateAndTime(year uint8, month uint8, day uint8, hour uint8, minutes uint8, seconds uint8, msec uint16, dow uint8) *DateAndTime { return &DateAndTime{Year: year, Month: month, Day: day, Hour: hour, Minutes: minutes, Seconds: seconds, Msec: msec, Dow: dow} } @@ -124,11 +125,11 @@ func (m *DateAndTime) GetTypeName() string { return "DateAndTime" } -func (m *DateAndTime) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *DateAndTime) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *DateAndTime) LengthInBitsConditional(lastItem bool) uint16 { +func (m *DateAndTime) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Manual Field (year) @@ -158,8 +159,8 @@ func (m *DateAndTime) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *DateAndTime) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *DateAndTime) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DateAndTimeParse(readBuffer utils.ReadBuffer) (*DateAndTime, error) { @@ -230,43 +231,43 @@ func (m *DateAndTime) Serialize(writeBuffer utils.WriteBuffer) error { } // Manual Field (year) - _yearErr := ByteToBcd(writeBuffer, m.Year) + _yearErr := ByteToBcd(writeBuffer, m.GetYear()) if _yearErr != nil { return errors.Wrap(_yearErr, "Error serializing 'year' field") } // Manual Field (month) - _monthErr := ByteToBcd(writeBuffer, m.Month) + _monthErr := ByteToBcd(writeBuffer, m.GetMonth()) if _monthErr != nil { return errors.Wrap(_monthErr, "Error serializing 'month' field") } // Manual Field (day) - _dayErr := ByteToBcd(writeBuffer, m.Day) + _dayErr := ByteToBcd(writeBuffer, m.GetDay()) if _dayErr != nil { return errors.Wrap(_dayErr, "Error serializing 'day' field") } // Manual Field (hour) - _hourErr := ByteToBcd(writeBuffer, m.Hour) + _hourErr := ByteToBcd(writeBuffer, m.GetHour()) if _hourErr != nil { return errors.Wrap(_hourErr, "Error serializing 'hour' field") } // Manual Field (minutes) - _minutesErr := ByteToBcd(writeBuffer, m.Minutes) + _minutesErr := ByteToBcd(writeBuffer, m.GetMinutes()) if _minutesErr != nil { return errors.Wrap(_minutesErr, "Error serializing 'minutes' field") } // Manual Field (seconds) - _secondsErr := ByteToBcd(writeBuffer, m.Seconds) + _secondsErr := ByteToBcd(writeBuffer, m.GetSeconds()) if _secondsErr != nil { return errors.Wrap(_secondsErr, "Error serializing 'seconds' field") } // Manual Field (msec) - _msecErr := IntToS7msec(writeBuffer, m.Msec) + _msecErr := IntToS7msec(writeBuffer, m.GetMsec()) if _msecErr != nil { return errors.Wrap(_msecErr, "Error serializing 'msec' field") } diff --git a/plc4go/internal/plc4go/s7/readwrite/model/DeviceGroup.go b/plc4go/internal/plc4go/s7/readwrite/model/DeviceGroup.go index ea4d823bf50..2921006961c 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/DeviceGroup.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/DeviceGroup.go @@ -92,12 +92,12 @@ func CastDeviceGroup(structType interface{}) DeviceGroup { return castFunc(structType) } -func (m DeviceGroup) LengthInBits() uint16 { +func (m DeviceGroup) GetLengthInBits() uint16 { return 8 } -func (m DeviceGroup) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m DeviceGroup) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DeviceGroupParse(readBuffer utils.ReadBuffer) (DeviceGroup, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/EventType.go b/plc4go/internal/plc4go/s7/readwrite/model/EventType.go index 779135f9c92..8468d709e4d 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/EventType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/EventType.go @@ -98,12 +98,12 @@ func CastEventType(structType interface{}) EventType { return castFunc(structType) } -func (m EventType) LengthInBits() uint16 { +func (m EventType) GetLengthInBits() uint16 { return 8 } -func (m EventType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m EventType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func EventTypeParse(readBuffer utils.ReadBuffer) (EventType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/MemoryArea.go b/plc4go/internal/plc4go/s7/readwrite/model/MemoryArea.go index 60a329d5c1d..668721ac81a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/MemoryArea.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/MemoryArea.go @@ -182,12 +182,12 @@ func CastMemoryArea(structType interface{}) MemoryArea { return castFunc(structType) } -func (m MemoryArea) LengthInBits() uint16 { +func (m MemoryArea) GetLengthInBits() uint16 { return 8 } -func (m MemoryArea) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m MemoryArea) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func MemoryAreaParse(readBuffer utils.ReadBuffer) (MemoryArea, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/ModeTransitionType.go b/plc4go/internal/plc4go/s7/readwrite/model/ModeTransitionType.go index 323b4dbbfd6..629c7f7a0eb 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/ModeTransitionType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/ModeTransitionType.go @@ -128,12 +128,12 @@ func CastModeTransitionType(structType interface{}) ModeTransitionType { return castFunc(structType) } -func (m ModeTransitionType) LengthInBits() uint16 { +func (m ModeTransitionType) GetLengthInBits() uint16 { return 8 } -func (m ModeTransitionType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m ModeTransitionType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func ModeTransitionTypeParse(readBuffer utils.ReadBuffer) (ModeTransitionType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/QueryType.go b/plc4go/internal/plc4go/s7/readwrite/model/QueryType.go index 0dee92253e4..4ed90962830 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/QueryType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/QueryType.go @@ -92,12 +92,12 @@ func CastQueryType(structType interface{}) QueryType { return castFunc(structType) } -func (m QueryType) LengthInBits() uint16 { +func (m QueryType) GetLengthInBits() uint16 { return 8 } -func (m QueryType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m QueryType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func QueryTypeParse(readBuffer utils.ReadBuffer) (QueryType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go b/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go index 15de60ee18b..1514aa440f4 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go @@ -35,10 +35,10 @@ type S7Address struct { type IS7Address interface { // AddressType returns AddressType AddressType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IS7AddressChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7Address factory function for S7Address func NewS7Address() *S7Address { return &S7Address{} } @@ -84,15 +85,15 @@ func (m *S7Address) GetTypeName() string { return "S7Address" } -func (m *S7Address) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7Address) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7Address) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7Address) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7Address) ParentLengthInBits() uint16 { +func (m *S7Address) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (addressType) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *S7Address) ParentLengthInBits() uint16 { return lengthInBits } -func (m *S7Address) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7Address) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7AddressParse(readBuffer utils.ReadBuffer) (*S7Address, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go b/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go index 8d9c90aff3a..a955331c603 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go @@ -52,10 +52,10 @@ type IS7AddressAny interface { GetByteAddress() uint16 // GetBitAddress returns BitAddress GetBitAddress() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -104,6 +104,7 @@ func (m *S7AddressAny) GetBitAddress() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7AddressAny factory function for S7AddressAny func NewS7AddressAny(transportSize TransportSize, numberOfElements uint16, dbNumber uint16, area MemoryArea, byteAddress uint16, bitAddress uint8) *S7Address { child := &S7AddressAny{ TransportSize: transportSize, @@ -141,12 +142,12 @@ func (m *S7AddressAny) GetTypeName() string { return "S7AddressAny" } -func (m *S7AddressAny) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7AddressAny) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7AddressAny) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7AddressAny) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Enum Field (transportSize) lengthInBits += 8 @@ -172,8 +173,8 @@ func (m *S7AddressAny) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *S7AddressAny) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7AddressAny) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7AddressAnyParse(readBuffer utils.ReadBuffer) (*S7Address, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7DataAlarmMessage.go b/plc4go/internal/plc4go/s7/readwrite/model/S7DataAlarmMessage.go index c3ea11d2178..142bd9d5832 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7DataAlarmMessage.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7DataAlarmMessage.go @@ -40,10 +40,10 @@ type S7DataAlarmMessage struct { type IS7DataAlarmMessage interface { // CpuFunctionType returns CpuFunctionType CpuFunctionType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ type IS7DataAlarmMessageChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7DataAlarmMessage factory function for S7DataAlarmMessage func NewS7DataAlarmMessage() *S7DataAlarmMessage { return &S7DataAlarmMessage{} } @@ -89,15 +90,15 @@ func (m *S7DataAlarmMessage) GetTypeName() string { return "S7DataAlarmMessage" } -func (m *S7DataAlarmMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7DataAlarmMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7DataAlarmMessage) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7DataAlarmMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7DataAlarmMessage) ParentLengthInBits() uint16 { +func (m *S7DataAlarmMessage) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Const Field (functionId) @@ -109,8 +110,8 @@ func (m *S7DataAlarmMessage) ParentLengthInBits() uint16 { return lengthInBits } -func (m *S7DataAlarmMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7DataAlarmMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7DataAlarmMessageParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8) (*S7DataAlarmMessage, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go b/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go index e107aa4d3e5..f90805dc158 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go @@ -50,10 +50,10 @@ type IS7Message interface { GetParameter() *S7Parameter // GetPayload returns Payload GetPayload() *S7Payload - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -89,6 +89,7 @@ func (m *S7Message) GetPayload() *S7Payload { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7Message factory function for S7Message func NewS7Message(tpduReference uint16, parameter *S7Parameter, payload *S7Payload) *S7Message { return &S7Message{TpduReference: tpduReference, Parameter: parameter, Payload: payload} } @@ -110,15 +111,15 @@ func (m *S7Message) GetTypeName() string { return "S7Message" } -func (m *S7Message) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7Message) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7Message) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7Message) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7Message) ParentLengthInBits() uint16 { +func (m *S7Message) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Const Field (protocolId) @@ -140,19 +141,19 @@ func (m *S7Message) ParentLengthInBits() uint16 { // Optional Field (parameter) if m.Parameter != nil { - lengthInBits += (*m.Parameter).LengthInBits() + lengthInBits += (*m.Parameter).GetLengthInBits() } // Optional Field (payload) if m.Payload != nil { - lengthInBits += (*m.Payload).LengthInBits() + lengthInBits += (*m.Payload).GetLengthInBits() } return lengthInBits } -func (m *S7Message) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7Message) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageParse(readBuffer utils.ReadBuffer) (*S7Message, error) { @@ -320,14 +321,14 @@ func (m *S7Message) SerializeParent(writeBuffer utils.WriteBuffer, child IS7Mess } // Implicit Field (parameterLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - parameterLength := uint16(utils.InlineIf(bool((m.Parameter) != (nil)), func() interface{} { return uint16(m.Parameter.LengthInBytes()) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) + parameterLength := uint16(utils.InlineIf(bool((m.GetParameter()) != (nil)), func() interface{} { return uint16((*m.GetParameter()).GetLengthInBytes()) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) _parameterLengthErr := writeBuffer.WriteUint16("parameterLength", 16, (parameterLength)) if _parameterLengthErr != nil { return errors.Wrap(_parameterLengthErr, "Error serializing 'parameterLength' field") } // Implicit Field (payloadLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - payloadLength := uint16(utils.InlineIf(bool((m.Payload) != (nil)), func() interface{} { return uint16(m.Payload.LengthInBytes()) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) + payloadLength := uint16(utils.InlineIf(bool((m.GetPayload()) != (nil)), func() interface{} { return uint16((*m.GetPayload()).GetLengthInBytes()) }, func() interface{} { return uint16(uint16(0)) }).(uint16)) _payloadLengthErr := writeBuffer.WriteUint16("payloadLength", 16, (payloadLength)) if _payloadLengthErr != nil { return errors.Wrap(_payloadLengthErr, "Error serializing 'payloadLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go index 1def2644e1c..aec9a9e2b0f 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go @@ -48,10 +48,10 @@ type IS7MessageObjectRequest interface { GetQueryType() QueryType // GetAlarmType returns AlarmType GetAlarmType() AlarmType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -88,6 +88,7 @@ func (m *S7MessageObjectRequest) GetAlarmType() AlarmType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7MessageObjectRequest factory function for S7MessageObjectRequest func NewS7MessageObjectRequest(syntaxId SyntaxIdType, queryType QueryType, alarmType AlarmType) *S7DataAlarmMessage { child := &S7MessageObjectRequest{ SyntaxId: syntaxId, @@ -122,12 +123,12 @@ func (m *S7MessageObjectRequest) GetTypeName() string { return "S7MessageObjectRequest" } -func (m *S7MessageObjectRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7MessageObjectRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7MessageObjectRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7MessageObjectRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (variableSpec) lengthInBits += 8 @@ -153,8 +154,8 @@ func (m *S7MessageObjectRequest) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *S7MessageObjectRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7MessageObjectRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageObjectRequestParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8) (*S7DataAlarmMessage, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go index 69f9947f1e8..b70f5684858 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go @@ -40,10 +40,10 @@ type IS7MessageObjectResponse interface { GetReturnCode() DataTransportErrorCode // GetTransportSize returns TransportSize GetTransportSize() DataTransportSize - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *S7MessageObjectResponse) GetTransportSize() DataTransportSize { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7MessageObjectResponse factory function for S7MessageObjectResponse func NewS7MessageObjectResponse(returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7DataAlarmMessage { child := &S7MessageObjectResponse{ ReturnCode: returnCode, @@ -109,12 +110,12 @@ func (m *S7MessageObjectResponse) GetTypeName() string { return "S7MessageObjectResponse" } -func (m *S7MessageObjectResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7MessageObjectResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7MessageObjectResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7MessageObjectResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (returnCode) lengthInBits += 8 @@ -128,8 +129,8 @@ func (m *S7MessageObjectResponse) LengthInBitsConditional(lastItem bool) uint16 return lengthInBits } -func (m *S7MessageObjectResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7MessageObjectResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageObjectResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8) (*S7DataAlarmMessage, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go index a2e76b3c615..405837e1d53 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go @@ -32,10 +32,10 @@ type S7MessageRequest struct { // The corresponding interface type IS7MessageRequest interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -65,6 +65,7 @@ func (m *S7MessageRequest) InitializeParent(parent *S7Message, tpduReference uin // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7MessageRequest factory function for S7MessageRequest func NewS7MessageRequest(tpduReference uint16, parameter *S7Parameter, payload *S7Payload) *S7Message { child := &S7MessageRequest{ S7Message: NewS7Message(tpduReference, parameter, payload), @@ -96,18 +97,18 @@ func (m *S7MessageRequest) GetTypeName() string { return "S7MessageRequest" } -func (m *S7MessageRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7MessageRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7MessageRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7MessageRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *S7MessageRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7MessageRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageRequestParse(readBuffer utils.ReadBuffer) (*S7Message, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go index abda9eef1c6..c2ef29123f9 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go @@ -39,10 +39,10 @@ type IS7MessageResponse interface { GetErrorClass() uint8 // GetErrorCode returns ErrorCode GetErrorCode() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -79,6 +79,7 @@ func (m *S7MessageResponse) GetErrorCode() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7MessageResponse factory function for S7MessageResponse func NewS7MessageResponse(errorClass uint8, errorCode uint8, tpduReference uint16, parameter *S7Parameter, payload *S7Payload) *S7Message { child := &S7MessageResponse{ ErrorClass: errorClass, @@ -112,12 +113,12 @@ func (m *S7MessageResponse) GetTypeName() string { return "S7MessageResponse" } -func (m *S7MessageResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7MessageResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7MessageResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7MessageResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (errorClass) lengthInBits += 8 @@ -128,8 +129,8 @@ func (m *S7MessageResponse) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *S7MessageResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7MessageResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageResponseParse(readBuffer utils.ReadBuffer) (*S7Message, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go index 7679cf4927d..c4bf20ec76a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go @@ -39,10 +39,10 @@ type IS7MessageResponseData interface { GetErrorClass() uint8 // GetErrorCode returns ErrorCode GetErrorCode() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -79,6 +79,7 @@ func (m *S7MessageResponseData) GetErrorCode() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7MessageResponseData factory function for S7MessageResponseData func NewS7MessageResponseData(errorClass uint8, errorCode uint8, tpduReference uint16, parameter *S7Parameter, payload *S7Payload) *S7Message { child := &S7MessageResponseData{ ErrorClass: errorClass, @@ -112,12 +113,12 @@ func (m *S7MessageResponseData) GetTypeName() string { return "S7MessageResponseData" } -func (m *S7MessageResponseData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7MessageResponseData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7MessageResponseData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7MessageResponseData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (errorClass) lengthInBits += 8 @@ -128,8 +129,8 @@ func (m *S7MessageResponseData) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *S7MessageResponseData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7MessageResponseData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageResponseDataParse(readBuffer utils.ReadBuffer) (*S7Message, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go index bbe46aef2b8..2087a598bd7 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go @@ -32,10 +32,10 @@ type S7MessageUserData struct { // The corresponding interface type IS7MessageUserData interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -65,6 +65,7 @@ func (m *S7MessageUserData) InitializeParent(parent *S7Message, tpduReference ui // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7MessageUserData factory function for S7MessageUserData func NewS7MessageUserData(tpduReference uint16, parameter *S7Parameter, payload *S7Payload) *S7Message { child := &S7MessageUserData{ S7Message: NewS7Message(tpduReference, parameter, payload), @@ -96,18 +97,18 @@ func (m *S7MessageUserData) GetTypeName() string { return "S7MessageUserData" } -func (m *S7MessageUserData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7MessageUserData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7MessageUserData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7MessageUserData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *S7MessageUserData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7MessageUserData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7MessageUserDataParse(readBuffer utils.ReadBuffer) (*S7Message, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go b/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go index 71ae075871c..878c288dec4 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go @@ -37,10 +37,10 @@ type IS7Parameter interface { MessageType() uint8 // ParameterType returns ParameterType ParameterType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -65,6 +65,7 @@ type IS7ParameterChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7Parameter factory function for S7Parameter func NewS7Parameter() *S7Parameter { return &S7Parameter{} } @@ -86,15 +87,15 @@ func (m *S7Parameter) GetTypeName() string { return "S7Parameter" } -func (m *S7Parameter) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7Parameter) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7Parameter) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7Parameter) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7Parameter) ParentLengthInBits() uint16 { +func (m *S7Parameter) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (parameterType) lengthInBits += 8 @@ -102,8 +103,8 @@ func (m *S7Parameter) ParentLengthInBits() uint16 { return lengthInBits } -func (m *S7Parameter) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7Parameter) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go index e35bc56bc44..d23e21e663e 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go @@ -49,10 +49,10 @@ type IS7ParameterModeTransition interface { GetCurrentMode() uint8 // GetSequenceNumber returns SequenceNumber GetSequenceNumber() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -105,6 +105,7 @@ func (m *S7ParameterModeTransition) GetSequenceNumber() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterModeTransition factory function for S7ParameterModeTransition func NewS7ParameterModeTransition(method uint8, cpuFunctionType uint8, cpuFunctionGroup uint8, currentMode uint8, sequenceNumber uint8) *S7Parameter { child := &S7ParameterModeTransition{ Method: method, @@ -141,12 +142,12 @@ func (m *S7ParameterModeTransition) GetTypeName() string { return "S7ParameterModeTransition" } -func (m *S7ParameterModeTransition) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterModeTransition) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterModeTransition) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterModeTransition) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 16 @@ -172,8 +173,8 @@ func (m *S7ParameterModeTransition) LengthInBitsConditional(lastItem bool) uint1 return lengthInBits } -func (m *S7ParameterModeTransition) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterModeTransition) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterModeTransitionParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { @@ -269,7 +270,7 @@ func (m *S7ParameterModeTransition) Serialize(writeBuffer utils.WriteBuffer) err } // Implicit Field (itemLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - itemLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(2))) + itemLength := uint8(uint8(uint8(m.GetLengthInBytes())) - uint8(uint8(2))) _itemLengthErr := writeBuffer.WriteUint8("itemLength", 8, (itemLength)) if _itemLengthErr != nil { return errors.Wrap(_itemLengthErr, "Error serializing 'itemLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go index a148e364743..aebcdaa8470 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go @@ -36,10 +36,10 @@ type S7ParameterReadVarRequest struct { type IS7ParameterReadVarRequest interface { // GetItems returns Items GetItems() []*S7VarRequestParameterItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *S7ParameterReadVarRequest) GetItems() []*S7VarRequestParameterItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterReadVarRequest factory function for S7ParameterReadVarRequest func NewS7ParameterReadVarRequest(items []*S7VarRequestParameterItem) *S7Parameter { child := &S7ParameterReadVarRequest{ Items: items, @@ -108,12 +109,12 @@ func (m *S7ParameterReadVarRequest) GetTypeName() string { return "S7ParameterReadVarRequest" } -func (m *S7ParameterReadVarRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterReadVarRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterReadVarRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterReadVarRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (numItems) lengthInBits += 8 @@ -122,15 +123,15 @@ func (m *S7ParameterReadVarRequest) LengthInBitsConditional(lastItem bool) uint1 if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7ParameterReadVarRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterReadVarRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterReadVarRequestParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { @@ -184,7 +185,7 @@ func (m *S7ParameterReadVarRequest) Serialize(writeBuffer utils.WriteBuffer) err } // Implicit Field (numItems) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - numItems := uint8(uint8(len(m.Items))) + numItems := uint8(uint8(len(m.GetItems()))) _numItemsErr := writeBuffer.WriteUint8("numItems", 8, (numItems)) if _numItemsErr != nil { return errors.Wrap(_numItemsErr, "Error serializing 'numItems' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go index 77631208541..bade14cf70a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go @@ -36,10 +36,10 @@ type S7ParameterReadVarResponse struct { type IS7ParameterReadVarResponse interface { // GetNumItems returns NumItems GetNumItems() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *S7ParameterReadVarResponse) GetNumItems() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterReadVarResponse factory function for S7ParameterReadVarResponse func NewS7ParameterReadVarResponse(numItems uint8) *S7Parameter { child := &S7ParameterReadVarResponse{ NumItems: numItems, @@ -108,12 +109,12 @@ func (m *S7ParameterReadVarResponse) GetTypeName() string { return "S7ParameterReadVarResponse" } -func (m *S7ParameterReadVarResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterReadVarResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterReadVarResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterReadVarResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numItems) lengthInBits += 8 @@ -121,8 +122,8 @@ func (m *S7ParameterReadVarResponse) LengthInBitsConditional(lastItem bool) uint return lengthInBits } -func (m *S7ParameterReadVarResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterReadVarResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterReadVarResponseParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go index ce9d6c5708c..2986e9fe4bc 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go @@ -43,10 +43,10 @@ type IS7ParameterSetupCommunication interface { GetMaxAmqCallee() uint16 // GetPduLength returns PduLength GetPduLength() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -91,6 +91,7 @@ func (m *S7ParameterSetupCommunication) GetPduLength() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterSetupCommunication factory function for S7ParameterSetupCommunication func NewS7ParameterSetupCommunication(maxAmqCaller uint16, maxAmqCallee uint16, pduLength uint16) *S7Parameter { child := &S7ParameterSetupCommunication{ MaxAmqCaller: maxAmqCaller, @@ -125,12 +126,12 @@ func (m *S7ParameterSetupCommunication) GetTypeName() string { return "S7ParameterSetupCommunication" } -func (m *S7ParameterSetupCommunication) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterSetupCommunication) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterSetupCommunication) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterSetupCommunication) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Reserved Field (reserved) lengthInBits += 8 @@ -147,8 +148,8 @@ func (m *S7ParameterSetupCommunication) LengthInBitsConditional(lastItem bool) u return lengthInBits } -func (m *S7ParameterSetupCommunication) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterSetupCommunication) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterSetupCommunicationParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go index 8c9c782bc20..80e9374bde2 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go @@ -36,10 +36,10 @@ type S7ParameterUserData struct { type IS7ParameterUserData interface { // GetItems returns Items GetItems() []*S7ParameterUserDataItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *S7ParameterUserData) GetItems() []*S7ParameterUserDataItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterUserData factory function for S7ParameterUserData func NewS7ParameterUserData(items []*S7ParameterUserDataItem) *S7Parameter { child := &S7ParameterUserData{ Items: items, @@ -108,12 +109,12 @@ func (m *S7ParameterUserData) GetTypeName() string { return "S7ParameterUserData" } -func (m *S7ParameterUserData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterUserData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterUserData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterUserData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (numItems) lengthInBits += 8 @@ -122,15 +123,15 @@ func (m *S7ParameterUserData) LengthInBitsConditional(lastItem bool) uint16 { if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7ParameterUserData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterUserData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterUserDataParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { @@ -184,7 +185,7 @@ func (m *S7ParameterUserData) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (numItems) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - numItems := uint8(uint8(len(m.Items))) + numItems := uint8(uint8(len(m.GetItems()))) _numItemsErr := writeBuffer.WriteUint8("numItems", 8, (numItems)) if _numItemsErr != nil { return errors.Wrap(_numItemsErr, "Error serializing 'numItems' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go index 0079b296fd4..e7696c77132 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go @@ -35,10 +35,10 @@ type S7ParameterUserDataItem struct { type IS7ParameterUserDataItem interface { // ItemType returns ItemType ItemType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IS7ParameterUserDataItemChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterUserDataItem factory function for S7ParameterUserDataItem func NewS7ParameterUserDataItem() *S7ParameterUserDataItem { return &S7ParameterUserDataItem{} } @@ -84,15 +85,15 @@ func (m *S7ParameterUserDataItem) GetTypeName() string { return "S7ParameterUserDataItem" } -func (m *S7ParameterUserDataItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterUserDataItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterUserDataItem) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7ParameterUserDataItem) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7ParameterUserDataItem) ParentLengthInBits() uint16 { +func (m *S7ParameterUserDataItem) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (itemType) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *S7ParameterUserDataItem) ParentLengthInBits() uint16 { return lengthInBits } -func (m *S7ParameterUserDataItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterUserDataItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterUserDataItemParse(readBuffer utils.ReadBuffer) (*S7ParameterUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go index c65fd3f8fe6..92e3d17dcdd 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go @@ -57,10 +57,10 @@ type IS7ParameterUserDataItemCPUFunctions interface { GetLastDataUnit() *uint8 // GetErrorCode returns ErrorCode GetErrorCode() *uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -117,6 +117,7 @@ func (m *S7ParameterUserDataItemCPUFunctions) GetErrorCode() *uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterUserDataItemCPUFunctions factory function for S7ParameterUserDataItemCPUFunctions func NewS7ParameterUserDataItemCPUFunctions(method uint8, cpuFunctionType uint8, cpuFunctionGroup uint8, cpuSubfunction uint8, sequenceNumber uint8, dataUnitReferenceNumber *uint8, lastDataUnit *uint8, errorCode *uint16) *S7ParameterUserDataItem { child := &S7ParameterUserDataItemCPUFunctions{ Method: method, @@ -156,12 +157,12 @@ func (m *S7ParameterUserDataItemCPUFunctions) GetTypeName() string { return "S7ParameterUserDataItemCPUFunctions" } -func (m *S7ParameterUserDataItemCPUFunctions) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterUserDataItemCPUFunctions) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterUserDataItemCPUFunctions) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterUserDataItemCPUFunctions) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (itemLength) lengthInBits += 8 @@ -199,8 +200,8 @@ func (m *S7ParameterUserDataItemCPUFunctions) LengthInBitsConditional(lastItem b return lengthInBits } -func (m *S7ParameterUserDataItemCPUFunctions) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterUserDataItemCPUFunctions) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterUserDataItemCPUFunctionsParse(readBuffer utils.ReadBuffer) (*S7ParameterUserDataItem, error) { @@ -307,7 +308,7 @@ func (m *S7ParameterUserDataItemCPUFunctions) Serialize(writeBuffer utils.WriteB } // Implicit Field (itemLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - itemLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(2))) + itemLength := uint8(uint8(uint8(m.GetLengthInBytes())) - uint8(uint8(2))) _itemLengthErr := writeBuffer.WriteUint8("itemLength", 8, (itemLength)) if _itemLengthErr != nil { return errors.Wrap(_itemLengthErr, "Error serializing 'itemLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go index 878a6dddae5..6efa6964ec0 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go @@ -36,10 +36,10 @@ type S7ParameterWriteVarRequest struct { type IS7ParameterWriteVarRequest interface { // GetItems returns Items GetItems() []*S7VarRequestParameterItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *S7ParameterWriteVarRequest) GetItems() []*S7VarRequestParameterItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterWriteVarRequest factory function for S7ParameterWriteVarRequest func NewS7ParameterWriteVarRequest(items []*S7VarRequestParameterItem) *S7Parameter { child := &S7ParameterWriteVarRequest{ Items: items, @@ -108,12 +109,12 @@ func (m *S7ParameterWriteVarRequest) GetTypeName() string { return "S7ParameterWriteVarRequest" } -func (m *S7ParameterWriteVarRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterWriteVarRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterWriteVarRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterWriteVarRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (numItems) lengthInBits += 8 @@ -122,15 +123,15 @@ func (m *S7ParameterWriteVarRequest) LengthInBitsConditional(lastItem bool) uint if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7ParameterWriteVarRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterWriteVarRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterWriteVarRequestParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { @@ -184,7 +185,7 @@ func (m *S7ParameterWriteVarRequest) Serialize(writeBuffer utils.WriteBuffer) er } // Implicit Field (numItems) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - numItems := uint8(uint8(len(m.Items))) + numItems := uint8(uint8(len(m.GetItems()))) _numItemsErr := writeBuffer.WriteUint8("numItems", 8, (numItems)) if _numItemsErr != nil { return errors.Wrap(_numItemsErr, "Error serializing 'numItems' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go index d2a6ebcf57e..31ce4da9041 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go @@ -36,10 +36,10 @@ type S7ParameterWriteVarResponse struct { type IS7ParameterWriteVarResponse interface { // GetNumItems returns NumItems GetNumItems() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,6 +76,7 @@ func (m *S7ParameterWriteVarResponse) GetNumItems() uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7ParameterWriteVarResponse factory function for S7ParameterWriteVarResponse func NewS7ParameterWriteVarResponse(numItems uint8) *S7Parameter { child := &S7ParameterWriteVarResponse{ NumItems: numItems, @@ -108,12 +109,12 @@ func (m *S7ParameterWriteVarResponse) GetTypeName() string { return "S7ParameterWriteVarResponse" } -func (m *S7ParameterWriteVarResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7ParameterWriteVarResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7ParameterWriteVarResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7ParameterWriteVarResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (numItems) lengthInBits += 8 @@ -121,8 +122,8 @@ func (m *S7ParameterWriteVarResponse) LengthInBitsConditional(lastItem bool) uin return lengthInBits } -func (m *S7ParameterWriteVarResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7ParameterWriteVarResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7ParameterWriteVarResponseParse(readBuffer utils.ReadBuffer, messageType uint8) (*S7Parameter, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go b/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go index 6f7341a94e5..6a18571c1bd 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go @@ -28,7 +28,10 @@ import ( // The data-structure of this message type S7Payload struct { - Child IS7PayloadChild + + // Arguments. + Parameter S7Parameter + Child IS7PayloadChild } // The corresponding interface @@ -37,10 +40,10 @@ type IS7Payload interface { MessageType() uint8 // ParameterParameterType returns ParameterParameterType ParameterParameterType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -65,8 +68,9 @@ type IS7PayloadChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewS7Payload() *S7Payload { - return &S7Payload{} +// NewS7Payload factory function for S7Payload +func NewS7Payload(parameter S7Parameter) *S7Payload { + return &S7Payload{Parameter: parameter} } func CastS7Payload(structType interface{}) *S7Payload { @@ -86,22 +90,22 @@ func (m *S7Payload) GetTypeName() string { return "S7Payload" } -func (m *S7Payload) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7Payload) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7Payload) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7Payload) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7Payload) ParentLengthInBits() uint16 { +func (m *S7Payload) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) return lengthInBits } -func (m *S7Payload) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7Payload) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadParse(readBuffer utils.ReadBuffer, messageType uint8, parameter *S7Parameter) (*S7Payload, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go index 9b07e7ca562..3fcce202394 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go @@ -36,10 +36,10 @@ type S7PayloadAlarm8 struct { type IS7PayloadAlarm8 interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessagePushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadAlarm8) GetAlarmMessage() *AlarmMessagePushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadAlarm8 factory function for S7PayloadAlarm8 func NewS7PayloadAlarm8(alarmMessage *AlarmMessagePushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadAlarm8{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadAlarm8) GetTypeName() string { return "S7PayloadAlarm8" } -func (m *S7PayloadAlarm8) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadAlarm8) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadAlarm8) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadAlarm8) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadAlarm8) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadAlarm8) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadAlarm8Parse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go index 7ddb83a943e..93388d61b04 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go @@ -36,10 +36,10 @@ type S7PayloadAlarmAckInd struct { type IS7PayloadAlarmAckInd interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessageAckPushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadAlarmAckInd) GetAlarmMessage() *AlarmMessageAckPushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadAlarmAckInd factory function for S7PayloadAlarmAckInd func NewS7PayloadAlarmAckInd(alarmMessage *AlarmMessageAckPushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadAlarmAckInd{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadAlarmAckInd) GetTypeName() string { return "S7PayloadAlarmAckInd" } -func (m *S7PayloadAlarmAckInd) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadAlarmAckInd) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadAlarmAckInd) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadAlarmAckInd) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadAlarmAckInd) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadAlarmAckInd) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadAlarmAckIndParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go index 6895a3a3da0..a6a02fc693a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go @@ -36,10 +36,10 @@ type S7PayloadAlarmS struct { type IS7PayloadAlarmS interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessagePushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadAlarmS) GetAlarmMessage() *AlarmMessagePushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadAlarmS factory function for S7PayloadAlarmS func NewS7PayloadAlarmS(alarmMessage *AlarmMessagePushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadAlarmS{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadAlarmS) GetTypeName() string { return "S7PayloadAlarmS" } -func (m *S7PayloadAlarmS) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadAlarmS) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadAlarmS) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadAlarmS) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadAlarmS) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadAlarmS) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadAlarmSParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go index 6e502b826ca..fe011db05ab 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go @@ -36,10 +36,10 @@ type S7PayloadAlarmSC struct { type IS7PayloadAlarmSC interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessagePushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadAlarmSC) GetAlarmMessage() *AlarmMessagePushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadAlarmSC factory function for S7PayloadAlarmSC func NewS7PayloadAlarmSC(alarmMessage *AlarmMessagePushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadAlarmSC{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadAlarmSC) GetTypeName() string { return "S7PayloadAlarmSC" } -func (m *S7PayloadAlarmSC) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadAlarmSC) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadAlarmSC) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadAlarmSC) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadAlarmSC) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadAlarmSC) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadAlarmSCParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go index 6ecd9d8fa90..cf0198e74a3 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go @@ -36,10 +36,10 @@ type S7PayloadAlarmSQ struct { type IS7PayloadAlarmSQ interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessagePushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadAlarmSQ) GetAlarmMessage() *AlarmMessagePushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadAlarmSQ factory function for S7PayloadAlarmSQ func NewS7PayloadAlarmSQ(alarmMessage *AlarmMessagePushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadAlarmSQ{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadAlarmSQ) GetTypeName() string { return "S7PayloadAlarmSQ" } -func (m *S7PayloadAlarmSQ) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadAlarmSQ) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadAlarmSQ) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadAlarmSQ) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadAlarmSQ) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadAlarmSQ) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadAlarmSQParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go index 98e4073f7a8..5ba6db9d38c 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go @@ -54,10 +54,10 @@ type IS7PayloadDiagnosticMessage interface { GetInfo2() uint32 // GetTimeStamp returns TimeStamp GetTimeStamp() *DateAndTime - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -129,6 +129,7 @@ func (m *S7PayloadDiagnosticMessage) GetTimeStamp() *DateAndTime { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadDiagnosticMessage factory function for S7PayloadDiagnosticMessage func NewS7PayloadDiagnosticMessage(EventId uint16, PriorityClass uint8, ObNumber uint8, DatId uint16, Info1 uint16, Info2 uint32, TimeStamp *DateAndTime, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadDiagnosticMessage{ EventId: EventId, @@ -167,12 +168,12 @@ func (m *S7PayloadDiagnosticMessage) GetTypeName() string { return "S7PayloadDiagnosticMessage" } -func (m *S7PayloadDiagnosticMessage) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadDiagnosticMessage) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadDiagnosticMessage) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadDiagnosticMessage) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (EventId) lengthInBits += 16 @@ -193,13 +194,13 @@ func (m *S7PayloadDiagnosticMessage) LengthInBitsConditional(lastItem bool) uint lengthInBits += 32 // Simple field (TimeStamp) - lengthInBits += m.TimeStamp.LengthInBits() + lengthInBits += m.TimeStamp.GetLengthInBits() return lengthInBits } -func (m *S7PayloadDiagnosticMessage) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadDiagnosticMessage) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadDiagnosticMessageParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go index 2ec4c775ffb..e37cf33c263 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go @@ -36,10 +36,10 @@ type S7PayloadNotify struct { type IS7PayloadNotify interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessagePushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadNotify) GetAlarmMessage() *AlarmMessagePushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadNotify factory function for S7PayloadNotify func NewS7PayloadNotify(alarmMessage *AlarmMessagePushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadNotify{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadNotify) GetTypeName() string { return "S7PayloadNotify" } -func (m *S7PayloadNotify) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadNotify) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadNotify) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadNotify) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadNotify) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadNotify) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadNotifyParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go index 37e01492fe9..1cb715ad875 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go @@ -36,10 +36,10 @@ type S7PayloadNotify8 struct { type IS7PayloadNotify8 interface { // GetAlarmMessage returns AlarmMessage GetAlarmMessage() *AlarmMessagePushType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -87,6 +87,7 @@ func (m *S7PayloadNotify8) GetAlarmMessage() *AlarmMessagePushType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadNotify8 factory function for S7PayloadNotify8 func NewS7PayloadNotify8(alarmMessage *AlarmMessagePushType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadNotify8{ AlarmMessage: alarmMessage, @@ -119,21 +120,21 @@ func (m *S7PayloadNotify8) GetTypeName() string { return "S7PayloadNotify8" } -func (m *S7PayloadNotify8) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadNotify8) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadNotify8) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadNotify8) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (alarmMessage) - lengthInBits += m.AlarmMessage.LengthInBits() + lengthInBits += m.AlarmMessage.GetLengthInBits() return lengthInBits } -func (m *S7PayloadNotify8) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadNotify8) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadNotify8Parse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go index 21490a580e7..3acc0124cab 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go @@ -30,16 +30,19 @@ import ( type S7PayloadReadVarResponse struct { *S7Payload Items []*S7VarPayloadDataItem + + // Arguments. + Parameter S7Parameter } // The corresponding interface type IS7PayloadReadVarResponse interface { // GetItems returns Items GetItems() []*S7VarPayloadDataItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,10 +79,11 @@ func (m *S7PayloadReadVarResponse) GetItems() []*S7VarPayloadDataItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewS7PayloadReadVarResponse(items []*S7VarPayloadDataItem) *S7Payload { +// NewS7PayloadReadVarResponse factory function for S7PayloadReadVarResponse +func NewS7PayloadReadVarResponse(items []*S7VarPayloadDataItem, parameter S7Parameter) *S7Payload { child := &S7PayloadReadVarResponse{ Items: items, - S7Payload: NewS7Payload(), + S7Payload: NewS7Payload(parameter), } child.Child = child return child.S7Payload @@ -108,26 +112,26 @@ func (m *S7PayloadReadVarResponse) GetTypeName() string { return "S7PayloadReadVarResponse" } -func (m *S7PayloadReadVarResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadReadVarResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadReadVarResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadReadVarResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7PayloadReadVarResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadReadVarResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadReadVarResponseParse(readBuffer utils.ReadBuffer, messageType uint8, parameter *S7Parameter) (*S7Payload, error) { @@ -140,9 +144,9 @@ func S7PayloadReadVarResponseParse(readBuffer utils.ReadBuffer, messageType uint return nil, pullErr } // Count array - items := make([]*S7VarPayloadDataItem, CastS7ParameterReadVarResponse(parameter).NumItems) + items := make([]*S7VarPayloadDataItem, CastS7ParameterReadVarResponse(parameter).GetNumItems()) { - for curItem := uint16(0); curItem < uint16(CastS7ParameterReadVarResponse(parameter).NumItems); curItem++ { + for curItem := uint16(0); curItem < uint16(CastS7ParameterReadVarResponse(parameter).GetNumItems()); curItem++ { _item, _err := S7VarPayloadDataItemParse(readBuffer) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'items' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go index d64ad84d75d..720e7abf57d 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go @@ -30,16 +30,19 @@ import ( type S7PayloadUserData struct { *S7Payload Items []*S7PayloadUserDataItem + + // Arguments. + Parameter S7Parameter } // The corresponding interface type IS7PayloadUserData interface { // GetItems returns Items GetItems() []*S7PayloadUserDataItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,10 +79,11 @@ func (m *S7PayloadUserData) GetItems() []*S7PayloadUserDataItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewS7PayloadUserData(items []*S7PayloadUserDataItem) *S7Payload { +// NewS7PayloadUserData factory function for S7PayloadUserData +func NewS7PayloadUserData(items []*S7PayloadUserDataItem, parameter S7Parameter) *S7Payload { child := &S7PayloadUserData{ Items: items, - S7Payload: NewS7Payload(), + S7Payload: NewS7Payload(parameter), } child.Child = child return child.S7Payload @@ -108,26 +112,26 @@ func (m *S7PayloadUserData) GetTypeName() string { return "S7PayloadUserData" } -func (m *S7PayloadUserData) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserData) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserData) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserData) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7PayloadUserData) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserData) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataParse(readBuffer utils.ReadBuffer, messageType uint8, parameter *S7Parameter) (*S7Payload, error) { @@ -140,10 +144,10 @@ func S7PayloadUserDataParse(readBuffer utils.ReadBuffer, messageType uint8, para return nil, pullErr } // Count array - items := make([]*S7PayloadUserDataItem, uint16(len(CastS7ParameterUserData(parameter).Items))) + items := make([]*S7PayloadUserDataItem, uint16(len(CastS7ParameterUserData(parameter).GetItems()))) { - for curItem := uint16(0); curItem < uint16(uint16(len(CastS7ParameterUserData(parameter).Items))); curItem++ { - _item, _err := S7PayloadUserDataItemParse(readBuffer, CastS7ParameterUserDataItemCPUFunctions(CastS7ParameterUserData(parameter).Items[0]).CpuFunctionType, CastS7ParameterUserDataItemCPUFunctions(CastS7ParameterUserData(parameter).Items[0]).CpuSubfunction) + for curItem := uint16(0); curItem < uint16(uint16(len(CastS7ParameterUserData(parameter).GetItems()))); curItem++ { + _item, _err := S7PayloadUserDataItemParse(readBuffer, CastS7ParameterUserDataItemCPUFunctions(CastS7ParameterUserData(parameter).GetItems()[0]).GetCpuFunctionType(), CastS7ParameterUserDataItemCPUFunctions(CastS7ParameterUserData(parameter).GetItems()[0]).GetCpuSubfunction()) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'items' field") } diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go index d892fab2385..7e1ee5d676b 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go @@ -45,10 +45,10 @@ type IS7PayloadUserDataItem interface { GetReturnCode() DataTransportErrorCode // GetTransportSize returns TransportSize GetTransportSize() DataTransportSize - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -80,6 +80,7 @@ func (m *S7PayloadUserDataItem) GetTransportSize() DataTransportSize { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItem factory function for S7PayloadUserDataItem func NewS7PayloadUserDataItem(returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { return &S7PayloadUserDataItem{ReturnCode: returnCode, TransportSize: transportSize} } @@ -101,15 +102,15 @@ func (m *S7PayloadUserDataItem) GetTypeName() string { return "S7PayloadUserDataItem" } -func (m *S7PayloadUserDataItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItem) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7PayloadUserDataItem) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7PayloadUserDataItem) ParentLengthInBits() uint16 { +func (m *S7PayloadUserDataItem) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Simple field (returnCode) @@ -124,8 +125,8 @@ func (m *S7PayloadUserDataItem) ParentLengthInBits() uint16 { return lengthInBits } -func (m *S7PayloadUserDataItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { @@ -257,7 +258,7 @@ func (m *S7PayloadUserDataItem) SerializeParent(writeBuffer utils.WriteBuffer, c } // Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - dataLength := uint16(uint16(uint16(m.LengthInBytes())) - uint16(uint16(4))) + dataLength := uint16(uint16(uint16(m.GetLengthInBytes())) - uint16(uint16(4))) _dataLengthErr := writeBuffer.WriteUint16("dataLength", 16, (dataLength)) if _dataLengthErr != nil { return errors.Wrap(_dataLengthErr, "Error serializing 'dataLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go index 5fa2d6daab0..3e171d1b5f2 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go @@ -39,10 +39,10 @@ type IS7PayloadUserDataItemCpuFunctionAlarmAck interface { GetFunctionId() uint8 // GetMessageObjects returns MessageObjects GetMessageObjects() []*AlarmMessageObjectAckType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -94,6 +94,7 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetMessageObjects() []*AlarmM // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionAlarmAck factory function for S7PayloadUserDataItemCpuFunctionAlarmAck func NewS7PayloadUserDataItemCpuFunctionAlarmAck(functionId uint8, messageObjects []*AlarmMessageObjectAckType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionAlarmAck{ FunctionId: functionId, @@ -127,12 +128,12 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetTypeName() string { return "S7PayloadUserDataItemCpuFunctionAlarmAck" } -func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (functionId) lengthInBits += 8 @@ -144,15 +145,15 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) LengthInBitsConditional(lastI if len(m.MessageObjects) > 0 { for i, element := range m.MessageObjects { last := i == len(m.MessageObjects)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionAlarmAckParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { @@ -221,7 +222,7 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) Serialize(writeBuffer utils.W } // Implicit Field (numberOfObjects) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - numberOfObjects := uint8(uint8(len(m.MessageObjects))) + numberOfObjects := uint8(uint8(len(m.GetMessageObjects()))) _numberOfObjectsErr := writeBuffer.WriteUint8("numberOfObjects", 8, (numberOfObjects)) if _numberOfObjectsErr != nil { return errors.Wrap(_numberOfObjectsErr, "Error serializing 'numberOfObjects' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go index 56639a71f0a..34d711af0cc 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go @@ -39,10 +39,10 @@ type IS7PayloadUserDataItemCpuFunctionAlarmAckResponse interface { GetFunctionId() uint8 // GetMessageObjects returns MessageObjects GetMessageObjects() []uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -94,6 +94,7 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetMessageObjects() [ // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionAlarmAckResponse factory function for S7PayloadUserDataItemCpuFunctionAlarmAckResponse func NewS7PayloadUserDataItemCpuFunctionAlarmAckResponse(functionId uint8, messageObjects []uint8, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionAlarmAckResponse{ FunctionId: functionId, @@ -127,12 +128,12 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetTypeName() string return "S7PayloadUserDataItemCpuFunctionAlarmAckResponse" } -func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (functionId) lengthInBits += 8 @@ -148,8 +149,8 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) LengthInBitsCondition return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionAlarmAckResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { @@ -218,7 +219,7 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) Serialize(writeBuffer } // Implicit Field (numberOfObjects) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - numberOfObjects := uint8(uint8(len(m.MessageObjects))) + numberOfObjects := uint8(uint8(len(m.GetMessageObjects()))) _numberOfObjectsErr := writeBuffer.WriteUint8("numberOfObjects", 8, (numberOfObjects)) if _numberOfObjectsErr != nil { return errors.Wrap(_numberOfObjectsErr, "Error serializing 'numberOfObjects' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go index ee673bdc8f4..58aae6d70ed 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go @@ -50,10 +50,10 @@ type IS7PayloadUserDataItemCpuFunctionAlarmQuery interface { GetQueryType() QueryType // GetAlarmType returns AlarmType GetAlarmType() AlarmType - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -109,6 +109,7 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetAlarmType() AlarmType { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionAlarmQuery factory function for S7PayloadUserDataItemCpuFunctionAlarmQuery func NewS7PayloadUserDataItemCpuFunctionAlarmQuery(syntaxId SyntaxIdType, queryType QueryType, alarmType AlarmType, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionAlarmQuery{ SyntaxId: syntaxId, @@ -143,12 +144,12 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetTypeName() string { return "S7PayloadUserDataItemCpuFunctionAlarmQuery" } -func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (functionId) lengthInBits += 8 @@ -180,8 +181,8 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) LengthInBitsConditional(las return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionAlarmQueryParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go index 6ab85eecd23..50d3346218a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go @@ -45,10 +45,10 @@ type IS7PayloadUserDataItemCpuFunctionAlarmQueryResponse interface { GetPudicfReturnCode() DataTransportErrorCode // GetPudicftransportSize returns PudicftransportSize GetPudicftransportSize() DataTransportSize - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -100,6 +100,7 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetPudicftransportS // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionAlarmQueryResponse factory function for S7PayloadUserDataItemCpuFunctionAlarmQueryResponse func NewS7PayloadUserDataItemCpuFunctionAlarmQueryResponse(pudicfReturnCode DataTransportErrorCode, pudicftransportSize DataTransportSize, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionAlarmQueryResponse{ PudicfReturnCode: pudicfReturnCode, @@ -133,12 +134,12 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetTypeName() strin return "S7PayloadUserDataItemCpuFunctionAlarmQueryResponse" } -func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Const Field (functionId) lengthInBits += 8 @@ -158,8 +159,8 @@ func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) LengthInBitsConditi return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionAlarmQueryResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go index c63cc82fa71..594a1ba5254 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go @@ -46,10 +46,10 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscription interface { GetAlarmtype() *AlarmStateType // GetReserve returns Reserve GetReserve() *uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -109,6 +109,7 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetReserve() *uint8 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionMsgSubscription factory function for S7PayloadUserDataItemCpuFunctionMsgSubscription func NewS7PayloadUserDataItemCpuFunctionMsgSubscription(Subscription uint8, magicKey string, Alarmtype *AlarmStateType, Reserve *uint8, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionMsgSubscription{ Subscription: Subscription, @@ -144,12 +145,12 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetTypeName() string { return "S7PayloadUserDataItemCpuFunctionMsgSubscription" } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (Subscription) lengthInBits += 8 @@ -173,8 +174,8 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) LengthInBitsConditiona return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionMsgSubscriptionParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go index 7ba6c6e6bf5..bf0cc5d3864 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go @@ -48,10 +48,10 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse interface { GetReserved02() uint8 // GetReserved03 returns Reserved03 GetReserved03() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -115,6 +115,7 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetReserv // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse factory function for S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse func NewS7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse(result uint8, reserved01 uint8, alarmType AlarmType, reserved02 uint8, reserved03 uint8, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse{ Result: result, @@ -151,12 +152,12 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetTypeNa return "S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse" } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 8 @@ -176,8 +177,8 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) LengthInB return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go index 1ffb43b37ab..19a5fe13331 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go @@ -32,10 +32,10 @@ type S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse struct { // The corresponding interface type IS7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse interface { - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -80,6 +80,7 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) InitializePare // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse factory function for S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse func NewS7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse(returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse{ S7PayloadUserDataItem: NewS7PayloadUserDataItem(returnCode, transportSize), @@ -111,18 +112,18 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetTypeName() return "S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse" } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go index e60a67c58ef..dcdb0a8a585 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go @@ -39,10 +39,10 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse interface { GetResult() uint8 // GetReserved01 returns Reserved01 GetReserved01() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -94,6 +94,7 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetReserved // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse factory function for S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse func NewS7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse(result uint8, reserved01 uint8, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse{ Result: result, @@ -127,12 +128,12 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetTypeName return "S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse" } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (result) lengthInBits += 8 @@ -143,8 +144,8 @@ func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) LengthInBit return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go index d78412f72f9..049929a3e45 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go @@ -39,10 +39,10 @@ type IS7PayloadUserDataItemCpuFunctionReadSzlRequest interface { GetSzlId() *SzlId // GetSzlIndex returns SzlIndex GetSzlIndex() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -94,6 +94,7 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetSzlIndex() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionReadSzlRequest factory function for S7PayloadUserDataItemCpuFunctionReadSzlRequest func NewS7PayloadUserDataItemCpuFunctionReadSzlRequest(szlId *SzlId, szlIndex uint16, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionReadSzlRequest{ SzlId: szlId, @@ -127,15 +128,15 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetTypeName() string { return "S7PayloadUserDataItemCpuFunctionReadSzlRequest" } -func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (szlId) - lengthInBits += m.SzlId.LengthInBits() + lengthInBits += m.SzlId.GetLengthInBits() // Simple field (szlIndex) lengthInBits += 16 @@ -143,8 +144,8 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) LengthInBitsConditional return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionReadSzlRequestParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go index 10a3ef5095f..fc36fa95109 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go @@ -46,10 +46,10 @@ type IS7PayloadUserDataItemCpuFunctionReadSzlResponse interface { GetSzlIndex() uint16 // GetItems returns Items GetItems() []*SzlDataTreeItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -105,6 +105,7 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetItems() []*SzlDataT // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7PayloadUserDataItemCpuFunctionReadSzlResponse factory function for S7PayloadUserDataItemCpuFunctionReadSzlResponse func NewS7PayloadUserDataItemCpuFunctionReadSzlResponse(szlId *SzlId, szlIndex uint16, items []*SzlDataTreeItem, returnCode DataTransportErrorCode, transportSize DataTransportSize) *S7PayloadUserDataItem { child := &S7PayloadUserDataItemCpuFunctionReadSzlResponse{ SzlId: szlId, @@ -139,15 +140,15 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetTypeName() string { return "S7PayloadUserDataItemCpuFunctionReadSzlResponse" } -func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Simple field (szlId) - lengthInBits += m.SzlId.LengthInBits() + lengthInBits += m.SzlId.GetLengthInBits() // Simple field (szlIndex) lengthInBits += 16 @@ -162,15 +163,15 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) LengthInBitsConditiona if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadUserDataItemCpuFunctionReadSzlResponseParse(readBuffer utils.ReadBuffer, cpuFunctionType uint8, cpuSubfunction uint8) (*S7PayloadUserDataItem, error) { @@ -280,7 +281,7 @@ func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) Serialize(writeBuffer } // Implicit Field (szlItemCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - szlItemCount := uint16(uint16(len(m.Items))) + szlItemCount := uint16(uint16(len(m.GetItems()))) _szlItemCountErr := writeBuffer.WriteUint16("szlItemCount", 16, (szlItemCount)) if _szlItemCountErr != nil { return errors.Wrap(_szlItemCountErr, "Error serializing 'szlItemCount' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go index b2566ff5875..656329f5307 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go @@ -30,16 +30,19 @@ import ( type S7PayloadWriteVarRequest struct { *S7Payload Items []*S7VarPayloadDataItem + + // Arguments. + Parameter S7Parameter } // The corresponding interface type IS7PayloadWriteVarRequest interface { // GetItems returns Items GetItems() []*S7VarPayloadDataItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,10 +79,11 @@ func (m *S7PayloadWriteVarRequest) GetItems() []*S7VarPayloadDataItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewS7PayloadWriteVarRequest(items []*S7VarPayloadDataItem) *S7Payload { +// NewS7PayloadWriteVarRequest factory function for S7PayloadWriteVarRequest +func NewS7PayloadWriteVarRequest(items []*S7VarPayloadDataItem, parameter S7Parameter) *S7Payload { child := &S7PayloadWriteVarRequest{ Items: items, - S7Payload: NewS7Payload(), + S7Payload: NewS7Payload(parameter), } child.Child = child return child.S7Payload @@ -108,26 +112,26 @@ func (m *S7PayloadWriteVarRequest) GetTypeName() string { return "S7PayloadWriteVarRequest" } -func (m *S7PayloadWriteVarRequest) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadWriteVarRequest) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadWriteVarRequest) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadWriteVarRequest) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7PayloadWriteVarRequest) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadWriteVarRequest) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadWriteVarRequestParse(readBuffer utils.ReadBuffer, messageType uint8, parameter *S7Parameter) (*S7Payload, error) { @@ -140,9 +144,9 @@ func S7PayloadWriteVarRequestParse(readBuffer utils.ReadBuffer, messageType uint return nil, pullErr } // Count array - items := make([]*S7VarPayloadDataItem, uint16(len(CastS7ParameterWriteVarRequest(parameter).Items))) + items := make([]*S7VarPayloadDataItem, uint16(len(CastS7ParameterWriteVarRequest(parameter).GetItems()))) { - for curItem := uint16(0); curItem < uint16(uint16(len(CastS7ParameterWriteVarRequest(parameter).Items))); curItem++ { + for curItem := uint16(0); curItem < uint16(uint16(len(CastS7ParameterWriteVarRequest(parameter).GetItems()))); curItem++ { _item, _err := S7VarPayloadDataItemParse(readBuffer) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'items' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go index d15760223e3..ceb1f02a639 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go @@ -30,16 +30,19 @@ import ( type S7PayloadWriteVarResponse struct { *S7Payload Items []*S7VarPayloadStatusItem + + // Arguments. + Parameter S7Parameter } // The corresponding interface type IS7PayloadWriteVarResponse interface { // GetItems returns Items GetItems() []*S7VarPayloadStatusItem - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -76,10 +79,11 @@ func (m *S7PayloadWriteVarResponse) GetItems() []*S7VarPayloadStatusItem { // Accessors for virtual fields. /////////////////////////////////////////////////////////// -func NewS7PayloadWriteVarResponse(items []*S7VarPayloadStatusItem) *S7Payload { +// NewS7PayloadWriteVarResponse factory function for S7PayloadWriteVarResponse +func NewS7PayloadWriteVarResponse(items []*S7VarPayloadStatusItem, parameter S7Parameter) *S7Payload { child := &S7PayloadWriteVarResponse{ Items: items, - S7Payload: NewS7Payload(), + S7Payload: NewS7Payload(parameter), } child.Child = child return child.S7Payload @@ -108,26 +112,26 @@ func (m *S7PayloadWriteVarResponse) GetTypeName() string { return "S7PayloadWriteVarResponse" } -func (m *S7PayloadWriteVarResponse) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7PayloadWriteVarResponse) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7PayloadWriteVarResponse) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7PayloadWriteVarResponse) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Array field if len(m.Items) > 0 { for i, element := range m.Items { last := i == len(m.Items)-1 - lengthInBits += element.LengthInBitsConditional(last) + lengthInBits += element.GetLengthInBitsConditional(last) } } return lengthInBits } -func (m *S7PayloadWriteVarResponse) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7PayloadWriteVarResponse) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7PayloadWriteVarResponseParse(readBuffer utils.ReadBuffer, messageType uint8, parameter *S7Parameter) (*S7Payload, error) { @@ -140,9 +144,9 @@ func S7PayloadWriteVarResponseParse(readBuffer utils.ReadBuffer, messageType uin return nil, pullErr } // Count array - items := make([]*S7VarPayloadStatusItem, CastS7ParameterWriteVarResponse(parameter).NumItems) + items := make([]*S7VarPayloadStatusItem, CastS7ParameterWriteVarResponse(parameter).GetNumItems()) { - for curItem := uint16(0); curItem < uint16(CastS7ParameterWriteVarResponse(parameter).NumItems); curItem++ { + for curItem := uint16(0); curItem < uint16(CastS7ParameterWriteVarResponse(parameter).GetNumItems()); curItem++ { _item, _err := S7VarPayloadStatusItemParse(readBuffer) if _err != nil { return nil, errors.Wrap(_err, "Error parsing 'items' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go index 4577e643a25..a115de5c614 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go @@ -42,10 +42,10 @@ type IS7VarPayloadDataItem interface { GetTransportSize() DataTransportSize // GetData returns Data GetData() []byte - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -69,6 +69,7 @@ func (m *S7VarPayloadDataItem) GetData() []byte { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7VarPayloadDataItem factory function for S7VarPayloadDataItem func NewS7VarPayloadDataItem(returnCode DataTransportErrorCode, transportSize DataTransportSize, data []byte) *S7VarPayloadDataItem { return &S7VarPayloadDataItem{ReturnCode: returnCode, TransportSize: transportSize, Data: data} } @@ -90,11 +91,11 @@ func (m *S7VarPayloadDataItem) GetTypeName() string { return "S7VarPayloadDataItem" } -func (m *S7VarPayloadDataItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7VarPayloadDataItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7VarPayloadDataItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *S7VarPayloadDataItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (returnCode) @@ -112,7 +113,7 @@ func (m *S7VarPayloadDataItem) LengthInBitsConditional(lastItem bool) uint16 { } // Padding Field (padding) - _timesPadding := uint8(int32(int32(len(m.Data))) % int32(int32(2))) + _timesPadding := uint8(int32(int32(len(m.GetData()))) % int32(int32(2))) for ; _timesPadding > 0; _timesPadding-- { lengthInBits += 8 } @@ -120,8 +121,8 @@ func (m *S7VarPayloadDataItem) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *S7VarPayloadDataItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7VarPayloadDataItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7VarPayloadDataItemParse(readBuffer utils.ReadBuffer) (*S7VarPayloadDataItem, error) { @@ -224,8 +225,8 @@ func (m *S7VarPayloadDataItem) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - dataLength := uint16(uint16(uint16(len(m.Data))) * uint16(uint16(utils.InlineIf(bool(bool((m.TransportSize) == (DataTransportSize_BIT))), func() interface{} { return uint16(uint16(1)) }, func() interface{} { - return uint16(uint16(utils.InlineIf(m.TransportSize.SizeInBits(), func() interface{} { return uint16(uint16(8)) }, func() interface{} { return uint16(uint16(1)) }).(uint16))) + dataLength := uint16(uint16(uint16(len(m.GetData()))) * uint16(uint16(utils.InlineIf(bool(bool((m.GetTransportSize()) == (DataTransportSize_BIT))), func() interface{} { return uint16(uint16(1)) }, func() interface{} { + return uint16(uint16(utils.InlineIf(m.GetTransportSize().SizeInBits(), func() interface{} { return uint16(uint16(8)) }, func() interface{} { return uint16(uint16(1)) }).(uint16))) }).(uint16)))) _dataLengthErr := writeBuffer.WriteUint16("dataLength", 16, (dataLength)) if _dataLengthErr != nil { @@ -246,7 +247,7 @@ func (m *S7VarPayloadDataItem) Serialize(writeBuffer utils.WriteBuffer) error { if pushErr := writeBuffer.PushContext("padding", utils.WithRenderAsList(true)); pushErr != nil { return pushErr } - _timesPadding := uint8(int32(int32(len(m.Data))) % int32(int32(2))) + _timesPadding := uint8(int32(int32(len(m.GetData()))) % int32(int32(2))) for ; _timesPadding > 0; _timesPadding-- { _paddingValue := uint8(0x00) _paddingErr := writeBuffer.WriteUint8("", 8, (_paddingValue)) diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadStatusItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadStatusItem.go index ff4dddf2733..c8d21094816 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadStatusItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadStatusItem.go @@ -35,10 +35,10 @@ type S7VarPayloadStatusItem struct { type IS7VarPayloadStatusItem interface { // GetReturnCode returns ReturnCode GetReturnCode() DataTransportErrorCode - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *S7VarPayloadStatusItem) GetReturnCode() DataTransportErrorCode { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7VarPayloadStatusItem factory function for S7VarPayloadStatusItem func NewS7VarPayloadStatusItem(returnCode DataTransportErrorCode) *S7VarPayloadStatusItem { return &S7VarPayloadStatusItem{ReturnCode: returnCode} } @@ -75,11 +76,11 @@ func (m *S7VarPayloadStatusItem) GetTypeName() string { return "S7VarPayloadStatusItem" } -func (m *S7VarPayloadStatusItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7VarPayloadStatusItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7VarPayloadStatusItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *S7VarPayloadStatusItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (returnCode) @@ -88,8 +89,8 @@ func (m *S7VarPayloadStatusItem) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *S7VarPayloadStatusItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7VarPayloadStatusItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7VarPayloadStatusItemParse(readBuffer utils.ReadBuffer) (*S7VarPayloadStatusItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go index b503b62044e..db61387d017 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go @@ -35,10 +35,10 @@ type S7VarRequestParameterItem struct { type IS7VarRequestParameterItem interface { // ItemType returns ItemType ItemType() uint8 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -63,6 +63,7 @@ type IS7VarRequestParameterItemChild interface { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7VarRequestParameterItem factory function for S7VarRequestParameterItem func NewS7VarRequestParameterItem() *S7VarRequestParameterItem { return &S7VarRequestParameterItem{} } @@ -84,15 +85,15 @@ func (m *S7VarRequestParameterItem) GetTypeName() string { return "S7VarRequestParameterItem" } -func (m *S7VarRequestParameterItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7VarRequestParameterItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7VarRequestParameterItem) LengthInBitsConditional(lastItem bool) uint16 { - return m.Child.LengthInBits() +func (m *S7VarRequestParameterItem) GetLengthInBitsConditional(lastItem bool) uint16 { + return m.Child.GetLengthInBits() } -func (m *S7VarRequestParameterItem) ParentLengthInBits() uint16 { +func (m *S7VarRequestParameterItem) GetParentLengthInBits() uint16 { lengthInBits := uint16(0) // Discriminator Field (itemType) lengthInBits += 8 @@ -100,8 +101,8 @@ func (m *S7VarRequestParameterItem) ParentLengthInBits() uint16 { return lengthInBits } -func (m *S7VarRequestParameterItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7VarRequestParameterItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7VarRequestParameterItemParse(readBuffer utils.ReadBuffer) (*S7VarRequestParameterItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go b/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go index 54352c85fc2..d0bfd1afa81 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go @@ -36,10 +36,10 @@ type S7VarRequestParameterItemAddress struct { type IS7VarRequestParameterItemAddress interface { // GetAddress returns Address GetAddress() *S7Address - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *S7VarRequestParameterItemAddress) GetAddress() *S7Address { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewS7VarRequestParameterItemAddress factory function for S7VarRequestParameterItemAddress func NewS7VarRequestParameterItemAddress(address *S7Address) *S7VarRequestParameterItem { child := &S7VarRequestParameterItemAddress{ Address: address, @@ -100,24 +101,24 @@ func (m *S7VarRequestParameterItemAddress) GetTypeName() string { return "S7VarRequestParameterItemAddress" } -func (m *S7VarRequestParameterItemAddress) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *S7VarRequestParameterItemAddress) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *S7VarRequestParameterItemAddress) LengthInBitsConditional(lastItem bool) uint16 { - lengthInBits := uint16(m.ParentLengthInBits()) +func (m *S7VarRequestParameterItemAddress) GetLengthInBitsConditional(lastItem bool) uint16 { + lengthInBits := uint16(m.GetParentLengthInBits()) // Implicit Field (itemLength) lengthInBits += 8 // Simple field (address) - lengthInBits += m.Address.LengthInBits() + lengthInBits += m.Address.GetLengthInBits() return lengthInBits } -func (m *S7VarRequestParameterItemAddress) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *S7VarRequestParameterItemAddress) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func S7VarRequestParameterItemAddressParse(readBuffer utils.ReadBuffer) (*S7VarRequestParameterItem, error) { @@ -165,7 +166,7 @@ func (m *S7VarRequestParameterItemAddress) Serialize(writeBuffer utils.WriteBuff } // Implicit Field (itemLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - itemLength := uint8(m.Address.LengthInBytes()) + itemLength := uint8(m.GetAddress().GetLengthInBytes()) _itemLengthErr := writeBuffer.WriteUint8("itemLength", 8, (itemLength)) if _itemLengthErr != nil { return errors.Wrap(_itemLengthErr, "Error serializing 'itemLength' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/State.go b/plc4go/internal/plc4go/s7/readwrite/model/State.go index 3df9e7b78a1..9d295bf1e3a 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/State.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/State.go @@ -56,10 +56,10 @@ type IState interface { GetSIG_2() bool // GetSIG_1 returns SIG_1 GetSIG_1() bool - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -103,6 +103,7 @@ func (m *State) GetSIG_1() bool { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewState factory function for State func NewState(SIG_8 bool, SIG_7 bool, SIG_6 bool, SIG_5 bool, SIG_4 bool, SIG_3 bool, SIG_2 bool, SIG_1 bool) *State { return &State{SIG_8: SIG_8, SIG_7: SIG_7, SIG_6: SIG_6, SIG_5: SIG_5, SIG_4: SIG_4, SIG_3: SIG_3, SIG_2: SIG_2, SIG_1: SIG_1} } @@ -124,11 +125,11 @@ func (m *State) GetTypeName() string { return "State" } -func (m *State) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *State) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *State) LengthInBitsConditional(lastItem bool) uint16 { +func (m *State) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (SIG_8) @@ -158,8 +159,8 @@ func (m *State) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *State) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *State) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func StateParse(readBuffer utils.ReadBuffer) (*State, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/SyntaxIdType.go b/plc4go/internal/plc4go/s7/readwrite/model/SyntaxIdType.go index 52dfe87a390..b06e1d29611 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/SyntaxIdType.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/SyntaxIdType.go @@ -152,12 +152,12 @@ func CastSyntaxIdType(structType interface{}) SyntaxIdType { return castFunc(structType) } -func (m SyntaxIdType) LengthInBits() uint16 { +func (m SyntaxIdType) GetLengthInBits() uint16 { return 8 } -func (m SyntaxIdType) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m SyntaxIdType) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SyntaxIdTypeParse(readBuffer utils.ReadBuffer) (SyntaxIdType, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go b/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go index 510833ed120..6d0c53b44bb 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go @@ -47,10 +47,10 @@ type ISzlDataTreeItem interface { GetAusbg() uint16 // GetAusbe returns Ausbe GetAusbe() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -82,6 +82,7 @@ func (m *SzlDataTreeItem) GetAusbe() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSzlDataTreeItem factory function for SzlDataTreeItem func NewSzlDataTreeItem(itemIndex uint16, mlfb []byte, moduleTypeId uint16, ausbg uint16, ausbe uint16) *SzlDataTreeItem { return &SzlDataTreeItem{ItemIndex: itemIndex, Mlfb: mlfb, ModuleTypeId: moduleTypeId, Ausbg: ausbg, Ausbe: ausbe} } @@ -103,11 +104,11 @@ func (m *SzlDataTreeItem) GetTypeName() string { return "SzlDataTreeItem" } -func (m *SzlDataTreeItem) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SzlDataTreeItem) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SzlDataTreeItem) LengthInBitsConditional(lastItem bool) uint16 { +func (m *SzlDataTreeItem) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (itemIndex) @@ -130,8 +131,8 @@ func (m *SzlDataTreeItem) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *SzlDataTreeItem) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SzlDataTreeItem) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SzlDataTreeItemParse(readBuffer utils.ReadBuffer) (*SzlDataTreeItem, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go b/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go index f77a0711ad8..b68451faf4f 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go @@ -41,10 +41,10 @@ type ISzlId interface { GetSublistExtract() uint8 // GetSublistList returns SublistList GetSublistList() SzlSublist - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -68,6 +68,7 @@ func (m *SzlId) GetSublistList() SzlSublist { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewSzlId factory function for SzlId func NewSzlId(typeClass SzlModuleTypeClass, sublistExtract uint8, sublistList SzlSublist) *SzlId { return &SzlId{TypeClass: typeClass, SublistExtract: sublistExtract, SublistList: sublistList} } @@ -89,11 +90,11 @@ func (m *SzlId) GetTypeName() string { return "SzlId" } -func (m *SzlId) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *SzlId) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *SzlId) LengthInBitsConditional(lastItem bool) uint16 { +func (m *SzlId) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (typeClass) @@ -108,8 +109,8 @@ func (m *SzlId) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *SzlId) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *SzlId) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SzlIdParse(readBuffer utils.ReadBuffer) (*SzlId, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/SzlModuleTypeClass.go b/plc4go/internal/plc4go/s7/readwrite/model/SzlModuleTypeClass.go index 39d98472442..2c63188d483 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/SzlModuleTypeClass.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/SzlModuleTypeClass.go @@ -98,12 +98,12 @@ func CastSzlModuleTypeClass(structType interface{}) SzlModuleTypeClass { return castFunc(structType) } -func (m SzlModuleTypeClass) LengthInBits() uint16 { +func (m SzlModuleTypeClass) GetLengthInBits() uint16 { return 4 } -func (m SzlModuleTypeClass) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m SzlModuleTypeClass) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SzlModuleTypeClassParse(readBuffer utils.ReadBuffer) (SzlModuleTypeClass, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/SzlSublist.go b/plc4go/internal/plc4go/s7/readwrite/model/SzlSublist.go index 9aae042d3cd..447d3724285 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/SzlSublist.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/SzlSublist.go @@ -188,12 +188,12 @@ func CastSzlSublist(structType interface{}) SzlSublist { return castFunc(structType) } -func (m SzlSublist) LengthInBits() uint16 { +func (m SzlSublist) GetLengthInBits() uint16 { return 8 } -func (m SzlSublist) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m SzlSublist) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SzlSublistParse(readBuffer utils.ReadBuffer) (SzlSublist, error) { diff --git a/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go b/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go index d31d082269b..ac2eaa54ce9 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go @@ -40,10 +40,10 @@ type TPKTPacket struct { type ITPKTPacket interface { // GetPayload returns Payload GetPayload() *COTPPacket - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -59,6 +59,7 @@ func (m *TPKTPacket) GetPayload() *COTPPacket { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewTPKTPacket factory function for TPKTPacket func NewTPKTPacket(payload *COTPPacket) *TPKTPacket { return &TPKTPacket{Payload: payload} } @@ -80,11 +81,11 @@ func (m *TPKTPacket) GetTypeName() string { return "TPKTPacket" } -func (m *TPKTPacket) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *TPKTPacket) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *TPKTPacket) LengthInBitsConditional(lastItem bool) uint16 { +func (m *TPKTPacket) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Const Field (protocolId) @@ -97,13 +98,13 @@ func (m *TPKTPacket) LengthInBitsConditional(lastItem bool) uint16 { lengthInBits += 16 // Simple field (payload) - lengthInBits += m.Payload.LengthInBits() + lengthInBits += m.Payload.GetLengthInBits() return lengthInBits } -func (m *TPKTPacket) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *TPKTPacket) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TPKTPacketParse(readBuffer utils.ReadBuffer) (*TPKTPacket, error) { @@ -182,7 +183,7 @@ func (m *TPKTPacket) Serialize(writeBuffer utils.WriteBuffer) error { } // Implicit Field (len) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content) - len := uint16(uint16(m.Payload.LengthInBytes()) + uint16(uint16(4))) + len := uint16(uint16(m.GetPayload().GetLengthInBytes()) + uint16(uint16(4))) _lenErr := writeBuffer.WriteUint16("len", 16, (len)) if _lenErr != nil { return errors.Wrap(_lenErr, "Error serializing 'len' field") diff --git a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go index d1deb566d5a..f8c280ad343 100644 --- a/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go +++ b/plc4go/internal/plc4go/s7/readwrite/model/TransportSize.go @@ -1582,12 +1582,12 @@ func CastTransportSize(structType interface{}) TransportSize { return castFunc(structType) } -func (m TransportSize) LengthInBits() uint16 { +func (m TransportSize) GetLengthInBits() uint16 { return 8 } -func (m TransportSize) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m TransportSize) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func TransportSizeParse(readBuffer utils.ReadBuffer) (TransportSize, error) { diff --git a/plc4go/internal/plc4go/s7/s7Io_test.go b/plc4go/internal/plc4go/s7/s7Io_test.go index ac956952e9a..4ec67cbc62b 100644 --- a/plc4go/internal/plc4go/s7/s7Io_test.go +++ b/plc4go/internal/plc4go/s7/s7Io_test.go @@ -52,7 +52,7 @@ func TestS7MessageBytes(t *testing.T) { model.NewCOTPPacketData( false, 13, - []*model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096)}, + []*model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096, 0)}, model.NewS7MessageResponseData( 0, 0, @@ -66,8 +66,10 @@ func TestS7MessageBytes(t *testing.T) { []byte{1}, ), }, + *model.NewS7Parameter(), ), ), + 0, ), ), }, @@ -382,7 +384,7 @@ func TestS7MessageBytes(t *testing.T) { model.NewCOTPPacketData( false, 13, - []*model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096)}, + []*model.COTPParameter{model.NewCOTPParameterTpduSize(model.COTPTpduSize_SIZE_4096, 0)}, model.NewS7MessageRequest( 13, model.NewS7ParameterWriteVarRequest([]*model.S7VarRequestParameterItem{ @@ -395,23 +397,26 @@ func TestS7MessageBytes(t *testing.T) { 0, )), }), - model.NewS7PayloadWriteVarRequest([]*model.S7VarPayloadDataItem{ - model.NewS7VarPayloadDataItem( - model.DataTransportErrorCode_OK, - model.DataTransportSize_BYTE_WORD_DWORD, - []byte{ - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, - }, - ), - }), + model.NewS7PayloadWriteVarRequest( + []*model.S7VarPayloadDataItem{ + model.NewS7VarPayloadDataItem( + model.DataTransportErrorCode_OK, + model.DataTransportSize_BYTE_WORD_DWORD, + []byte{ + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, 0xAF, 0xFE, + }, + ), + }, + *model.NewS7Parameter()), ), + 0, ), ), }, diff --git a/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go b/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go index 77a4e67a5ad..5c4b211937c 100644 --- a/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go +++ b/plc4go/internal/plc4go/simulated/readwrite/model/DataItem.go @@ -393,6 +393,14 @@ func DataItemParse(readBuffer utils.ReadBuffer, dataType string, numberOfValues } func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataType string, numberOfValues uint16) error { + m := struct { + DataType string + NumberOfValues uint16 + }{ + DataType: dataType, + NumberOfValues: numberOfValues, + } + _ = m writeBuffer.PushContext("DataItem") switch { case dataType == "BOOL" && numberOfValues == uint16(1): // BOOL @@ -402,7 +410,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "BOOL": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteBit("", value.GetIndex(i).GetBool()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -415,7 +423,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "BYTE": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -428,7 +436,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "WORD": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint16("", 16, value.GetIndex(i).GetUint16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -441,7 +449,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "DWORD": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint32("", 32, value.GetIndex(i).GetUint32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -454,7 +462,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "LWORD": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint64("", 64, value.GetIndex(i).GetUint64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -467,7 +475,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "SINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt8("", 8, value.GetIndex(i).GetInt8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -480,7 +488,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "INT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt16("", 16, value.GetIndex(i).GetInt16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -493,7 +501,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "DINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt32("", 32, value.GetIndex(i).GetInt32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -506,7 +514,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "LINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteInt64("", 64, value.GetIndex(i).GetInt64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -519,7 +527,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "USINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -532,7 +540,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "UINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint16("", 16, value.GetIndex(i).GetUint16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -545,7 +553,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "UDINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint32("", 32, value.GetIndex(i).GetUint32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -558,7 +566,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "ULINT": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint64("", 64, value.GetIndex(i).GetUint64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -571,7 +579,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "REAL": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteFloat32("", 32, value.GetIndex(i).GetFloat32()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -584,7 +592,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "LREAL": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteFloat64("", 64, value.GetIndex(i).GetFloat64()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -597,7 +605,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "CHAR": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint8("", 8, value.GetIndex(i).GetUint8()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") @@ -610,7 +618,7 @@ func DataItemSerialize(writeBuffer utils.WriteBuffer, value api.PlcValue, dataTy } case dataType == "WCHAR": // List // Array Field (value) - for i := uint32(0); i < uint32(numberOfValues); i++ { + for i := uint32(0); i < uint32(m.NumberOfValues); i++ { _itemErr := writeBuffer.WriteUint16("", 16, value.GetIndex(i).GetUint16()) if _itemErr != nil { return errors.Wrap(_itemErr, "Error serializing 'value' field") diff --git a/plc4go/internal/plc4go/simulated/readwrite/model/Dummy.go b/plc4go/internal/plc4go/simulated/readwrite/model/Dummy.go index 7f21fd87487..e6894f7fe8e 100644 --- a/plc4go/internal/plc4go/simulated/readwrite/model/Dummy.go +++ b/plc4go/internal/plc4go/simulated/readwrite/model/Dummy.go @@ -35,10 +35,10 @@ type Dummy struct { type IDummy interface { // GetDummy returns Dummy GetDummy() uint16 - // LengthInBytes returns the length in bytes - LengthInBytes() uint16 - // LengthInBits returns the length in bits - LengthInBits() uint16 + // GetLengthInBytes returns the length in bytes + GetLengthInBytes() uint16 + // GetLengthInBits returns the length in bits + GetLengthInBits() uint16 // Serialize serializes this type Serialize(writeBuffer utils.WriteBuffer) error } @@ -54,6 +54,7 @@ func (m *Dummy) GetDummy() uint16 { // Accessors for virtual fields. /////////////////////////////////////////////////////////// +// NewDummy factory function for Dummy func NewDummy(dummy uint16) *Dummy { return &Dummy{Dummy: dummy} } @@ -75,11 +76,11 @@ func (m *Dummy) GetTypeName() string { return "Dummy" } -func (m *Dummy) LengthInBits() uint16 { - return m.LengthInBitsConditional(false) +func (m *Dummy) GetLengthInBits() uint16 { + return m.GetLengthInBitsConditional(false) } -func (m *Dummy) LengthInBitsConditional(lastItem bool) uint16 { +func (m *Dummy) GetLengthInBitsConditional(lastItem bool) uint16 { lengthInBits := uint16(0) // Simple field (dummy) @@ -88,8 +89,8 @@ func (m *Dummy) LengthInBitsConditional(lastItem bool) uint16 { return lengthInBits } -func (m *Dummy) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m *Dummy) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func DummyParse(readBuffer utils.ReadBuffer) (*Dummy, error) { diff --git a/plc4go/internal/plc4go/simulated/readwrite/model/SimulatedDataTypeSizes.go b/plc4go/internal/plc4go/simulated/readwrite/model/SimulatedDataTypeSizes.go index a361aac5fcb..a22c3fff324 100644 --- a/plc4go/internal/plc4go/simulated/readwrite/model/SimulatedDataTypeSizes.go +++ b/plc4go/internal/plc4go/simulated/readwrite/model/SimulatedDataTypeSizes.go @@ -362,12 +362,12 @@ func CastSimulatedDataTypeSizes(structType interface{}) SimulatedDataTypeSizes { return castFunc(structType) } -func (m SimulatedDataTypeSizes) LengthInBits() uint16 { +func (m SimulatedDataTypeSizes) GetLengthInBits() uint16 { return 8 } -func (m SimulatedDataTypeSizes) LengthInBytes() uint16 { - return m.LengthInBits() / 8 +func (m SimulatedDataTypeSizes) GetLengthInBytes() uint16 { + return m.GetLengthInBits() / 8 } func SimulatedDataTypeSizesParse(readBuffer utils.ReadBuffer) (SimulatedDataTypeSizes, error) { diff --git a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java index 4e68aba4567..69e58116e58 100644 --- a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java +++ b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java @@ -4268,7 +4268,7 @@ Collection read_properties() throws Exception { assertEquals(2005, BACnetApplicationTagDate.getPayload().getYear()); assertEquals(9, BACnetApplicationTagDate.getPayload().getMonth()); assertEquals(1, BACnetApplicationTagDate.getPayload().getDayOfMonth()); - assertEquals(-1, BACnetApplicationTagDate.getPayload().getDayOfWeek()); + assertEquals(255, BACnetApplicationTagDate.getPayload().getDayOfWeek()); }), DynamicTest.dynamicTest("No. 101 - Confirmed-REQ readProperty[ 74] device,61 utc-offset", () -> { diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec index 98c5b226990..4e79f7c252a 100644 --- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec +++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec @@ -1235,6 +1235,7 @@ [validation 'isNotOpeningOrClosingTag' "length 6 and 7 reserved for opening and closing tag" ] [simple BACnetTagPayloadEnumerated('header.actualLength') payload ] + [virtual uint 32 actualValue 'payload.actualValue' ] ] ['DATE' BACnetContextTagDate(bit isNotOpeningOrClosingTag) [validation 'isNotOpeningOrClosingTag' "length 6 and 7 reserved for opening and closing tag" ] @@ -1402,32 +1403,32 @@ ] [type BACnetTagPayloadDate - [virtual int 8 wildcard '0xFF' ] - [simple int 8 yearMinus1900 ] + [virtual uint 8 wildcard '0xFF' ] + [simple uint 8 yearMinus1900 ] [virtual bit yearIsWildcard 'yearMinus1900 == wildcard' ] - [virtual int 16 year 'yearMinus1900 + 1900' ] - [simple int 8 month ] + [virtual uint 16 year 'yearMinus1900 + 1900' ] + [simple uint 8 month ] [virtual bit monthIsWildcard 'month == wildcard' ] [virtual bit oddMonthWildcard 'month == 13' ] [virtual bit evenMonthWildcard 'month == 14' ] - [simple int 8 dayOfMonth ] + [simple uint 8 dayOfMonth ] [virtual bit dayOfMonthIsWildcard 'dayOfMonth == wildcard' ] [virtual bit lastDayOfMonthWildcard 'dayOfMonth == 32' ] [virtual bit oddDayOfMonthWildcard 'dayOfMonth == 33' ] [virtual bit evenDayOfMonthWildcard 'dayOfMonth == 34' ] - [simple int 8 dayOfWeek ] + [simple uint 8 dayOfWeek ] [virtual bit dayOfWeekIsWildcard 'dayOfWeek == wildcard' ] ] [type BACnetTagPayloadTime - [virtual int 8 wildcard '0xFF' ] - [simple int 8 hour ] + [virtual uint 8 wildcard '0xFF' ] + [simple uint 8 hour ] [virtual bit hourIsWildcard 'hour == wildcard' ] - [simple int 8 minute ] + [simple uint 8 minute ] [virtual bit minuteIsWildcard 'minute == wildcard' ] - [simple int 8 second ] + [simple uint 8 second ] [virtual bit secondIsWildcard 'second == wildcard' ] - [simple int 8 fractional ] + [simple uint 8 fractional ] [virtual bit fractionalIsWildcard 'fractional == wildcard' ] ] diff --git a/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml b/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml index 681c2de98e5..ffd9e5a0483 100644 --- a/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml +++ b/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml @@ -522,10 +522,10 @@ - 106 - 9 - 23 - 6 + 106 + 9 + 23 + 6 @@ -545,10 +545,10 @@ - 23 - 9 - 54 - 0 + 23 + 9 + 54 + 0 @@ -7767,10 +7767,10 @@ make -f wp.mak clean - 106 - 9 - 23 - -1 + 106 + 9 + 23 + 255 @@ -7790,10 +7790,10 @@ make -f wp.mak clean - 23 - 21 - 13 - 0 + 23 + 21 + 13 + 0