chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 09:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a VMPdata_colID_flags_map dict

Browse Source
This commit is contained in:
Chris Kerr
2019-05-03 18:47:02 +02:00
parent 56a321f8e3
commit 6b0f8b6d37
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
galvani/BioLogic.py
View File

@@ -188,6 +188,17 @@ VMPdata_colID_dtype_map = {
480: ('NSR I/%', '<f4'), 480: ('NSR I/%', '<f4'),
} }
# These column IDs define flags which are all stored packed in a single byte
# The values in the map are (name, bitmask, dtype)
VMPdata_colID_flag_map = {
1: ('mode', 0x03, np.uint8),
2: ('ox/red', 0x04, np.bool_),
3: ('error', 0x08, np.bool_),
21: ('control changes', 0x10, np.bool_),
31: ('Ns changes', 0x20, np.bool_),
65: ('counter inc.', 0x80, np.bool_),
}
def VMPdata_dtype_from_colIDs(colIDs): def VMPdata_dtype_from_colIDs(colIDs):
type_list = [] type_list = []
@@ -195,24 +206,12 @@ def VMPdata_dtype_from_colIDs(colIDs):
flags_dict = OrderedDict() flags_dict = OrderedDict()
flags2_dict = OrderedDict() flags2_dict = OrderedDict()
for colID in colIDs: for colID in colIDs:
if colID in (1, 2, 3, 21, 31, 65): if colID in VMPdata_colID_flag_map:
if 'flags' not in field_list: if 'flags' not in field_list:
type_list.append('u1') type_list.append('u1')
field_list.append('flags') field_list.append('flags')
if colID == 1: flag_name, flag_mask, flag_type = VMPdata_colID_flag_map[colID]
flags_dict['mode'] = (np.uint8(0x03), np.uint8) flags_dict[flag_name] = (np.uint8(flag_mask), flag_type)
elif colID == 2:
flags_dict['ox/red'] = (np.uint8(0x04), np.bool_)
elif colID == 3:
flags_dict['error'] = (np.uint8(0x08), np.bool_)
elif colID == 21:
flags_dict['control changes'] = (np.uint8(0x10), np.bool_)
elif colID == 31:
flags_dict['Ns changes'] = (np.uint8(0x20), np.bool_)
elif colID == 65:
flags_dict['counter inc.'] = (np.uint8(0x80), np.bool_)
else:
raise NotImplementedError("flag %d not implemented" % colID)
else: else:
try: try:
field = VMPdata_colID_dtype_map[colID][0] field = VMPdata_colID_dtype_map[colID][0]