chore: remove unused options

This commit is contained in:
TT 2019-10-22 09:36:01 +09:00
parent 0f29824a78
commit 734d9ce92d
2 changed files with 1 additions and 33 deletions

View file

@ -2,7 +2,6 @@
import serial import serial
import numpy as np import numpy as np
import pylab as pl import pylab as pl
import scipy.signal as signal
import struct import struct
from serial.tools import list_ports from serial.tools import list_ports
@ -19,21 +18,10 @@ def getport() -> str:
REF_LEVEL = (1<<9) 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: class NanoVNA:
def __init__(self, dev): def __init__(self, dev):
self.dev = dev self.dev = dev or getport()
self.serial = None self.serial = None
self.filter = None # bandpassfilter_5khz
self._frequencies = None self._frequencies = None
self.points = 101 self.points = 101
@ -146,8 +134,6 @@ class NanoVNA:
def reflect_coeff_from_rawwave(self, freq = None): def reflect_coeff_from_rawwave(self, freq = None):
ref, samp = self.fetch_rawwave(freq) ref, samp = self.fetch_rawwave(freq)
if self.filter:
ref, samp = self.filter(ref, samp)
refh = signal.hilbert(ref) refh = signal.hilbert(ref)
#x = np.correlate(refh, samp) / np.correlate(refh, refh) #x = np.correlate(refh, samp) / np.correlate(refh, refh)
#return x[0] #return x[0]
@ -328,8 +314,6 @@ def plot_sample(ref, samp):
if __name__ == '__main__': if __name__ == '__main__':
from optparse import OptionParser from optparse import OptionParser
parser = OptionParser(usage="%prog: [options]") 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", parser.add_option("-r", "--raw", dest="rawwave",
type="int", default=None, type="int", default=None,
help="plot raw waveform", metavar="RAWWAVE") help="plot raw waveform", metavar="RAWWAVE")
@ -376,20 +360,9 @@ if __name__ == '__main__':
help="port", metavar="PORT") help="port", metavar="PORT")
parser.add_option("-d", "--dev", dest="device", parser.add_option("-d", "--dev", dest="device",
help="device node", metavar="DEV") 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", parser.add_option("-v", "--verbose",
action="store_true", dest="verbose", default=False, action="store_true", dest="verbose", default=False,
help="verbose output") 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", parser.add_option("-C", "--capture", dest="capture",
help="capture current display to FILE", metavar="FILE") help="capture current display to FILE", metavar="FILE")
parser.add_option("-e", dest="command", action="append", parser.add_option("-e", dest="command", action="append",
@ -408,11 +381,7 @@ if __name__ == '__main__':
img.save(opt.capture) img.save(opt.capture)
exit(0) exit(0)
nv.set_frequency(opt.freq)
nv.set_port(opt.port) 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: if opt.rawwave is not None:
samp = nv.fetch_buffer(buffer = opt.rawwave) samp = nv.fetch_buffer(buffer = opt.rawwave)
print(len(samp)) print(len(samp))

View file

@ -1,5 +1,4 @@
matplotlib matplotlib
scipy
scikit-rf scikit-rf
pillow pillow
pyserial pyserial