From 8af3bbbb6602e51ef2a2a5ea38ec4840d058a8ed Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 17 Oct 2023 14:23:47 +0200
Subject: [PATCH] Adds a dev test for mb_2024 with 4 mux_2023
---
.../config_mb_2024_0_2__4_mux_2023_dps5005.py | 50 +++-----
dev/test_mb_2024_4_mux_2023.py | 118 ++++++++++++++++++
ohmpi/hardware_components/mux_2023_0_X.py | 6 +-
3 files changed, 139 insertions(+), 35 deletions(-)
create mode 100644 dev/test_mb_2024_4_mux_2023.py
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 d19ababb..5d9b5091 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_4_mux_2023.py b/dev/test_mb_2024_4_mux_2023.py
new file mode 100644
index 00000000..3dd2d337
--- /dev/null
+++ b/dev/test_mb_2024_4_mux_2023.py
@@ -0,0 +1,118 @@
+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'])
+ mux_ids = ['mux_A', 'mux_B']
+ 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 for i in range(1, 65)], 'B': [i for i in range(1, 65)],
+ 'M': [i for i in range(1, 65)], 'N': [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 b569ac61..1e88aef3 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()
--
GitLab