From 39817e71aa461942514854c751eda1acaa7636d3 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 15 Jun 2023 18:24:09 +0200
Subject: [PATCH] Fixes misinterpretation of sampling_rate as sample duration
---
configs/config_mb_2023_2_mux_2024.py | 1 -
ohmpi/hardware_components/ohmpi_card_3_15.py | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/configs/config_mb_2023_2_mux_2024.py b/configs/config_mb_2023_2_mux_2024.py
index db10a580..dbbf82df 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 9a743f3c..cb6dfd44 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)
--
GitLab