diff --git a/configs/config_mb_2024_0_2__2_mux_2024_dps5005.py b/configs/config_mb_2024_0_2__2_mux_2024_dps5005.py index 4e00194952d34e739f65e9ac05ad81f5af137a44..5ed78807197a7a77ba134e9f4a46aa679724dd5c 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_dps5005.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_dps5005.py @@ -34,28 +34,23 @@ HARDWARE_CONFIG = { 'mux': {'boards': {'mux_02': {'model': 'mux_2024_0_X', + 'roles': ['A', 'B', 'M', 'N'], + 'electrodes': range(1, 9), 'tca_address': None, 'tca_channel': 0, 'addr2': 'up', - 'addr1': 'up', - 'roles': ['A','B','M','N'], - 'electrodes': range(1,9), - # 'cabling': {(i+0, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)}, - 'voltage_max': 12.}, + 'addr1': 'up'}, 'mux_05': {'model': 'mux_2024_0_X', + 'roles': ['A', 'B', 'M', 'N'], + 'electrodes': range(9, 17), 'tca_address': None, 'tca_channel': 0, 'addr2': 'down', - 'addr1': 'down', - 'roles': ['A','B','M','N'], - 'electrodes': range(9,17), - # 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'}, - # 'cabling': {(i+8, j): ('mux_05', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)}, - 'voltage_max': 12.} + 'addr1': 'down'} }, 'default': {'interface_name': 'i2c_ext', - 'voltage_max': 100., + 'voltage_max': 50., 'current_max': 3.} } } diff --git a/configs/config_mb_2024_0_2__8_mux_2023_dps5005.py b/configs/config_mb_2024_0_2__8_mux_2023_dps5005.py index 7e05a44ba03e804486adf12d5b16b23dfd9df134..eef3c3daa16f33434f33836d6c244b949d2037b4 100644 --- a/configs/config_mb_2024_0_2__8_mux_2023_dps5005.py +++ b/configs/config_mb_2024_0_2__8_mux_2023_dps5005.py @@ -35,54 +35,50 @@ HARDWARE_CONFIG = { {'mux_A': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x70, - 'roles': {'A': 'X'}, - 'cabling': {(i, j): ('mux_A', i) for j in ['A'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'A', + 'electrodes': range(1, 65)}, 'mux_B': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x71, - 'roles': {'B': 'X'}, - 'cabling': {(i, j): ('mux_B', i) for j in ['B'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'B', + 'electrodes': range(1,65)}, 'mux_M': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x72, - 'roles': {'M': 'X'}, - 'cabling': {(i, j): ('mux_M', i) for j in ['M'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'M', + 'electrodes': range(1, 65)}, 'mux_N': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x73, - 'roles': {'N': 'X'}, - 'cabling': {(i, j): ('mux_N', i) for j in ['N'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'N', + 'electrodes': range(1,65), + # 'cabling': {(i, j): ('mux_N', i) for j in ['N'] for i in range(1, 65)}, + }, 'mux_A2': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x74, - 'roles': {'A': 'X'}, - 'cabling': {(i+64, j): ('mux_A2', i) for j in ['A'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'A', + 'electrodes': range(65, 129)}, 'mux_B2': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x75, - 'roles': {'B': 'X'}, - 'cabling': {(i+64, j): ('mux_B2', i) for j in ['B'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'B', + 'electrodes': range(65,129)}, 'mux_M2': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x76, - 'roles': {'M': 'X'}, - 'cabling': {(i+64, j): ('mux_M2', i) for j in ['M'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'M', + 'electrodes': range(65,129)}, 'mux_N2': {'model': 'mux_2023_0_X', 'mux_tca_address': 0x77, - 'roles': {'N': 'X'}, - 'cabling': {(i+64, j): ('mux_N2', i) for j in ['N'] for i in range(1, 65)}, - 'voltage_max': 12.}, + 'roles': 'N', + 'electrodes': range(65,129), + #'cabling': {(i+64, j): ('mux_N2', i) for j in ['N'] for i in range(1, 65)}, + }, }, 'default': {'interface_name': 'i2c_ext', - 'voltage_max': 100., + 'voltage_max': 50., 'current_max': 3.} } } diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py index f86e40f9d715995a089eaf2da514f6211b9d0f54..7e7221262318201a788caa96e38cf542d08033dc 100644 --- a/ohmpi/hardware_components/mux_2024_0_X.py +++ b/ohmpi/hardware_components/mux_2024_0_X.py @@ -71,7 +71,7 @@ class Mux(MuxAbstract): self.exec_logger.debug(f'configuration: {kwargs}') roles = kwargs.pop('roles', None) if roles is None: - roles = ['A','B','M','N'] # NOTE: defaults to 4-roles + roles = ['A', 'B', 'M', 'N'] # NOTE: defaults to 4-roles else: roles_board = ['X', 'Y', 'XX', 'YY'] self._roles = {roles[i]: roles_board[i] for i in range(len(roles))}