working

Opentrons · Aug 25, 2023 · 009605a · 009605a
1 parent de23fb0
commit 009605a
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 104 deletions.
diff --git a/api/src/opentrons/hardware_control/backends/ot3controller.py b/api/src/opentrons/hardware_control/backends/ot3controller.py
@@ -1101,7 +1101,7 @@ async def liquid_probe(
         log_pressure: bool = True,
         auto_zero_sensor: bool = True,
         num_baseline_reads: int = 10,
-        sensor_id: SensorId = SensorId.S0,
+        probe: InstrumentProbeType = InstrumentProbeType.PRIMARY,
     ) -> Dict[NodeId, float]:
         head_node = axis_to_node(Axis.by_mount(mount))
         tool = sensor_node_for_pipette(OT3Mount(mount.value))
@@ -1116,7 +1116,7 @@ async def liquid_probe(
             log_pressure,
             auto_zero_sensor,
             num_baseline_reads,
-            sensor_id,
+            sensor_id_for_instrument(probe),
         )
         for node, point in positions.items():
             self._position.update({node: point[0]})

diff --git a/api/src/opentrons/hardware_control/backends/ot3simulator.py b/api/src/opentrons/hardware_control/backends/ot3simulator.py
@@ -306,7 +306,7 @@ async def liquid_probe(
         log_pressure: bool = True,
         auto_zero_sensor: bool = True,
         num_baseline_reads: int = 10,
-        sensor_id: SensorId = SensorId.S0,
+        probe: InstrumentProbeType = InstrumentProbeType.PRIMARY,
     ) -> Dict[NodeId, float]:
 
         head_node = axis_to_node(Axis.by_mount(mount))

diff --git a/api/src/opentrons/hardware_control/ot3api.py b/api/src/opentrons/hardware_control/ot3api.py
@@ -2201,6 +2201,7 @@ async def liquid_probe(
         self,
         mount: OT3Mount,
         probe_settings: Optional[LiquidProbeSettings] = None,
+        probe: Optional[InstrumentProbeType] = None,
     ) -> float:
         """Search for and return liquid level height.
 
@@ -2256,6 +2257,7 @@ async def liquid_probe(
             probe_settings.log_pressure,
             probe_settings.auto_zero_sensor,
             probe_settings.num_baseline_reads,
+            probe=probe,
         )
         end_pos = await self.gantry_position(mount, refresh=True)
         await self.move_to(mount, probe_start_pos)