Commit 39817e71 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Fixes misinterpretation of sampling_rate as sample duration

Showing with 2 additions and 3 deletions
+2 -3
......@@ -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
......
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment