Winz/Adalm1000_Logger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Vincent Hanewinkel 2025-08-14 22:15:32 +02:00
parent aa1596cc43
commit 7d9be883a5
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
DeviceController.py
View File

@ -1,7 +1,10 @@
import threading, queue, time, csv, os import threading, queue, time, csv, os
CHUNK = 2000 CHUNK = 2000
SAMPLE_RATE = 100_000.0 # 100 kS/s
DT = 1.0 / SAMPLE_RATE
OUTDIR = "logs" OUTDIR = "logs"
FLUSH_EVERY = 50
os.makedirs(OUTDIR, exist_ok=True) os.makedirs(OUTDIR, exist_ok=True)
class DeviceController: class DeviceController:
@ -59,23 +62,45 @@ class DeviceController:
time.sleep(0.01) time.sleep(0.01)
def writer_loop(self): def writer_loop(self):
os.makedirs(OUTDIR, exist_ok=True)
ts0 = None ts0 = None
fn = os.path.join(OUTDIR, f"{time.strftime('%Y%m%d_%H%M%S')}_{self.dev.serial}.csv") fn = os.path.join(OUTDIR, f"{time.strftime('%Y%m%d_%H%M%S')}_{self.dev.serial}.csv")
with open(fn, "w", newline="") as f: chunks_written = 0
w = csv.writer(f) sample_idx = 0
w.writerow(["t_rel_s", "ch", "value"])
sample_idx = 0 try:
while not (self.stop_evt.is_set() and self.writer_q.empty()): with open(fn, "w", newline="") as f:
try: w = csv.writer(f)
ts, va, vb = self.writer_q.get(timeout=0.2) # Long-Format: eine Zeile pro Kanalwert
except Exception: w.writerow(["t_rel_s", "ch", "value"])
continue
if ts0 is None: ts0 = ts while not (self.stop_evt.is_set() and self.writer_q.empty()):
for i, v in enumerate(va): try:
t_rel = (sample_idx + i) * 1e-5 # 100 kS/s → 10 µs ts, va, vb = self.writer_q.get(timeout=0.2)
w.writerow([t_rel, "A", v]) except Exception:
for i, v in enumerate(vb): continue
t_rel = (sample_idx + i) * 1e-5
w.writerow([t_rel, "B", v]) if ts0 is None:
sample_idx += len(va) ts0 = ts
print(f"[{self.dev.serial}] Datei geschlossen.")
# Sicherstellen, dass A und B gleich lang sind
if len(va) != len(vb):
n = min(len(va), len(vb))
va, vb = va[:n], vb[:n]
# Zeitindex aus Sample-Index ableiten (konstante Rate)
for i, (a, b) in enumerate(zip(va, vb)):
t_rel = (sample_idx + i) * DT
w.writerow([t_rel, "A", a])
w.writerow([t_rel, "B", b])
sample_idx += len(va)
chunks_written += 1
if chunks_written % FLUSH_EVERY == 0:
f.flush() # optional: os.fsync(f.fileno())
except Exception as e:
print(f"[{self.dev.serial}] Writer-Fehler: {e}")
finally:
print(f"[{self.dev.serial}] Datei geschlossen: {fn}")