From 734d9ce92d1f737ecbbdb64b78e8f2ff9007620e Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Tue, 22 Oct 2019 09:36:01 +0900
Subject: [PATCH] chore: remove unused options

---
 python/nanovna.py       | 33 +--------------------------------
 python/requirements.txt |  1 -
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/python/nanovna.py b/python/nanovna.py
index 0ac77c7..bf1b10b 100755
--- a/python/nanovna.py
+++ b/python/nanovna.py
@@ -2,7 +2,6 @@
 import serial
 import numpy as np
 import pylab as pl
-import scipy.signal as signal
 import struct
 from serial.tools import list_ports
 
@@ -19,21 +18,10 @@ def getport() -> str:
 
 REF_LEVEL = (1<<9)
 
-# b, a = signal.ellip(4, 0.2, 100, (4700.0/24000, 5100.0/24000), 'bandpass')
-# def bandpassfilter_5khz(ref, samp):
-#     zi = signal.lfiltic(b, a, np.ones([0]))
-#     samp1,zi = signal.lfilter(b, a, samp, zi = zi)
-#     samp1,x = signal.lfilter(b, a, samp, zi = zi)
-#     zi = signal.lfiltic(b, a, np.ones([0]))
-#     ref1,zi = signal.lfilter(b, a, ref, zi = zi)
-#     ref1,x = signal.lfilter(b, a, ref, zi = zi)
-#     return ref1,samp1
-
 class NanoVNA:
     def __init__(self, dev):
-        self.dev = dev
+        self.dev = dev or getport()
         self.serial = None
-        self.filter = None # bandpassfilter_5khz
         self._frequencies = None
         self.points = 101
         
@@ -146,8 +134,6 @@ class NanoVNA:
 
     def reflect_coeff_from_rawwave(self, freq = None):
         ref, samp = self.fetch_rawwave(freq)
-        if self.filter:
-            ref, samp = self.filter(ref, samp)
         refh = signal.hilbert(ref)
         #x = np.correlate(refh, samp) / np.correlate(refh, refh)
         #return x[0]
@@ -328,8 +314,6 @@ def plot_sample(ref, samp):
 if __name__ == '__main__':
     from optparse import OptionParser
     parser = OptionParser(usage="%prog: [options]")
-    parser.add_option("-f", "--file", dest="filename",
-                      help="read from FILE", metavar="FILE")
     parser.add_option("-r", "--raw", dest="rawwave",
                       type="int", default=None,
                       help="plot raw waveform", metavar="RAWWAVE")
@@ -376,20 +360,9 @@ if __name__ == '__main__':
                       help="port", metavar="PORT")
     parser.add_option("-d", "--dev", dest="device",
                       help="device node", metavar="DEV")
-    parser.add_option("-F", "--freqeucy", type="int", dest="freq",
-                      help="frequency", metavar="FREQ")
-    parser.add_option("-g", "--gain", type="int", dest="gain",
-                      help="gain (0-95)", metavar="GAIN")
-    parser.add_option("-O", "--offset", type="int", dest="offset",
-                      help="offset frequency", metavar="OFFSET")
-    parser.add_option("--strength", type="int", dest="strength",
-                      help="drive strength(0-3)", metavar="STRENGTH")
     parser.add_option("-v", "--verbose",
                       action="store_true", dest="verbose", default=False,
                       help="verbose output")
-    parser.add_option("-l", "--filter",
-                      action="store_true", dest="filter", default=False,
-                      help="apply IF filter on raw wave plot")
     parser.add_option("-C", "--capture", dest="capture",
                       help="capture current display to FILE", metavar="FILE")
     parser.add_option("-e", dest="command", action="append",
@@ -408,11 +381,7 @@ if __name__ == '__main__':
         img.save(opt.capture)
         exit(0)
 
-    nv.set_frequency(opt.freq)
     nv.set_port(opt.port)
-    nv.set_gain(opt.gain)
-    nv.set_offset(opt.offset)
-    nv.set_strength(opt.strength)
     if opt.rawwave is not None:
         samp = nv.fetch_buffer(buffer = opt.rawwave)
         print(len(samp))
diff --git a/python/requirements.txt b/python/requirements.txt
index bc7e1ef..4c8042f 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,5 +1,4 @@
 matplotlib
-scipy
 scikit-rf
 pillow
 pyserial