add support for new mies pressure FFI

acq4/devices/MIESPatchPipette/pressure_control.py

@@ -18,28 +18,33 @@ def __init__(self, manager, config, name):
     #     self.mies.setManualPressure(pressure / PSI_PASCAL)
 
     def getPressure(self):
-        return self.mies.getManualPressure(self._headstage) * PSI_PASCAL
+        # return self.mies.getManualPressure(self._headstage) * PSI_PASCAL
+        return self.mies.getPressureAndSource(self._headstage)[1] * PSI_PASCAL
 
     def getSource(self):
         # TODO: get source from MIES when this becomes possible
-        return self.source
-
+        return self.mies.getPressureAndSource(self._headstage)[0]
     # def _setSource(self, source):
     #     self.mies.selectHeadstage(self._headstage)
     #     self.mies.setPressureSource(self._headstage, source, (self.getPressure() or 0) / PSI_PASCAL)
 
     def setPressure(self, source=None, pressure=None):
         """Set the output pressure (float; in Pa) and/or pressure source (str).
         """
-        source = source if source is not None else self.getSource()
-        pressure = pressure if pressure is not None else self.getPressure()
+        # source = source if source is not None else self.getSource()
+        # pressure = pressure if pressure is not None else self.getPressure()
 
         if source is not None and source not in self.sources:
             raise ValueError(f'Pressure source "{source}" is not valid; available sources are: {self.sources}')
+        if pressure is not None:
+            pressure = pressure / PSI_PASCAL
 
-        self.mies.setPressureAndSource(self._headstage, source, pressure / PSI_PASCAL).result(timeout=2)
+        # self.mies.setPressureAndSource(self._headstage, source, pressure / PSI_PASCAL).result(timeout=2)
+        # self.source = source
+        # self.pressure = pressure
+        source, pressure = self.mies.setPressureAndSource(self._headstage, source, pressure).result(timeout=2)
         self.source = source
-        self.pressure = pressure
+        self.pressure = pressure * PSI_PASCAL
 
         self.sigPressureChanged.emit(self, self.source, self.pressure)
 

acq4/util/igorpro.py

@@ -262,6 +262,7 @@ def format_call(self, cmd, params, message_id):
                     "params": params}
                 }
         msg = [b"", json.dumps(call, cls=ACQ4JSONEncoder).encode()]
+        print("send to igor:", msg)
         return msg
 
     def parse_reply(self, reply):

acq4/util/mies.py

@@ -106,19 +106,27 @@ def getAutoBiasTarget(self, headstage):
         self.selectHeadstage(headstage)
         return float(self.getCtrlValue('setvar_DataAcq_AutoBiasV')) / 1000
 
-    def getManualPressure(self, headstage) -> float:
-        self.selectHeadstage(headstage)
-        return float(self.getCtrlValue('setvar_DataAcq_SSPressure'))
-
+    # def getManualPressure(self, headstage) -> float:
+    #     self.selectHeadstage(headstage)
+    #     return float(self.getCtrlValue('setvar_DataAcq_SSPressure'))
+
+    def getPressureAndSource(self, headstage):
+        return self.igor('ReadPressureSourceAndPressure', self.getWindowName(), headstage).result()
+
     def setPressureAndSource(self, headstage, source, pressure):
-        if source == 'user':
-            self.selectHeadstage(headstage)
-            return self.setCtrl("check_DataACq_Pressure_User", True)
-        try:
-            source_val = {'atmosphere': 0, 'regulator': 1}[source]
-        except KeyError:
-            raise ValueError(f"Invalid pressure source '{source}'")
-        return self.igor('DoPressureManual', self.getWindowName(), headstage, source_val, pressure)
+        # if source == 'user':
+        #     self.selectHeadstage(headstage)
+        #     return self.setCtrl("check_DataACq_Pressure_User", True)
+        # try:
+        #     source_val = {'atmosphere': 0, 'regulator': 1}[source]
+        # except KeyError:
+        #     raise ValueError(f"Invalid pressure source '{source}'")
+        # return self.igor('DoPressureManual', self.getWindowName(), headstage, source_val, pressure)
+        if source is None:
+            source = ""
+        if pressure is None:
+            pressure = float('nan')
+        return self.igor('FFI_GetWithOptionToSetPressure', self.getWindowName(), headstage, source, pressure)
 
     def setHeadstageActive(self, hs, active):
         return self.setCtrl('Check_DataAcqHS_%02d' % hs, active)