diff --git a/ohmpi/hardware_components/mux_2024_rev_0_0.py b/ohmpi/hardware_components/mux_2024_rev_0_0.py index 10391b52c2ab4ac51dd509e81226081f621de8f3..a5dd69c6cbf13b84d8b518fc283a17ca35a2d750 100644 --- a/ohmpi/hardware_components/mux_2024_rev_0_0.py +++ b/ohmpi/hardware_components/mux_2024_rev_0_0.py @@ -14,11 +14,11 @@ activation_delay = 0.01 release_delay = 0.005 MUX_CONFIG = HARDWARE_CONFIG['mux'].pop('default', {}) -MUX_CONFIG.update({'voltage_max': max(0.,min(MUX_CONFIG['voltage_max'],voltage_max)), - 'current_max': max(0.,min(MUX_CONFIG['current_max'],voltage_max))}) +MUX_CONFIG.update({'voltage_max': max(0.,min(MUX_CONFIG.pop('voltage_max', voltage_max), voltage_max)), + 'current_max': max(0.,min(MUX_CONFIG.pop('current_max', voltage_max), voltage_max))}) -MUX_CONFIG.update({'activation_delay': max(MUX_CONFIG.pop('activation_delay', activation_delay),activation_delay), - 'release_delay': max(MUX_CONFIG.pop('release_delay', release_delay),release_delay)}) +MUX_CONFIG.update({'activation_delay': max(MUX_CONFIG.pop('activation_delay', activation_delay), activation_delay), + 'release_delay': max(MUX_CONFIG.pop('release_delay', release_delay), release_delay)}) # defaults to 4 roles cabling electrodes from 1 to 8 default_mux_cabling = {(elec, role) : ('mux_1', elec) for role in ['A', 'B', 'M', 'N'] for elec in range(1,9)}