ankitkumar5358
diff --git a/‎99-pslab.rules
Lines changed: 8 additions & 3 deletions b/‎99-pslab.rules
Lines changed: 8 additions & 3 deletions
diff --git a/‎PSL/multimeter.py
Lines changed: 10 additions & 5 deletions b/‎PSL/multimeter.py
Lines changed: 10 additions & 5 deletions
diff --git a/‎PSL/packet_handler.py
Lines changed: 10 additions & 4 deletions b/‎PSL/packet_handler.py
Lines changed: 10 additions & 4 deletions
@@ -1,4 +1,9 @@
-#Rules for TestBench 
+ACTION!="add", SUBSYSTEM!="tty", GOTO="pslab_rules_end"
 
-SUBSYSTEM=="tty",ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="00df", MODE="666",SYMLINK+="TestBench"
-ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="00df", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTR{idVendor}=="04d8", ATTRS{idProduct}=="00df", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTR{idVendor}=="04d8", ATTRS{idProduct}=="00df", MODE="666"
+
+ATTR{idVendor}=="10c4", ATTRS{idProduct}=="ea60", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTR{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="666"
+
+LABEL="pslab_rules_end"
@@ -27,7 +27,7 @@ class Multimeter(Oscilloscope):
     CURRENTS_RANGES = [1, 2, 3, 0]  # Smallest first,
     RC_RESISTANCE = 1e4
     CAPACITOR_CHARGED_VOLTAGE = 0.9 * max(INPUT_RANGES["CAP"])
-    CAPACITOR_DISCHARGED_VOLTAGE = 0.01 * max(INPUT_RANGES["CAP"])
+    CAPACITOR_DISCHARGED_VOLTAGE = 0.05 * max(INPUT_RANGES["CAP"])
 
     def __init__(self, device: Handler = None):
         self._stray_capacitance = 5e-11
@@ -110,8 +110,9 @@ def calibrate_capacitance(self):
         to the CAP pin.
         """
         for charge_time in np.unique(np.int16(np.logspace(2, 3))):
+            self._discharge_capacitor()
             voltage, capacitance = self._measure_capacitance(1, 0, charge_time)
-            if voltage >= 3:
+            if voltage >= self.CAPACITOR_CHARGED_VOLTAGE:
                 break
         self._stray_capacitance += capacitance
 
@@ -126,8 +127,10 @@ def measure_capacitance(self) -> float:
         previous_capacitance = 0
 
         for current_range in self.CURRENTS_RANGES:
-            for i in (100, 200, 400, 800):
-                voltage, capacitance = self._measure_capacitance(current_range, 0, i)
+            for charge_time in (100, 200, 400, 800):
+                voltage, capacitance = self._measure_capacitance(
+                    current_range, 0, charge_time
+                )
 
                 if voltage >= self.CAPACITOR_CHARGED_VOLTAGE:
                     return previous_capacitance
@@ -216,10 +219,12 @@ def _measure_rc_capacitance(self) -> float:
         y = y[cap_low:]
 
         # Discard data after the voltage reaches zero (improves fit).
-        if 0 in y:
+        try:
             v_zero = np.where(y == 0)[0][0]
             x = x[:v_zero]
             y = y[:v_zero]
+        except IndexError:
+            pass
 
         # Remove time offset.
         x -= x[0]
 
@@ -22,9 +22,6 @@
 
 logger = logging.getLogger(__name__)
 
-USB_VID = 0x04D8
-USB_PID = 0x00DF
-
 
 class Handler:
     """Provides methods for communicating with the PSLab hardware.
@@ -37,6 +34,10 @@ class Handler:
     See :meth:`connect. <PSL.packet_handler.Handler.connect>`.
     """
 
+    #            V5       V6
+    _USB_VID = [0x04D8, 0x10C4]
+    _USB_PID = [0x00DF, 0xEA60]
+
     def __init__(
         self,
         port: str = None,
@@ -140,7 +141,12 @@ def connect(
             # User specified a port.
             version = self.get_version()
         else:
-            port_info_generator = list_ports.grep(f"{USB_VID:04x}:{USB_PID:04x}")
+            regex = []
+            for vid, pid in zip(self._USB_VID, self._USB_PID):
+                regex.append(f"{vid:04x}:{pid:04x}")
+
+            regex = "(" + "|".join(regex) + ")"
+            port_info_generator = list_ports.grep(regex)
 
             for port_info in port_info_generator:
                 self.interface.port = port_info.device