Merge branch 'code_refactor' of https://gitlab.irstea.fr/reversaal/OhmPi into code_refactor

configs/config_mb_2024_0_2__4_mux_2023__4_mux_2024_dps5005.py

@@ -34,24 +34,28 @@ HARDWARE_CONFIG = {
     'mux': {'boards':
                 {'mux_A':
                      {'model': 'mux_2023_0_X',
+                      'interface_name': 'i2c',
                       '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_B':
                      {'model': 'mux_2023_0_X',
+                      'interface_name': 'i2c',
                       '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_M':
                      {'model': 'mux_2023_0_X',
+                      'interface_name': 'i2c',
                       '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_N':
                      {'model': 'mux_2023_0_X',
+                      'interface_name': 'i2c',
                       'mux_tca_address': 0x73,
                       'roles': {'N': 'X'},
                       'cabling': {(i, j): ('mux_N', i) for j in ['N'] for i in range(1, 65)},

dev/test_mb_2024_4_mux_2024_4_mux_2023.py

+import matplotlib
+matplotlib.use('TkAgg')
+from ohmpi.utils import change_config
+change_config('../configs/config_mb_2024_0_2__4_mux_2023__4_mux_2024_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'
+    id = '02'
+    m = 0
+    mux_id = f'mux_{role}'
+    #mux_id = f'mux_{id}'
+    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.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 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)