Commit 53cd67c2 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Reverts readings append mode

No related merge requests found
Showing with 6 additions and 5 deletions
+6 -5
...@@ -48,8 +48,8 @@ class OhmPiHardware: ...@@ -48,8 +48,8 @@ class OhmPiHardware:
self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger, self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger,
data_logger=self.data_logger, data_logger=self.data_logger,
soh_logger=self.soh_logger)) soh_logger=self.soh_logger))
self.readings = np.array([]) self.readings = np.array([]) # time series of acquired data
self.readings_window = (0.3, 1.0) self._start_time = None # time of the beginning of a readings acquisition
def _clear_values(self): def _clear_values(self):
self.readings = np.array([]) self.readings = np.array([])
...@@ -67,12 +67,13 @@ class OhmPiHardware: ...@@ -67,12 +67,13 @@ class OhmPiHardware:
_readings = self.readings.tolist() _readings = self.readings.tolist()
sample = 0 sample = 0
self.tx_sync.wait() self.tx_sync.wait()
start_time = datetime.datetime.utcnow() if not append or self._start_time is None:
self._start_time = datetime.datetime.utcnow()
while self.tx_sync.is_set(): while self.tx_sync.is_set():
lap = datetime.datetime.utcnow() lap = datetime.datetime.utcnow()
_readings.append([elapsed_seconds(start_time), self.tx.current, self.rx.voltage, self.tx.polarity]) _readings.append([elapsed_seconds(self._start_time), self.tx.current, self.rx.voltage, self.tx.polarity])
sample+=1 sample+=1
sleep_time = start_time + datetime.timedelta(seconds = sample * sampling_rate / 1000) - lap sleep_time = self._start_time + datetime.timedelta(seconds = sample * sampling_rate / 1000) - lap
time.sleep(np.min([0, np.abs(sleep_time.total_seconds())])) time.sleep(np.min([0, np.abs(sleep_time.total_seconds())]))
self.readings = np.array(_readings) self.readings = np.array(_readings)
......
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