Update dmm current modes

docs/release-notes.rst

@@ -2,6 +2,19 @@
 Release Notes
 ==================================
 
+*************
+Version 0.6.5
+*************
+Release Date xx/xx/xx
+
+New Features
+############
+
+Improvements
+############
+- DMM current mode functions now raise an exception when an incompatible port combination is used. The range and port parameters are now required parameters.
+
+
 *************
 Version 0.6.4
 *************

src/fixate/drivers/dmm/fluke_8846a.py

@@ -2,6 +2,7 @@
 from fixate.core.exceptions import InstrumentError, ParameterError
 from fixate.drivers.dmm.helper import DMM
 import time
+from typing import Literal
 
 
 class Fluke8846A(DMM):
@@ -54,6 +55,10 @@ def __init__(self, instrument, *args, **kwargs):
         self._default_nplc = 10  # Default NPLC setting as per Fluke 8846A manual
         self._init_string = ""  # Unchanging
 
+        # High and low current port definition. Each definition encodes the maximum current able to
+        # be measured by the port (in amps)
+        self.current_ports = {"HIGH": 10, "LOW": 400e-3}
+
     @property
     def samples(self):
         return self._samples
@@ -268,10 +273,54 @@ def voltage_dc(self, _range=None, auto_impedance=False):
             command = "; :SENS:VOLT:DC:IMP:AUTO OFF"
         self._set_measurement_mode("voltage_dc", _range, suffix=command)
 
-    def current_ac(self, _range=None):
+    def current_ac(self, _range, port):
+        """
+        Set the measurement mode on the DMM to AC current.
+
+        If the range and port selection are not compatible, i.e. someone has requested to measure
+        1 A on the low range port with a maximum capability of 400 mA, an exception is raised.
+
+        If the range requested can be measured by the low port, but the high port is selected, an
+        exception is raised.
+        """
+
+        # Check the requested range is not more than the port capability:
+        if _range > self.current_ports[port]:
+            raise ValueError(
+                "The selected port and range combination is not available for this instrument. Consider using a different multimeter"
+            )
+
+        # Raise an error if the high port is selected when the low port should be used:
+        if _range < self.current_ports["LOW"] and port == "HIGH":
+            raise ValueError(
+                "High range port selected when the low range port should be used! Consider using a different multimeter."
+            )
+
         self._set_measurement_mode("current_ac", _range)
 
-    def current_dc(self, _range=None):
+    def current_dc(self, _range, port: Literal["HIGH", "LOW"]):
+        """
+        Set the measurement mode on the DMM to DC current.
+
+        If the range and port selection are not compatible, i.e. someone has requested to measure
+        1A on the low range port with a maximum capability of 400 mA, an exception is raised.
+
+        If the range requested can be measured by the low port, but the high port is selected, an
+        exception is raised.
+        """
+
+        # Check the requested range is not more than the port capability:
+        if _range > self.current_ports[port]:
+            raise ValueError(
+                "The selected port and range combination is not available for this instrument. Consider using a different multimeter"
+            )
+
+        # Raise an error if the high port is selected when the low port should be used:
+        if _range < self.current_ports["LOW"] and port == "HIGH":
+            raise ValueError(
+                "High range port selected when the low range port should be used! Consider using a different multimeter."
+            )
+
         self._set_measurement_mode("current_dc", _range)
 
     def resistance(self, _range=None):

src/fixate/drivers/dmm/helper.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Literal
 
 
 class DMM:
@@ -60,10 +61,14 @@ def voltage_dc(self, _range=None, auto_impedance=False):
         """
         raise NotImplementedError
 
-    def current_ac(self, _range):
+    def current_ac(self, _range, port: Literal["HIGH", "LOW"]):
+        """
+        Sets the DMM in AC current measurement mode and puts it in the range given
+        by the argument _range. Signals expected to be measured must be < _range.
+        """
         raise NotImplementedError
 
-    def current_dc(self, _range):
+    def current_dc(self, _range, port: Literal["HIGH", "LOW"]):
         """
         Sets the DMM in DC current measurement mode and puts it in the range given
         by the argument _range. Signals expected to be measured must be < _range.

src/fixate/drivers/dmm/keithley_6500.py

@@ -53,6 +53,10 @@ def __init__(self, instrument, *args, **kwargs):
         self._nplc_default = 1
         self._init_string = ""  # Unchanging
 
+        # High and low current port definition. Each definition encodes the maximum current able to
+        # be measured by the port (in amps)
+        self.current_ports = {"HIGH": 10, "LOW": 3}
+
     # Adapted for different DMM behaviour
     @property
     def display(self):
@@ -303,10 +307,53 @@ def voltage_dc(self, _range=None, auto_impedance=False):
             command = "; :SENS:VOLT:DC:INP MOHM10"
         self._set_measurement_mode("voltage_dc", _range, suffix=command)
 
-    def current_ac(self, _range=None):
+    def current_ac(self, _range, port):
+        """
+        Set the measurement mode on the DMM to AC current.
+
+        If the range and port selection are not compatible, i.e. someone has requested to measure
+        1A on the low range port with a maximum capability of 400 mA, an exception is raised.
+
+        If the range requested can be measured by the low port, but the high port is selected, an
+        exception is raised.
+        """
+        # Check the requested range is not more than the port capability:
+        if _range > self.current_ports[port]:
+            raise ValueError(
+                "The selected port and range combination is not available for this instrument. Consider using a different multimeter"
+            )
+
+        # Raise an error if the high port is selected when the low port should be used:
+        if _range < self.current_ports["LOW"] and port == "HIGH":
+            raise ValueError(
+                "High range port selected when the low range port should be used! Consider using a different multimeter."
+            )
+
         self._set_measurement_mode("current_ac", _range)
 
-    def current_dc(self, _range=None):
+    def current_dc(self, _range, port):
+        """
+        Set the measurement mode on the DMM to DC current.
+
+        If the range and port selection are not compatible, i.e. someone has requested to measure
+        1A on the low range port with a maximum capability of 400 mA, an exception is raised.
+
+        If the range requested can be measured by the low port, but the high port is selected, an
+        exception is raised.
+        """
+
+        # Check the requested range is not more than the port capability:
+        if _range > self.current_ports[port]:
+            raise ValueError(
+                "The selected port and range combination is not available for this instrument."
+            )
+
+        # Raise an error if the high port is selected when the low port should be used:
+        if _range < self.current_ports["LOW"] and port == "HIGH":
+            raise ValueError(
+                "High range port selected when the low range port should be used!"
+            )
+
         self._set_measurement_mode("current_dc", _range)
 
     def resistance(self, _range=None):