No VNA instance for info reading

this was needed as -H variants don't responds the same way classical do

NanoVNASaver/Hardware/Hardware.py

@@ -87,30 +87,27 @@ def get_VNA(iface: Interface) -> 'VNA':
         return NanoVNA_V2(iface)
 
     logger.info("Finding firmware variant...")
-    tmp_vna = VNA(iface)
-    tmp_vna.flushSerialBuffers()
-    firmware = tmp_vna.readFirmware()
-    if firmware.find("AVNA + Teensy") >= 0:
+    info = get_info(iface)
+    if info.find("AVNA + Teensy") >= 0:
         logger.info("Type: AVNA")
         return AVNA(iface)
-    if firmware.find("NanoVNA-H 4") >= 0:
+    if info.find("NanoVNA-H 4") >= 0:
         logger.info("Type: NanoVNA-H4")
         vna = NanoVNA_H4(iface)
         return vna
-    if firmware.find("NanoVNA-H") >= 0:
+    if info.find("NanoVNA-H") >= 0:
         logger.info("Type: NanoVNA-H")
         vna = NanoVNA_H(iface)
         return vna
-    if firmware.find("NanoVNA-F") >= 0:
+    if info.find("NanoVNA-F") >= 0:
         logger.info("Type: NanoVNA-F")
         return NanoVNA_F(iface)
-    if firmware.find("NanoVNA") >= 0:
+    if info.find("NanoVNA") >= 0:
         logger.info("Type: Generic NanoVNA")
         return NanoVNA(iface)
     logger.warning("Did not recognize NanoVNA type from firmware.")
     return NanoVNA(iface)
 
-
 def detect_version(serial_port: serial.Serial) -> str:
     data = ""
     for i in range(RETRIES):
@@ -128,3 +125,26 @@ def detect_version(serial_port: serial.Serial) -> str:
         logger.debug("Retry detection: %s", i + 1)
     logger.error('No VNA detected. Hardware responded to CR with: %s', data)
     return ""
+
+def get_info(serial_port: serial.Serial) -> str:
+    for i in range(RETRIES):
+        drain_serial(serial_port)
+        serial_port.write("info\r".encode("ascii"))
+        lines = []
+        retries = 0
+        while True:
+            line = serial_port.readline()
+            line = line.decode("ascii").strip()
+            if not line:
+                retries += 1
+                if retries > RETRIES:
+                    return ""
+                sleep(wait)
+                continue
+            if line == "info":  # suppress echo
+                continue
+            if line.startswith("ch>"):
+                logger.debug("Needed retries: %s", retries)
+                break
+            lines.append(line)
+        return "\n".join(lines)

NanoVNASaver/Hardware/NanoVNA_H.py

@@ -32,4 +32,4 @@ class NanoVNA_H(NanoVNA):
             logger.info("VNA has 201 datapoints capability")
             self.valid_datapoints = (201, 101)
             self.datapoints = 201
-        super().read_features()
+        self.features.add("Screenshot")

NanoVNASaver/NanoVNASaver.py

@@ -560,6 +560,8 @@ class NanoVNASaver(QtWidgets.QWidget):
             self.sweep_control.set_end(
                 frequencies[0] +
                 self.vna.datapoints * self.sweep_control.get_count())
+
+        self.sweep_control.set_count(1)  # speed up things
         self.sweep_control.update_center_span()
         self.sweep_control.update_step_size()
 

NanoVNASaver/Widgets/SweepControl.py

@@ -151,7 +151,7 @@ class SweepControl(QtWidgets.QGroupBox):
         return result
 
     def set_count(self, count: int):
-        self.input_count.setText(count)
+        self.input_count.setText(str(count))
         self.input_count.textEdited.emit(self.input_count.text())
         self.updated.emit(self)