Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(api): check for nozzle map configuration when executing complex commands #15723

Merged
merged 3 commits into from
Jul 19, 2024
Merged

fix(api): check for nozzle map configuration when executing complex commands #15723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb10890
include check for nozzle map configuration
CaseyBatten Jul 19, 2024
308f1b4
nozzle map api version gating for transfers
CaseyBatten Jul 19, 2024
5e1ac33
close shave test update to reflect new transfer behavior
CaseyBatten Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion api/src/opentrons/protocols/advanced_control/transfers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@
from opentrons.protocol_api.labware import Labware, Well
from opentrons import types
from opentrons.protocols.api_support.types import APIVersion
from opentrons.hardware_control.nozzle_manager import NozzleConfigurationType


if TYPE_CHECKING:
from opentrons.protocol_api import InstrumentContext
from opentrons.protocols.execution.dev_types import Dictable

_PARTIAL_TIP_SUPPORT_ADDED = APIVersion(2, 18)
"""The version after which partial tip support and nozzle maps were made available."""


class MixStrategy(enum.Enum):
BOTH = enum.auto()
Expand Down Expand Up @@ -409,7 +413,15 @@ def __init__(
# then avoid iterating through its Wells.
# ii. if using single channel pipettes, flatten a multi-dimensional
# list of Wells into a 1 dimensional list of Wells
if self._instr.channels > 1:
pipette_configuration_type = NozzleConfigurationType.FULL
if self._api_version >= _PARTIAL_TIP_SUPPORT_ADDED:
pipette_configuration_type = (
self._instr._core.get_nozzle_map().configuration
)
if (
self._instr.channels > 1
and pipette_configuration_type == NozzleConfigurationType.FULL
):
sources, dests = self._multichannel_transfer(sources, dests)
else:
if isinstance(sources, List) and isinstance(sources[0], List):
Expand Down
2 changes: 1 addition & 1 deletion api/tests/opentrons/protocol_api_integration/test_pipette_movement_deck_conflicts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def test_close_shave_deck_conflicts_for_96_ch_a12_column_configuration() -> None
adapter="opentrons_flex_96_tiprack_adapter",
)
tiprack_8 = protocol_context.load_labware("opentrons_flex_96_tiprack_200ul", "B2")
hs = protocol_context.load_module("heaterShakerModuleV1", "D1")
hs = protocol_context.load_module("heaterShakerModuleV1", "C1")
hs_adapter = hs.load_adapter("opentrons_96_deep_well_adapter")
deepwell = hs_adapter.load_labware("nest_96_wellplate_2ml_deep")
protocol_context.load_trash_bin("A3")
Expand Down
Loading