calling variables bytesxxx was historic and bad. renamed to pointsxxx

ok1vaw · Jun 9, 2020 · 25746fb · 25746fb
1 parent 1aa3118
commit 25746fb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/NanoVNASaver/Hardware/NanoVNA_V2.py b/NanoVNASaver/Hardware/NanoVNA_V2.py
@@ -105,24 +105,24 @@ def readValues(self, value) -> List[str]:
             # cmd: write register 0x30 to clear FIFO
             self.serial.write([0x20, 0x30, 0x00])
 
-            bytesleft = self.datapoints
-            while bytesleft > 0 :
+            pointstodo = self.datapoints
+            while pointstodo > 0 :
 
                 logger.info("reading values")
-                bytestoread = min(255, bytesleft)
+                pointstoread = min(255, pointstodo)
                 # cmd: read FIFO, addr 0x30
-                self.serial.write([0x18, 0x30, bytestoread])
+                self.serial.write([0x18, 0x30, pointstoread])
 
                 # each value is 32 bytes
-                nBytes = bytestoread * 32
+                nBytes = pointstoread * 32
 
                 # serial .read() will wait for exactly nBytes bytes
                 arr = self.serial.read(nBytes)
                 if nBytes != len(arr):
                     logger.error("expected %d bytes, got %d", nBytes, len(arr))
                     return []
 
-                for i in range(bytestoread):
+                for i in range(pointstoread):
                     b = arr[i*32:]
                     fwd = complex(_unpackSigned32(b[0:]), _unpackSigned32(b[4:]))
                     refl = complex(_unpackSigned32(b[8:]), _unpackSigned32(b[12:]))
@@ -131,7 +131,7 @@ def readValues(self, value) -> List[str]:
                     #print('freqIndex', freqIndex)
                     self.sweepData[freqIndex] = (refl / fwd, thru / fwd)
 
-                bytesleft = bytesleft - bytestoread
+                pointstodo = pointstodo - pointstoread
 
             ret = [x[0] for x in self.sweepData]
             ret = [str(x.real) + ' ' + str(x.imag) for x in ret]

diff --git a/README.md b/README.md
@@ -11,6 +11,9 @@ A multiplatform tool to save Touchstone files from the NanoVNA, sweep frequency
 
 Copyright 2019, 2020 Rune B. Broberg
 
+## Changes in this fork
+This fork adds support for the saa2, a vna loosely based on the original nanovna with frequency range up to 3Ghz. 
+
 ## Introduction
 This software connects to a NanoVNA and extracts the data for display on a computer, and for saving to Touchstone files.