Add Hardware version in Device Settings

src/NanoVNASaver/Hardware/Hardware.py

@@ -142,7 +142,6 @@ def get_VNA(iface: Interface) -> VNA:
     # serial_port.timeout = TIMEOUT
     return NAME2DEVICE[iface.comment](iface)
 
-
 def get_comment(iface: Interface) -> str:
     logger.info("Finding correct VNA type...")
     with iface.lock:

src/NanoVNASaver/Hardware/NanoVNA_F_V2.py

@@ -23,6 +23,7 @@
 
 from NanoVNASaver.Hardware.NanoVNA import NanoVNA
 from NanoVNASaver.Hardware.Serial import Interface
+from NanoVNASaver.Version import Version
 
 logger = logging.getLogger(__name__)
 
@@ -31,10 +32,25 @@ class NanoVNA_F_V2(NanoVNA):
     name = "NanoVNA-F_V2"
     screenwidth = 800
     screenheight = 480
-
+    valid_datapoints = (101, 11, 51, 201, 301)
+    sweep_points_min = 11
+    sweep_points_max = 301
+
     def __init__(self, iface: Interface):
         super().__init__(iface)
         self.sweep_max_freq_Hz = 3e9
+        self.version = self.read_firmware_version()
+        # max datapoints reach up to 301 since version 0.5.0
+        if self.version >= Version("0.5.0"):
+            pass
+        # max datapoints reach up to 201 since version 0.2.0
+        elif self.version >= Version("0.2.0"):
+            self.valid_datapoints = (101, 11, 51, 201)
+            self.sweep_points_max = 201
+        # max datapoints reach up to 101 before version 0.2.0
+        else:
+            self.valid_datapoints = (101, 11, 51)
+            self.sweep_points_max = 101
 
     def getScreenshot(self) -> QPixmap:
         logger.debug("Capturing screenshot...")
@@ -53,3 +69,25 @@ def getScreenshot(self) -> QPixmap:
         except serial.SerialException as exc:
             logger.exception("Exception while capturing screenshot: %s", exc)
         return QPixmap()
+
+    def read_firmware_version(self) -> "Version":
+        """For example, command version in NanoVNA_F_V2 and NanoVNA_F_V3 returns as this
+        0.5.8
+        """
+        result = list(self.exec_command("version"))
+        logger.debug("firmware version result:\n%s", result[0])
+        return Version(result[0])
+
+    def read_features(self):
+        super().read_features()
+        result = " ".join(self.exec_command("help")).split()
+        if "sn:" or "SN:" in result:
+            self.features.add("SN")
+            self.SN = self.getSerialNumber()
+
+    def getSerialNumber(self) -> str:
+        return (
+            " ".join(list(self.exec_command("SN")))
+            if "SN:" in " ".join(self.exec_command("help")).split()
+            else " ".join(list(self.exec_command("sn")))
+        )

src/NanoVNASaver/Hardware/TinySA.py

@@ -133,7 +133,6 @@ class TinySA_Ultra(TinySA):  # noqa: N801
     screenwidth = 480
     screenheight = 320
     valid_datapoints = (450, 51, 101, 145, 290)
-    hardware_revision = None
 
     def __init__(self, iface: Interface):
         super().__init__(iface)

src/NanoVNASaver/Hardware/VNA.py

@@ -56,6 +56,7 @@ class VNA:
     valid_datapoints = (101, 51, 11)
     wait = 0.05
     SN = "NOT SUPPORTED"
+    hardware_revision = "NOT SUPPORTED"
     sweep_points_max = 101
     sweep_points_min = 11
 

src/NanoVNASaver/Windows/DeviceSettings.py

@@ -44,6 +44,7 @@ def __init__(self, app: QtWidgets.QWidget) -> None:  # noqa: PLR0915
         self.label = {
             "status": QtWidgets.QLabel("Not connected."),
             "firmware": QtWidgets.QLabel("Not connected."),
+            "hardware": QtWidgets.QLabel("Not connected."),
             "calibration": QtWidgets.QLabel("Not connected."),
             "SN": QtWidgets.QLabel("Not connected."),
         }
@@ -60,6 +61,7 @@ def __init__(self, app: QtWidgets.QWidget) -> None:  # noqa: PLR0915
 
         status_layout.addRow("Status:", self.label["status"])
         status_layout.addRow("Firmware:", self.label["firmware"])
+        status_layout.addRow("Hardware:", self.label["hardware"])
         status_layout.addRow("Calibration:", self.label["calibration"])
         status_layout.addRow("SN:", self.label["SN"])
 
@@ -134,6 +136,7 @@ def updateFields(self):
         if not self.app.vna.connected():
             self.label["status"].setText("Not connected.")
             self.label["firmware"].setText("Not connected.")
+            self.label["hardware"].setText("Not connected.")
             self.label["calibration"].setText("Not connected.")
             self.label["SN"].setText("Not connected.")
             self.featureList.clear()
@@ -144,6 +147,9 @@ def updateFields(self):
         self.label["firmware"].setText(
             f"{self.app.vna.name} v{self.app.vna.version}"
         )
+        self.label["hardware"].setText(
+            f"{self.app.vna.hardware_revision}"
+        )
         if self.app.worker.state == SweepState.RUNNING:
             self.label["calibration"].setText("(Sweep running)")
         else: