refactor(plc4c): Changed the size calculation of manual fields from b…

…ytes to bits
apache · Jan 28, 2022 · 2057eb8 · 2057eb8
1 parent af79344
commit 2057eb8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/code-generation/language-c/src/main/resources/templates/c/pojo-template.c.ftlh b/code-generation/language-c/src/main/resources/templates/c/pojo-template.c.ftlh
@@ -670,13 +670,13 @@ uint16_t ${helper.getCTypeName(type.name)}_length_in_bits(${helper.getCTypeName(
                 <#assign manualArrayField = field>
 
 <#if indentContent>    </#if>  // Manual Array Field (${manualArrayField.name})
-<#if indentContent>    </#if>  lengthInBits += ${helper.toParseExpression(type, manualArrayField, manualArrayField.lengthExpression, parserArguments)} * 8;
+<#if indentContent>    </#if>  lengthInBits += ${helper.toParseExpression(type, manualArrayField, manualArrayField.lengthExpression, parserArguments)};
                 <#break>
             <#case "manual">
                 <#assign manualField = field.asManualField().orElseThrow()>
 
 <#if indentContent>    </#if>  // Manual Field (${manualField.name})
-<#if indentContent>    </#if>  lengthInBits += ${helper.toParseExpression(type, manualField, manualField.lengthExpression, parserArguments)} * 8;
+<#if indentContent>    </#if>  lengthInBits += ${helper.toParseExpression(type, manualField, manualField.lengthExpression, parserArguments)};
                 <#break>
             <#case "optional">
                 <#assign optionalField = field.asOptionalField().orElseThrow()>

diff --git a/plc4c/generated-sources/s7/src/associated_value_type.c b/plc4c/generated-sources/s7/src/associated_value_type.c
@@ -127,7 +127,7 @@ uint16_t plc4c_s7_read_write_associated_value_type_length_in_bits(plc4c_s7_read_
   lengthInBits += plc4c_s7_read_write_data_transport_size_length_in_bits(&_message->transport_size);
 
   // Manual Field (valueLength)
-  lengthInBits += 2 * 8;
+  lengthInBits += 16;
 
   // Array field
   lengthInBits += 8 * plc4c_utils_list_size(_message->data);

diff --git a/plc4c/generated-sources/s7/src/date_and_time.c b/plc4c/generated-sources/s7/src/date_and_time.c
@@ -136,25 +136,25 @@ uint16_t plc4c_s7_read_write_date_and_time_length_in_bits(plc4c_s7_read_write_da
   uint16_t lengthInBits = 0;
 
   // Manual Field (year)
-  lengthInBits += 1 * 8;
+  lengthInBits += 8;
 
   // Manual Field (month)
-  lengthInBits += 1 * 8;
+  lengthInBits += 8;
 
   // Manual Field (day)
-  lengthInBits += 1 * 8;
+  lengthInBits += 8;
 
   // Manual Field (hour)
-  lengthInBits += 1 * 8;
+  lengthInBits += 8;
 
   // Manual Field (minutes)
-  lengthInBits += 1 * 8;
+  lengthInBits += 8;
 
   // Manual Field (seconds)
-  lengthInBits += 1 * 8;
+  lengthInBits += 8;
 
   // Manual Field (msec)
-  lengthInBits += 2 * 8;
+  lengthInBits += 12;
 
   // Simple field (dow)
   lengthInBits += 4;