ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed: fix resetting sweep range #83

Browse source
This commit is contained in:
TT 2019-10-17 23:49:40 +09:00
parent 85c8b5c893
commit 87c6e64a25
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
python/nanovna.py
View file

@ -36,7 +36,6 @@ class NanoVNA:
self.filter = None # bandpassfilter_5khz self.filter = None # bandpassfilter_5khz
self._frequencies = None self._frequencies = None
self.points = 101 self.points = 101
self.set_sweep(1e6, 900e6)
@property @property
def frequencies(self): def frequencies(self):
@ -228,10 +227,12 @@ class NanoVNA:
def logmag(self, x): def logmag(self, x):
pl.grid(True) pl.grid(True)
pl.xlim(self.frequencies[0], self.frequencies[-1])
pl.plot(self.frequencies, 20*np.log10(np.abs(x))) pl.plot(self.frequencies, 20*np.log10(np.abs(x)))
def linmag(self, x): def linmag(self, x):
pl.grid(True) pl.grid(True)
pl.xlim(self.frequencies[0], self.frequencies[-1])
pl.plot(self.frequencies, np.abs(x)) pl.plot(self.frequencies, np.abs(x))
def phase(self, x, unwrap=False): def phase(self, x, unwrap=False):
@ -241,21 +242,25 @@ class NanoVNA:
a = np.unwrap(a) a = np.unwrap(a)
else: else:
pl.ylim((-180,180)) pl.ylim((-180,180))
pl.xlim(self.frequencies[0], self.frequencies[-1])
pl.plot(self.frequencies, np.rad2deg(a)) pl.plot(self.frequencies, np.rad2deg(a))
def delay(self, x): def delay(self, x):
pl.grid(True) pl.grid(True)
delay = -np.unwrap(np.angle(x))/ (2*np.pi*np.array(self.frequencies)) delay = -np.unwrap(np.angle(x))/ (2*np.pi*np.array(self.frequencies))
pl.xlim(self.frequencies[0], self.frequencies[-1])
pl.plot(self.frequencies, delay) pl.plot(self.frequencies, delay)
def groupdelay(self, x): def groupdelay(self, x):
pl.grid(True) pl.grid(True)
gd = np.convolve(np.unwrap(np.angle(x)), [1,-1], mode='same') gd = np.convolve(np.unwrap(np.angle(x)), [1,-1], mode='same')
pl.xlim(self.frequencies[0], self.frequencies[-1])
pl.plot(self.frequencies, gd) pl.plot(self.frequencies, gd)
def vswr(self, x): def vswr(self, x):
pl.grid(True) pl.grid(True)
vswr = (1+np.abs(x))/(1-np.abs(x)) vswr = (1+np.abs(x))/(1-np.abs(x))
pl.xlim(self.frequencies[0], self.frequencies[-1])
pl.plot(self.frequencies, vswr) pl.plot(self.frequencies, vswr)
def polar(self, x): def polar(self, x):
@ -426,7 +431,9 @@ if __name__ == '__main__':
else: else:
if opt.start or opt.stop: if opt.start or opt.stop:
nv.set_sweep(opt.start, opt.stop) nv.set_sweep(opt.start, opt.stop)
nv.fetch_frequencies()
s = nv.data(p) s = nv.data(p)
nv.fetch_frequencies()
if opt.smith: if opt.smith:
nv.smith(s) nv.smith(s)
if opt.polar: if opt.polar: