powertrain-build 1.14.1.dev3__tar.gz → 1.14.1.dev4__tar.gz

{powertrain_build-1.14.1.dev3 → powertrain_build-1.14.1.dev4}/ChangeLog

@@ -1,6 +1,7 @@
 CHANGES
 =======
 
+* Fixes for TL enumerations
 * Make rte\_dummy generate ZC DTC dummy functions
 * Polyspace fixes for ZC calibration
 * New year(?) new secret

{powertrain_build-1.14.1.dev3 → powertrain_build-1.14.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.14.1.dev3
+Version: 1.14.1.dev4
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/

{powertrain_build-1.14.1.dev3 → powertrain_build-1.14.1.dev4}/powertrain_build/user_defined_types.py

@@ -20,12 +20,16 @@ class UserDefinedTypes(ProblemLogger):
     FILE_PREFIXES = ['udt_']  # Add more as needed
     UNDERLYING_DATA_TYPES = {  # Add more as needed
         'target_link': {
+            'u32': 'UInt32',
+            'i32': 'Int32',
             'u16': 'UInt16',
             'i16': 'Int16',
             'u8': 'UInt8',
             'i8': 'Int8'
         },
         'embedded_coder': {
+            'u32': 'uint32_T',
+            'i32': 'int32_T',
             'u16': 'uint16_T',
             'i16': 'int16_T',
             'u8': 'uint8_T',
@@ -35,6 +39,7 @@ class UserDefinedTypes(ProblemLogger):
     SIMULINK_DATA_TYPES = {  # Add more as needed
         'target_link': {
             'Simulink.IntEnumType': 'Int32',
+            'uint32': 'UInt32',
             'int32': 'Int32',
             'uint16': 'UInt16',
             'int16': 'Int16',
@@ -43,6 +48,7 @@ class UserDefinedTypes(ProblemLogger):
         },
         'embedded_coder': {
             'Simulink.IntEnumType': 'int32_T',
+            'uint32': 'uint32_T',
             'int32': 'int32_T',
             'uint16': 'uint16_T',
             'int16': 'int16_T',
@@ -371,14 +377,23 @@ class UserDefinedTypes(ProblemLogger):
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['u8']
             elif max_value <= 65535:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['u16']
+            elif max_value <= 4294967295:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['u32']
         elif min_value >= -128:
             if max_value <= 127:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i8']
             elif max_value <= 32767:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i16']
+            elif max_value <= 2147483647:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i32']
         elif min_value >= -32768:
             if max_value <= 32767:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i16']
+            elif max_value <= 2147483647:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i32']
+        elif min_value >= -2147483648:
+            if max_value <= 2147483647:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i32']
 
         if underlying_data_type is None:
             self.critical(
@@ -427,7 +442,7 @@ class UserDefinedTypes(ProblemLogger):
 
             get_default_value = re.search(
                 r'function ([A-Za-z0-9]+) = getDefaultValue\(\)[\s\n]*'
-                r'\1 = [A-Za-z0-9]+\.([A-Za-z0-9]+);[\s\n]*'
+                r'\1 = [A-Za-z0-9]+\.([A-Za-z0-9_]+);[\s\n]*'
                 r'end',
                 enum_file_content,
                 flags=re.MULTILINE

{powertrain_build-1.14.1.dev3 → powertrain_build-1.14.1.dev4}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.14.1.dev3
+Version: 1.14.1.dev4
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/

powertrain_build-1.14.1.dev4/powertrain_build.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "6d7eaf5", "is_release": false}

powertrain_build-1.14.1.dev3/powertrain_build.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "b5ec3fe", "is_release": false}