From 28e9328a13e87f161451bcb20f76868cd1d6cec2 Mon Sep 17 00:00:00 2001 From: Laura Cox Date: Wed, 20 Nov 2024 14:29:35 +0100 Subject: [PATCH] fix linter errors and another rebase error --- .../hardware_control/move_group_runner.py | 10 ---------- .../python/opentrons_shared_data/pipette/ul_per_mm.py | 9 +++++++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/hardware/opentrons_hardware/hardware_control/move_group_runner.py b/hardware/opentrons_hardware/hardware_control/move_group_runner.py index 7d621bd312b..1b7baf61d6d 100644 --- a/hardware/opentrons_hardware/hardware_control/move_group_runner.py +++ b/hardware/opentrons_hardware/hardware_control/move_group_runner.py @@ -255,16 +255,6 @@ def all_moving_nodes(self) -> Set[NodeId]: node_set.add(node) return node_set - def all_moving_nodes(self) -> Set[NodeId]: - """Get all of the moving nodes in the move group runner's move groups.""" - node_set: Set[NodeId] = set() - for group in self._move_groups: - for sequence in group: - for node, node_step in sequence.items(): - if node_step.is_moving_step(): - node_set.add(node) - return node_set - async def _send_groups(self, can_messenger: CanMessenger) -> None: """Send commands to set up the message groups.""" for group_i, group in enumerate(self._move_groups): diff --git a/shared-data/python/opentrons_shared_data/pipette/ul_per_mm.py b/shared-data/python/opentrons_shared_data/pipette/ul_per_mm.py index 0b3dacfe60f..774231ac40d 100644 --- a/shared-data/python/opentrons_shared_data/pipette/ul_per_mm.py +++ b/shared-data/python/opentrons_shared_data/pipette/ul_per_mm.py @@ -17,12 +17,17 @@ def calculate_ul_per_mm( requested_pipetting_version: Optional[PipetteFunctionKeyType] = None, shaft_ul_per_mm: Optional[float] = None, ) -> float: + assumed_requested_pipetting_version = ( + requested_pipetting_version + if requested_pipetting_version + else PIPETTING_FUNCTION_LATEST_VERSION + ) if action == "aspirate": fallback = active_tip_settings.aspirate.default[ PIPETTING_FUNCTION_FALLBACK_VERSION ] sequence = active_tip_settings.aspirate.default.get( - requested_pipetting_version, fallback + assumed_requested_pipetting_version, fallback ) elif action == "blowout" and shaft_ul_per_mm: return shaft_ul_per_mm @@ -31,7 +36,7 @@ def calculate_ul_per_mm( PIPETTING_FUNCTION_FALLBACK_VERSION ] sequence = active_tip_settings.dispense.default.get( - requested_pipetting_version, fallback + assumed_requested_pipetting_version, fallback ) return piecewise_volume_conversion(ul, sequence)