diff --git a/configs/config_mb_2024_0_2__3_mux_2024_dps5005.py b/configs/config_mb_2024_0_2__3_mux_2024_dps5005.py
new file mode 100644
index 0000000000000000000000000000000000000000..5b8f4f56a4aff2271e1be00f89a8ae79b86b68bb
--- /dev/null
+++ b/configs/config_mb_2024_0_2__3_mux_2024_dps5005.py
@@ -0,0 +1,144 @@
+import logging
+from ohmpi.utils import get_platform
+from paho.mqtt.client import MQTTv31 # noqa
+
+_, on_pi = get_platform()
+# DEFINE THE ID OF YOUR OhmPi
+ohmpi_id = '0001' if on_pi else 'XXXX'
+# DEFINE YOUR MQTT BROKER (DEFAULT: 'localhost')
+mqtt_broker = 'localhost' if on_pi else 'NAME_YOUR_BROKER_WHEN_IN_SIMULATION_MODE_HERE'
+# DEFINE THE SUFFIX TO ADD TO YOUR LOGS FILES
+logging_suffix = ''
+
+# OhmPi configuration
+OHMPI_CONFIG = {
+ 'id': ohmpi_id, # Unique identifier of the OhmPi board (string)
+ 'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE
+}
+
+HARDWARE_CONFIG = {
+ 'ctl': {'model': 'raspberry_pi'},
+ 'pwr': {'model': 'pwr_dps5005', 'voltage': 3., 'interface_name': 'modbus'},
+ 'tx': {'model': 'mb_2024_0_2',
+ 'voltage_max': 50., # Maximum voltage supported by the TX board [V]
+ 'current_max': 4800, # Maximum voltage read by the current ADC on the TX board [mA]
+ 'r_shunt': 2, # Shunt resistance in Ohms
+ 'interface_name': 'i2c'
+ },
+ 'rx': {'model': 'mb_2024_0_2',
+ 'coef_p2': 1.00, # slope for conversion for ADS, measurement in V/V
+ 'latency': 0.010, # latency in seconds in continuous mode
+ 'sampling_rate': 50, # number of samples per second
+ 'interface_name': 'i2c'
+ },
+ 'mux': {'boards':
+ {'mux_02':
+ {'model': 'mux_2024_0_X',
+ 'tca_address': None,
+ 'tca_channel': 0,
+ 'addr2': 'up',
+ 'addr1': 'up',
+ # 'mcp_0': '0x26',
+ # 'mcp_1': '0x27',
+ 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
+ 'cabling': {(i+8, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ 'voltage_max': 50.},
+ 'mux_03':
+ {'model': 'mux_2024_0_X',
+ 'tca_address': None,
+ 'tca_channel': 0,
+ 'addr2': 'down',
+ 'addr1': 'up',
+ # 'mcp_0': '0x26',
+ # 'mcp_1': '0x27',
+ 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
+ 'cabling': {(i+16, j): ('mux_03', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ 'voltage_max': 50.},
+ 'mux_05':
+ {'model': 'mux_2024_0_X',
+ 'tca_address': None,
+ 'tca_channel': 0,
+ 'addr2': 'up',
+ 'addr1': 'down',
+ 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
+ 'cabling': {(i+0, j): ('mux_05', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ 'voltage_max': 50.},
+ },
+ 'default': {'interface_name': 'i2c_ext',
+ 'voltage_max': 100.,
+ 'current_max': 3.}
+ }
+ }
+
+# SET THE LOGGING LEVELS, MQTT BROKERS AND MQTT OPTIONS ACCORDING TO YOUR NEEDS
+# Execution logging configuration
+EXEC_LOGGING_CONFIG = {
+ 'logging_level': logging.INFO,
+ 'log_file_logging_level': logging.DEBUG,
+ 'logging_to_console': True,
+ 'file_name': f'exec{logging_suffix}.log',
+ 'max_bytes': 262144,
+ 'backup_count': 30,
+ 'when': 'd',
+ 'interval': 1
+}
+
+# Data logging configuration
+DATA_LOGGING_CONFIG = {
+ 'logging_level': logging.INFO,
+ 'logging_to_console': True,
+ 'file_name': f'data{logging_suffix}.log',
+ 'max_bytes': 16777216,
+ 'backup_count': 1024,
+ 'when': 'd',
+ 'interval': 1
+}
+
+# State of Health logging configuration (For a future release)
+SOH_LOGGING_CONFIG = {
+ 'logging_level': logging.INFO,
+ 'logging_to_console': True,
+ 'log_file_logging_level': logging.DEBUG,
+ 'file_name': f'soh{logging_suffix}.log',
+ 'max_bytes': 16777216,
+ 'backup_count': 1024,
+ 'when': 'd',
+ 'interval': 1
+}
+
+# MQTT logging configuration parameters
+MQTT_LOGGING_CONFIG = {
+ 'hostname': mqtt_broker,
+ 'port': 1883,
+ 'qos': 2,
+ 'retain': False,
+ 'keepalive': 60,
+ 'will': None,
+ 'auth': {'username': 'mqtt_user', 'password': 'mqtt_password'},
+ 'tls': None,
+ 'protocol': MQTTv31,
+ 'transport': 'tcp',
+ 'client_id': f'{OHMPI_CONFIG["id"]}',
+ 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec',
+ 'exec_logging_level': logging.DEBUG,
+ 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data',
+ 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'],
+ 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh',
+ 'soh_logging_level': SOH_LOGGING_CONFIG['logging_level']
+}
+
+# MQTT control configuration parameters
+MQTT_CONTROL_CONFIG = {
+ 'hostname': mqtt_broker,
+ 'port': 1883,
+ 'qos': 2,
+ 'retain': False,
+ 'keepalive': 60,
+ 'will': None,
+ 'auth': {'username': 'mqtt_user', 'password': 'mqtt_password'},
+ 'tls': None,
+ 'protocol': MQTTv31,
+ 'transport': 'tcp',
+ 'client_id': f'{OHMPI_CONFIG["id"]}',
+ 'ctrl_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/ctrl'
+}
diff --git a/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py
index d19ababba7fa05a00507e057808179b393299386..5d9b5091e868aa1ed100e349ea2cf8d9b8964052 100644
--- a/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py
+++ b/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py
@@ -34,43 +34,27 @@ HARDWARE_CONFIG = {
'mux': {'boards':
{'mux_A':
{'model': 'mux_2023_0_X',
- 'tca_address': None,
- 'tca_channel': 0,
- 'addr2': 'up',
- 'addr1': 'up',
- # 'mcp_0': '0x26',
- # 'mcp_1': '0x27',
- 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
- 'cabling': {(i+8, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ '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.},
- 'mux_03':
+ 'mux_B':
{'model': 'mux_2023_0_X',
- 'tca_address': None,
- 'tca_channel': 0,
- 'addr2': 'down',
- 'addr1': 'up',
- # 'mcp_0': '0x26',
- # 'mcp_1': '0x27',
- 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
- 'cabling': {(i+24, j): ('mux_03', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ '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.},
- 'mux_05':
- {'model': 'mux_2024_0_X',
- 'tca_address': None,
- 'tca_channel': 0,
- 'addr2': 'up',
- 'addr1': 'down',
- 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
- 'cabling': {(i+0, j): ('mux_05', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ '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.},
- 'mux_06':
- {'model': 'mux_2024_0_X',
- 'tca_address': None,
- 'tca_channel': 0,
- 'addr2': 'down',
- 'addr1': 'down',
- 'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
- 'cabling': {(i+16, j): ('mux_06', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ '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.},
},
'default': {'interface_name': 'i2c_ext',
diff --git a/dev/test_mb_2024_3_mux_2024.py b/dev/test_mb_2024_3_mux_2024.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d3a5e748cadb832e1e34626aa285f8719525ee9
--- /dev/null
+++ b/dev/test_mb_2024_3_mux_2024.py
@@ -0,0 +1,104 @@
+import matplotlib
+matplotlib.use('TkAgg')
+from ohmpi.utils import change_config
+change_config('../configs/config_mb_2024_0_2__3_mux_2024_dps5005.py', verbose=False)
+import importlib
+import time
+import logging
+from ohmpi.config import HARDWARE_CONFIG
+
+stand_alone = False
+part_of_hardware_system = True
+within_ohmpi = False
+
+# Stand alone
+if stand_alone:
+
+ ctl_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["ctl"].pop("model")}')
+ pwr_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["pwr"].pop("model")}')
+ tx_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["tx"].pop("model")}')
+ rx_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["rx"].pop("model")}')
+
+ ctl = ctl_module.Ctl()
+ HARDWARE_CONFIG['tx'].update({'ctl': ctl, 'exec_logger': ctl.exec_logger, 'soh_logger': ctl.soh_logger})
+ HARDWARE_CONFIG['rx'].update({'ctl': ctl, 'exec_logger': ctl.exec_logger, 'soh_logger': ctl.soh_logger})
+ HARDWARE_CONFIG['tx'].update({'connection': HARDWARE_CONFIG['tx'].pop('connection',
+ ctl.interfaces[
+ HARDWARE_CONFIG['tx'].pop(
+ 'interface_name', 'i2c')])})
+ HARDWARE_CONFIG['rx'].update({'connection': HARDWARE_CONFIG['rx'].pop('connection',
+ ctl.interfaces[
+ HARDWARE_CONFIG['rx'].pop(
+ 'interface_name', 'i2c')])})
+
+ HARDWARE_CONFIG['pwr'].update({'connection': HARDWARE_CONFIG['pwr'].pop('connection',
+ ctl.interfaces[
+ HARDWARE_CONFIG['pwr'].pop(
+ 'interface_name', None)])})
+
+
+ rx = rx_module.Rx(**HARDWARE_CONFIG['rx'])
+ tx = tx_module.Tx(**HARDWARE_CONFIG['tx'])
+ pwr = pwr_module.Pwr(**HARDWARE_CONFIG['pwr'])
+ mux_ids = ['mux_02', 'mux_05']
+ for m,mux_id in enumerate(mux_ids):
+ mux_module = importlib.import_module(
+ f'ohmpi.hardware_components.{HARDWARE_CONFIG["mux"]["boards"][mux_id].pop("model")}')
+
+ MUX_CONFIG = HARDWARE_CONFIG['mux']['boards'][mux_id]
+
+ MUX_CONFIG.update({'ctl': ctl, 'connection': MUX_CONFIG.pop('connection', ctl.interfaces[
+ MUX_CONFIG.pop('interface_name', 'i2c_ext')]), 'exec_logger': ctl.exec_logger,
+ 'soh_logger': ctl.soh_logger})
+ MUX_CONFIG.update({'id': mux_id})
+ mux = mux_module.Mux(**MUX_CONFIG)
+
+ # tx.polarity = 1
+ # time.sleep(1)
+ # tx.polarity = 0
+ # mux.switch(elec_dict={'A': [1], 'B': [4], 'M': [2], 'N': [3]}, state='on')
+ # time.sleep(1)
+ # voltage = rx.voltage
+ # current = tx.current
+ # mux.switch(elec_dict={'A': [1], 'B': [4], 'M': [2], 'N': [3]}, state='off')
+ # print(f'Resistance: {voltage / current :.2f} ohm, voltage: {voltage:.2f} mV, current: {current:.2f} mA')
+ mux.reset()
+ mux.test({'A': [i+8*m for i in range(1, 9)], 'B': [i+8*m for i in range(1, 9)],
+ 'M': [i+8*m for i in range(1, 9)], 'N': [i+8*m for i in range(1, 9)]}, activation_time=.1)
+ mux.reset()
+
+# mux as part of a OhmPiHardware system
+if part_of_hardware_system:
+ from ohmpi.hardware_system import OhmPiHardware
+ print('Starting test of as part of an OhmPiHardware system.')
+ # mux_id = 'mux_03'
+ k = OhmPiHardware()
+ k.exec_logger.setLevel(logging.DEBUG)
+ # Test mux switching
+ k.reset_mux()
+ # k.switch_mux(electrodes=[1, 4, 2, 3], roles=['A', 'B', 'M', 'N'], state='on')
+ # time.sleep(1.)
+ # k.switch_mux(electrodes=[1, 4, 2, 3], roles=['A', 'B', 'M', 'N'], state='off')
+ # k.mux_boards[mux_id].test(activation_time=.4)
+ k.test_mux()
+ k.reset_mux()
+
+if within_ohmpi:
+ from ohmpi.ohmpi import OhmPi
+ # from ohmpi.plots import plot_exec_log
+
+ print('Starting test with OhmPi.')
+ k = OhmPi()
+ # A, B, M, N = (32, 29, 31, 30)
+ k.reset_mux()
+ k.load_sequence('sequences/ABMN2.txt')
+ k.run_sequence(tx_volt=50, injection_duration=1., nb_stack=2, duty_cycle=0.5)
+ print('using OhmPi')
+ #d = k.run_measurement([A, B, M, N], injection_duration=1., nb_stack=2, duty_cycle=0.5)
+ # print(d)
+ # k._hw._plot_readings()
+ print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV')
+ print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
+ # k._hw._plot_readings(save_fig=False)
+ # plot_exec_log('ohmpi/logs/exec.log')
+change_config('../configs/config_default.py', verbose=False)
diff --git a/dev/test_mb_2024_4_mux_2023.py b/dev/test_mb_2024_4_mux_2023.py
new file mode 100644
index 0000000000000000000000000000000000000000..ceceb8041908281afe7c1c9df930dc63aad601f1
--- /dev/null
+++ b/dev/test_mb_2024_4_mux_2023.py
@@ -0,0 +1,109 @@
+import matplotlib
+matplotlib.use('TkAgg')
+from ohmpi.utils import change_config
+change_config('../configs/config_mb_2024_0_2__4_mux_2023_dps5005.py', verbose=False)
+import importlib
+import time
+import logging
+from ohmpi.config import HARDWARE_CONFIG
+
+stand_alone = True
+part_of_hardware_system = False
+within_ohmpi = False
+
+# Stand alone
+if stand_alone:
+
+ ctl_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["ctl"].pop("model")}')
+ pwr_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["pwr"].pop("model")}')
+ tx_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["tx"].pop("model")}')
+ rx_module = importlib.import_module(f'ohmpi.hardware_components.{HARDWARE_CONFIG["rx"].pop("model")}')
+
+ ctl = ctl_module.Ctl()
+ HARDWARE_CONFIG['tx'].update({'ctl': ctl, 'exec_logger': ctl.exec_logger, 'soh_logger': ctl.soh_logger})
+ HARDWARE_CONFIG['rx'].update({'ctl': ctl, 'exec_logger': ctl.exec_logger, 'soh_logger': ctl.soh_logger})
+ HARDWARE_CONFIG['tx'].update({'connection': HARDWARE_CONFIG['tx'].pop('connection',
+ ctl.interfaces[
+ HARDWARE_CONFIG['tx'].pop(
+ 'interface_name', 'i2c')])})
+ HARDWARE_CONFIG['rx'].update({'connection': HARDWARE_CONFIG['rx'].pop('connection',
+ ctl.interfaces[
+ HARDWARE_CONFIG['rx'].pop(
+ 'interface_name', 'i2c')])})
+
+ HARDWARE_CONFIG['pwr'].update({'connection': HARDWARE_CONFIG['pwr'].pop('connection',
+ ctl.interfaces[
+ HARDWARE_CONFIG['pwr'].pop(
+ 'interface_name', None)])})
+
+
+ rx = rx_module.Rx(**HARDWARE_CONFIG['rx'])
+ tx = tx_module.Tx(**HARDWARE_CONFIG['tx'])
+ pwr = pwr_module.Pwr(**HARDWARE_CONFIG['pwr'])
+ role = 'A'
+ mux_id = f'mux_{role}'
+ mux_boards = []
+ mux_module = importlib.import_module(
+ f'ohmpi.hardware_components.{HARDWARE_CONFIG["mux"]["boards"][mux_id].pop("model")}')
+
+ MUX_CONFIG = HARDWARE_CONFIG['mux']['boards'][mux_id]
+
+ MUX_CONFIG.update({'ctl': ctl, 'connection': MUX_CONFIG.pop('connection', ctl.interfaces[
+ MUX_CONFIG.pop('interface_name', 'i2c_ext')]), 'exec_logger': ctl.exec_logger,
+ 'soh_logger': ctl.soh_logger})
+ MUX_CONFIG.update({'id': mux_id})
+ mux = mux_module.Mux(**MUX_CONFIG)
+ mux.reset()
+
+ mux.test({role: [i for i in range(1, 65)]}, activation_time=.1)
+ mux.reset()
+
+# mux as part of a OhmPiHardware system
+if part_of_hardware_system:
+ from ohmpi.hardware_system import OhmPiHardware
+ print('Starting test of as part of an OhmPiHardware system.')
+ # mux_id = 'mux_03'
+ k = OhmPiHardware()
+ k.exec_logger.setLevel(logging.DEBUG)
+ # Test mux switching
+ k.reset_mux()
+ # k.switch_mux(electrodes=[1, 4, 2, 3], roles=['A', 'B', 'M', 'N'], state='on')
+ # time.sleep(1.)
+ # k.switch_mux(electrodes=[1, 4, 2, 3], roles=['A', 'B', 'M', 'N'], state='off')
+ # k.mux_boards[mux_id].test(activation_time=.4)
+ k.test_mux()
+ k.reset_mux()
+
+if within_ohmpi:
+ from ohmpi.ohmpi import OhmPi
+ # from ohmpi.plots import plot_exec_log
+
+ print('Starting test with OhmPi.')
+ k = OhmPi()
+ # A, B, M, N = (32, 29, 31, 30)
+ k.reset_mux()
+ # k.test_mux(mux_id='mux_03')
+ # k._hw.switch_mux([A, B, M, N], state='on')
+ # k._hw.vab_square_wave(12.,1., cycles=2)
+ # k._hw.switch_mux([A, B, M, N], state='off')
+ # k._hw.calibrate_rx_bias() # electrodes 1 4 2 3 should be connected to a reference circuit
+ # k._hw.rx._bias = -1.38
+ # print(f'Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
+ # k._hw._plot_readings()
+ A, B, M, N = (1, 4, 2, 3)
+ # k._hw.switch_mux([A, B, M, N], state='on')
+ # k._hw.vab_square_wave(12., cycle_duration=10., cycles=3)
+ # k._hw.switch_mux([A, B, M, N], state='off')
+ # print(f'OhmPiHardware Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
+ # k._hw._plot_readings()
+ k.load_sequence('sequences/9991_GRAD_16_s1_a1.txt')
+ k.run_sequence(tx_volt=5, injection_duration=1., nb_stack=2, duty_cycle=0.5)
+ print('using OhmPi')
+ #d = k.run_measurement([A, B, M, N], injection_duration=1., nb_stack=2, duty_cycle=0.5)
+ # print(d)
+ # k._hw._plot_readings()
+ print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV')
+ print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
+ # k._hw._plot_readings(save_fig=False)
+ # plot_exec_log('ohmpi/logs/exec.log')
+change_config('../configs/config_default.py', verbose=False)
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index b569ac611ebb3219b1ce9d75690c2a7ed8fe6765..1e88aef3f757bf1dafd718243fa602694bc72e6f 100644
--- a/ohmpi/hardware_components/mux_2023_0_X.py
+++ b/ohmpi/hardware_components/mux_2023_0_X.py
@@ -8,6 +8,8 @@ from digitalio import Direction # noqa
from busio import I2C # noqa
from ohmpi.utils import enforce_specs
+# TODO: manage the case when a tca is added to handle more mux_2023 boards
+
# hardware characteristics and limitations
SPECS = {'model': {'default': os.path.basename(__file__).rstrip('.py')},
'id': {'default': 'mux_??'},
@@ -15,7 +17,7 @@ SPECS = {'model': {'default': os.path.basename(__file__).rstrip('.py')},
'current_max': {'default': 3.},
'activation_delay': {'default': 0.01},
'release_delay': {'default': 0.005},
- 'tca_address': {'default': 0x70}
+ 'mux_tca_address': {'default': 0x70}
}
# defaults to role 'A' cabling electrodes from 1 to 64
@@ -79,7 +81,7 @@ class Mux(MuxAbstract):
else:
self.exec_logger.error(f'Invalid role assignment for {self.model}: {self._roles} !')
self._mode = ''
- self._tca = [adafruit_tca9548a.TCA9548A(self.connection, kwargs['tca_address'])[i] for i in np.arange(7, 3, -1)]
+ self._tca = [adafruit_tca9548a.TCA9548A(self.connection, kwargs['mux_tca_address'])[i] for i in np.arange(7, 3, -1)]
# self._mcp_addresses = (kwargs.pop('mcp', '0x20')) # TODO: add assert on valid addresses..
self._mcp = [None, None, None, None]
self.reset()
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 3b264ac85f08ac6610bbb01f2fa637f5e9cd42f0..dde487a0561da4cc8bda3eb476eddfeb34244ace 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -546,7 +546,7 @@ class OhmPiHardware:
# Create a new thread to perform some work
self.mux_boards[mux].barrier = b
kwargs.update({'elec_dict': elec_dict, 'state': state})
- mux_workers[idx] = Thread(target=self.mux_boards[mux].switch, kwargs=kwargs)
+ mux_workers[idx] = Thread(target=self.mux_boards[mux].switch, kwargs=kwargs) # TODO: handle minimum delay between two relays activation (to avoid lagging during test_mux at high speed)
mux_workers[idx].start()
try:
self.mux_barrier.wait()
@@ -585,11 +585,19 @@ class OhmPiHardware:
time.sleep(activation_time)
self.switch_mux(electrodes, roles, state='off')
else:
- for c in self._cabling.keys():
- self.exec_logger.info(f'Testing electrode {c[0]} with role {c[1]}.')
- self.switch_mux(electrodes=[c[0]], roles=[c[1]], state='on')
- time.sleep(activation_time)
- self.switch_mux(electrodes=[c[0]], roles=[c[1]], state='off')
+ list_of_muxes = [i for i in self.mux_boards.keys()]
+ list_of_muxes.sort()
+ for m_id in list_of_muxes:
+ for c in self.mux_boards[m_id].cabling.keys():
+ self.exec_logger.info(f'Testing electrode {c[0]} with role {c[1]}.')
+ self.switch_mux(electrodes=[c[0]], roles=[c[1]], state='on')
+ time.sleep(activation_time)
+ self.switch_mux(electrodes=[c[0]], roles=[c[1]], state='off')
+ # for c in self._cabling.keys():
+ # self.exec_logger.info(f'Testing electrode {c[0]} with role {c[1]}.')
+ # self.switch_mux(electrodes=[c[0]], roles=[c[1]], state='on')
+ # time.sleep(activation_time)
+ # self.switch_mux(electrodes=[c[0]], roles=[c[1]], state='off')
self.exec_logger.info('Test finished.')
def reset_mux(self):