diff --git a/tabor_control/__init__.py b/tabor_control/__init__.py index 88dd669d7b4209a456f9fb416762da5a6f579538..d0b0c010039ad44b301f8820a2dc0437b9934150 100644 --- a/tabor_control/__init__.py +++ b/tabor_control/__init__.py @@ -36,8 +36,9 @@ __version__ = "0.1" TABLE_ENTRY_FORMAT = struct.Struct('< L H B x') -TABLE_ENTRY_DTYPE = np.dtype([('repeats', 'L'), ('segment_no', 'H'), ('jump_flag', 'B')], align=True) -assert TABLE_ENTRY_FORMAT.size == TABLE_ENTRY_DTYPE.itemsize +TABLE_ENTRY_DTYPE = np.dtype([('repeats', '<u4'), ('segment_no', '<u2'), ('jump_flag', '|u1')], align=True) +assert TABLE_ENTRY_FORMAT.size == TABLE_ENTRY_DTYPE.itemsize == 8 +assert [TABLE_ENTRY_FORMAT.unpack(bytes(range(1, 9)))] == np.frombuffer(bytes(range(1, 9)), dtype=TABLE_ENTRY_DTYPE).tolist() class ParanoiaLevel(enum.Enum):