diff --git a/configs/config_mb_2023_mux_2024.py b/configs/config_mb_2023_mux_2024.py index 5efb43ad5f0468f2d5a4b4d89af0dd0e2953e3be..f8075ecd87b2ed79981f0538f03520aebbe69194 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 2d4b36ef455b13028910bf87dd06cb1a48838dbf..6eba36a7958112c7fdbad8d58fb0248550049249 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')