From 5c3912c8c1922da9bbcadf210d1a0c78448a5854 Mon Sep 17 00:00:00 2001 From: su530201 <olivier.kaufmann@umons.ac.be> Date: Wed, 30 Aug 2023 16:15:27 +0200 Subject: [PATCH] Updates a test in dev for 4 muxes 2024 --- configs/config_mb_2023_mux_2024.py | 2 +- dev/test_4_mux_2024.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/config_mb_2023_mux_2024.py b/configs/config_mb_2023_mux_2024.py index 5efb43ad..f8075ecd 100644 --- a/configs/config_mb_2023_mux_2024.py +++ b/configs/config_mb_2023_mux_2024.py @@ -27,7 +27,7 @@ HARDWARE_CONFIG = { 'current_max': 4800 / 50 / 2, # Maximum current supported by the TX board [mA] 'r_shunt': 2 # Shunt resistance in Ohms }, - 'rx' : {'model': 'ohmpi_card_3_15', + 'rx': {'model': 'ohmpi_card_3_15', 'coef_p2': 2.50, # slope for current conversion for ADS.P2, measurement in V/V 'sampling_rate': 100., # Hz 'nb_samples': 20, # Max value 10 # was named integer before... diff --git a/dev/test_4_mux_2024.py b/dev/test_4_mux_2024.py index 2d4b36ef..6eba36a7 100644 --- a/dev/test_4_mux_2024.py +++ b/dev/test_4_mux_2024.py @@ -16,7 +16,8 @@ within_ohmpi = False if stand_alone_mux: mux_id = 'mux_02' print(MUX_CONFIG) - MUX_CONFIG.update({mux_id: HARDWARE_CONFIG['mux']['boards'][mux_id]}) + MUX_CONFIG.update(HARDWARE_CONFIG['mux']['boards'][mux_id]) + MUX_CONFIG.update('id', mux_id) MUX_CONFIG['ctl'] = ctl_module.Ctl() mux = Mux(**MUX_CONFIG) mux.switch_one(elec=1, role='M', state='on') -- GitLab