fix issue with overlapping Motorola channels with bit_count+bit_offse…

…t <=8
danielhrisca · Mar 26, 2020 · d6c3c80 · d6c3c80
1 parent 80ce891
commit d6c3c80
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/asammdf/blocks/mdf_v3.py b/asammdf/blocks/mdf_v3.py
@@ -2867,7 +2867,11 @@ def get(
                             dtype_fmt = get_fmt_v3(data_type, bits, self.identification.byte_order)
                             channel_dtype = dtype(dtype_fmt.split(")")[-1])
 
-                            view = f'{channel_dtype.byteorder}u{vals.itemsize}'
+                            if channel_dtype.byteorder == '|' and data_type in (v23c.DATA_TYPE_SIGNED_MOTOROLA, v23c.DATA_TYPE_UNSIGNED_MOTOROLA):
+                                view = f'>u{vals.itemsize}'
+                            else:
+                                view = f'{channel_dtype.byteorder}u{vals.itemsize}'
+
                             vals = vals.view(view)
 
                             if bit_offset:

diff --git a/asammdf/blocks/mdf_v4.py b/asammdf/blocks/mdf_v4.py
@@ -7179,7 +7179,11 @@ def _get_scalar(
                             else:
                                 channel_dtype = channel.dtype_fmt
 
-                            view = f'{channel_dtype.byteorder}u{vals.itemsize}'
+                            if channel_dtype.byteorder == '|' and data_type in (v4c.DATA_TYPE_SIGNED_MOTOROLA, v4c.DATA_TYPE_UNSIGNED_MOTOROLA):
+                                view = f'>u{vals.itemsize}'
+                            else:
+                                view = f'{channel_dtype.byteorder}u{vals.itemsize}'
+
                             vals = vals.view(view)
 
                             if bit_offset:
@@ -7296,7 +7300,10 @@ def _get_scalar(
                                 else:
                                     channel_dtype = channel.dtype_fmt
 
-                                view = f'{channel_dtype.byteorder}u{vals.itemsize}'
+                                if channel_dtype.byteorder == '|' and data_type in (v4c.DATA_TYPE_SIGNED_MOTOROLA, v4c.DATA_TYPE_UNSIGNED_MOTOROLA):
+                                    view = f'>u{vals.itemsize}'
+                                else:
+                                    view = f'{channel_dtype.byteorder}u{vals.itemsize}'
                                 vals = vals.view(view)
 
                                 if bit_offset:
@@ -7338,8 +7345,7 @@ def _get_scalar(
                             channel_dtype = channel.dtype_fmt.subdtype[0]
                         else:
                             channel_dtype = channel.dtype_fmt
-                        if vals.dtype != channel_dtype:
-                            print('???????????', channel_dtype, vals.dtype, vals[0])
+                        if vals.dtype != channel_dtype:p
                             vals = vals.astype(channel_dtype)
 
                     if master_is_required:

diff --git a/asammdf/version.py b/asammdf/version.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """ asammdf version module """
 
-__version__ = "5.19.8"
+__version__ = "5.19.9"