save

Author: www

frontends/hackrf.py

@@ -9,13 +9,16 @@
 class CaptureInterface():
   def __init__(self):
     self.config = {}
-    self.config["samplecount"] = 5000
-    self.config["freq"] = 16e6
-    self.config["bw"] = 1e6
     print("HackRF ext.trig. frontend ready")
 
   def init(self):
     print("hackrf frontend init()")
+    if "samplecount" not in self.config.keys():
+      self.config["samplecount"] = 50000
+    if "frequency" not in self.config.keys():
+      self.config["frequency"] = 8000000
+    if "samplerate" not in self.config.keys():
+      self.config["samplerate"] = 2000000
     self.hackrf_proc = None
 
   def capture(self):
@@ -31,14 +34,17 @@ def capture(self):
       return [0]
     # print(stdout)
     # print(stderr)
-    return numpy.fromstring(stdout, dtype=numpy.uint8)
+    return numpy.fromstring(stdout, dtype=numpy.int8)
 
   # hackrf_transfer -H -d <serial number> -a 0 -l 32 -g 32 -r rx1.cs8
   def arm(self):
+    print(self.config)
     try:
-      self.hackrf_proc = subprocess.Popen(["hackrf_transfer","-H","-f","8100000","-s","4000000","-a","0","-l","32","-g","32","-n","10000","-r","-"],stdout=subprocess.PIPE,stderr=subprocess.PIPE,text=False)
-    except:
+      self.hackrf_proc = subprocess.Popen(["hackrf_transfer","-H","-f","%d" % self.config["frequency"],"-s","%d" % self.config["samplerate"],"-a","1","-l","32","-g","32","-n","%d" % self.config["samplecount"],"-r","-"],stdout=subprocess.PIPE,stderr=subprocess.PIPE,text=False)
+    except Exception as e:
+      print(self.config["frequency"])
       print("hackrf: could not open process")
+      print(e)
       sys.exit(0)
     print("hackrf: started process")
 

lib/sparkgap/filemanager.py

@@ -75,6 +75,12 @@ def cleanup(self):
     if self.f is not None:
       self.f.close()
 
+  def getDtype(self):
+    if len(self.traces) == 0:
+      print("fatal: getDtype on empty trace array. dafuq?")
+      return None
+    return self.traces[0].dtype
+
   def slice(self,offset,numsamples):
     print("TraceManager: vertical slicing keeping %d:%d")
     if numsamples <= 0:

lib/sparkgap/preprocessor/__init__.py

@@ -8,7 +8,7 @@ def TwoPointCompress(tm_in,varMgr):
   numTraces = tm_in.traceCount
   sampleCnt = tm_in.numPoints
   cdist = varMgr.getVariable("compress_dist")
-  traces = zeros((numTraces,sampleCnt - cdist),float32)
+  traces = zeros((numTraces,sampleCnt - cdist),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   print("="*64)
@@ -27,7 +27,7 @@ def VAlign(tm_in,varMgr):
   sampleCnt = tm_in.numPoints
   window_offset = varMgr.getOptionalVariable("window_offset",0)
   window_length = varMgr.getOptionalVariable("window_length",sampleCnt)
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   refct = varMgr.getVariable("ref")

lib/sparkgap/preprocessor/alignment.py

@@ -114,7 +114,7 @@ def doCORR(tm_in,varMgr):
   sampleCnt = tm_in.numPoints
   lenPT = len(tm_in.data_in[0])
   lenCT = len(tm_in.data_out[0])
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,lenPT),uint8)
   data_out = zeros((numTraces,lenCT),uint8)
   CONFIG_REFTRACE = varMgr.getVariable("ref")
@@ -153,7 +153,7 @@ def doCORR(tm_in,varMgr):
 def doEarthquake(tm_in,varMgr):
   numTraces = tm_in.traceCount
   sampleCnt = tm_in.numPoints
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   CONFIG_WRITEFILE = varMgr.getVariable("writefile")
@@ -178,7 +178,7 @@ def doSAD(tm_in,varMgr):
   sampleCnt = tm_in.numPoints
   lenPT = len(tm_in.data_in[0])
   lenCT = len(tm_in.data_out[0])
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,lenPT),uint8)
   data_out = zeros((numTraces,lenCT),uint8)
   CONFIG_REFTRACE = varMgr.getVariable("ref")

lib/sparkgap/preprocessor/filtering.py

@@ -37,7 +37,8 @@ def butter_lowpass_filter(data, cutoff, fs, order=5):
 def doLowpass(tm_in,varMgr):
   numTraces = tm_in.traceCount
   sampleCnt = tm_in.numPoints
-  traces = zeros((numTraces,sampleCnt),float32)
+  dt = tm_in.getSingleTrace(0).dtype
+  traces = zeros((numTraces,sampleCnt),dt)
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   savedDataIndex = 0
@@ -57,7 +58,7 @@ def doLowpass(tm_in,varMgr):
 def doBandpass(tm_in,varMgr):
   numTraces = tm_in.traceCount
   sampleCnt = tm_in.numPoints
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   savedDataIndex = 0
@@ -91,7 +92,7 @@ def doSingleCWTDenoise(x,wavelet="db4",level=1):
 def doCWTDenoise(tm_in,varMgr):
   numTraces = tm_in.traceCount
   sampleCnt = tm_in.numPoints
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   savedDataIndex = 0

lib/sparkgap/preprocessor/keeloq.py

@@ -18,7 +18,7 @@ def packKeeloq(bitstring):
 def doFlipKeeloqIO(tm_in,varMgr):
   numTraces = tm_in.traceCount
   sampleCnt = tm_in.numPoints
-  traces = zeros((numTraces,sampleCnt),float32)
+  traces = zeros((numTraces,sampleCnt),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   savedDataIndex = 0

lib/sparkgap/preprocessor/slicer.py

@@ -15,7 +15,7 @@ def doSlicer(tm_in,varMgr):
   maxSlicesForwards = varMgr.getVariable("slices_forwards")
   newSampleCount = (maxSlicesBackwards + maxSlicesForwards) * (3 + CONFIG_REF_LENGTH)
   numTraces = tm_in.traceCount
-  traces = zeros((numTraces,newSampleCount),float32)
+  traces = zeros((numTraces,newSampleCount),tm_in.getDtype())
   data = zeros((numTraces,16),uint8)
   data_out = zeros((numTraces,16),uint8)
   numTraces = tm_in.traceCount