diff --git a/configs/config_mb_2023_2_mux_2024.py b/configs/config_mb_2023_2_mux_2024.py index db10a580170c2a69f56941fa431b3d9356eb203b..dbbf82dfc060775e9d55c3f13f66b235d27c200e 100644 --- a/configs/config_mb_2023_2_mux_2024.py +++ b/configs/config_mb_2023_2_mux_2024.py @@ -28,7 +28,6 @@ HARDWARE_CONFIG = { }, '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... }, 'mux': # default properties are system properties that will be diff --git a/ohmpi/hardware_components/ohmpi_card_3_15.py b/ohmpi/hardware_components/ohmpi_card_3_15.py index 9a743f3c22b7b904efd9425a42ec4e5530573821..cb6dfd44203cde9d62df528bb067ff9abe810ec5 100644 --- a/ohmpi/hardware_components/ohmpi_card_3_15.py +++ b/ohmpi/hardware_components/ohmpi_card_3_15.py @@ -21,8 +21,8 @@ RX_CONFIG = HARDWARE_CONFIG['rx'] # ADC for voltage voltage_adc_voltage_min = 10. # mV voltage_adc_voltage_max = 4500. # mV -sampling_rate = 100. # Hz -data_rate = 860. # S/s? +sampling_rate = 50. # Hz +data_rate = 860. # S/s? RX_CONFIG['voltage_min'] = np.min([voltage_adc_voltage_min, RX_CONFIG.pop('voltage_min', np.inf)]) # mV RX_CONFIG['voltage_max'] = np.min([voltage_adc_voltage_max, RX_CONFIG.pop('voltage_max', np.inf)]) # mV RX_CONFIG['sampling_rate'] = RX_CONFIG.pop('sampling_rate', sampling_rate)