With current firmware, these JNCRadio_VNA_3G, SV4401A, SV6301A device…

…s allow 1001 datapoints.

Updated datapoints dropdown to show their respective minimums, the 'typical' 101, device default 501 and maximum 1001 points. Users may choose any other values between min and max not seen in the dropdown list using the custom datapoints option.

These devices now use the factory default 501 datapoints as their initial datapoints value.

src/NanoVNASaver/Hardware/JNCRadio_VNA_3G.py

@@ -31,15 +31,17 @@ class JNCRadio_VNA_3G(NanoVNA):
     name = "JNCRadio_VNA_3G"
     screenwidth = 800
     screenheight = 480
-    valid_datapoints = (101, 201, 301, 401, 501)
-    sweep_points_max = 501
+    valid_datapoints = (501, 11, 101, 1001)
+    sweep_points_max = 11
+    sweep_points_max = 1001
 
     def __init__(self, iface: Interface):
         super().__init__(iface)
         self.sweep_max_freq_Hz = 3e9
 
     def getScreenshot(self) -> QPixmap:
         logger.debug("Capturing screenshot...")
+        self.serial.timeout=8
         if not self.connected():
             return QPixmap()
         try:

src/NanoVNASaver/Hardware/SV4401A.py

@@ -31,9 +31,9 @@ class SV4401A(NanoVNA):
     name = "SV4401A"
     screenwidth = 1024
     screenheight = 600
-    valid_datapoints = (101, 301, 501)
-    sweep_points_max = 101
-    sweep_points_max = 501
+    valid_datapoints = (501, 101, 1001)
+    sweep_points_min = 101
+    sweep_points_max = 1001
 
     def __init__(self, iface: Interface):
         super().__init__(iface)

src/NanoVNASaver/Hardware/SV6301A.py

@@ -31,9 +31,9 @@ class SV6301A(NanoVNA):
     name = "SV6301A"
     screenwidth = 1024
     screenheight = 600
-    valid_datapoints = (101, 301, 501)
-    sweep_points_max = 101
-    sweep_points_max = 501
+    valid_datapoints = (501, 101, 1001)
+    sweep_points_min = 101
+    sweep_points_max = 1001
 
     def __init__(self, iface: Interface):
         super().__init__(iface)

src/NanoVNASaver/Windows/DeviceSettings.py

@@ -152,6 +152,7 @@ def updateFields(self):
 
         if "Customizable data points" in features:
             self.datapoints.clear()
+            self.custom_points_Eidt.setValidator(QIntValidator(self.app.vna.sweep_points_min,self.app.vna.sweep_points_max))
             cur_dps = self.app.vna.datapoints
             for d in sorted(self.app.vna.valid_datapoints):
                 self.datapoints.addItem(str(d))