From 9c3c337b6e58de23c967eec1bb1a379eba68b94b Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 27 Jun 2023 15:35:40 +0200
Subject: [PATCH] Tests settings CONTINUOUS mode on TX'
---
ohmpi/hardware_components/ohmpi_card_3_15.py | 1 +
ohmpi/hardware_system.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ohmpi/hardware_components/ohmpi_card_3_15.py b/ohmpi/hardware_components/ohmpi_card_3_15.py
index 71e7ae7e..2dbb16d7 100644
--- a/ohmpi/hardware_components/ohmpi_card_3_15.py
+++ b/ohmpi/hardware_components/ohmpi_card_3_15.py
@@ -133,6 +133,7 @@ class Tx(TxAbstract):
self._adc_gain = value
self._ads_current = ads.ADS1115(self.ctl.bus, gain=self.adc_gain, data_rate=860,
address=self._ads_current_address)
+ self._ads_current.mode = Mode.CONTINUOUS
self.exec_logger.debug(f'Setting TX ADC gain to {value}')
def adc_gain_auto(self):
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index dc36150d..38f3782c 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -178,12 +178,13 @@ class OhmPiHardware:
sampling_rate = self.rx.sampling_rate
sample = 0
# self.exec_logger.info(f'values when starting pulse {self._pulse} : {self.tx.current} mA, {self.rx.voltage} mV')
- _ = self.rx.voltage
lap = datetime.datetime.utcnow() # just in case tx_sync is not set immediately after passing wait
self.tx_sync.wait() #
if not append or self._start_time is None:
self._start_time = datetime.datetime.utcnow()
time.sleep(np.max([self.rx._latency, self.tx._latency]))
+ # _ = self.rx.voltage
+
while self.tx_sync.is_set():
lap = datetime.datetime.utcnow()
r = [elapsed_seconds(self._start_time), self._pulse, self.tx.polarity, self.tx.current, self.rx.voltage]
--
GitLab