Skip to content

Commit 015f744

Browse files
authored
feat(shared-data): aluminum block split adapter definition (#13209)
added aluminum block adapter and overlaps for nest and biorad pcr plates
1 parent 914c567 commit 015f744

File tree

7 files changed

+2059
-3
lines changed

7 files changed

+2059
-3
lines changed

api/src/opentrons/protocol_api/core/engine/load_labware_params.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
# Default versions of Opentrons standard labware definitions in Python Protocol API
88
# v2.14 and above. Labware not explicitly listed here default to 1.
99
#
10-
# This will need to be extended t
10+
# TODO(jbl 2023-08-01) this needs to be done more holistically, both to find the version and make sure that
11+
# it corresponds to the API level is was released with
1112
_APILEVEL_2_14_OT_DEFAULT_VERSIONS: Dict[str, int] = {
1213
# v1 of many labware definitions have wrong `zDimension`s. (Jira RSS-202.)
1314
# For "opentrons_96_aluminumblock_generic_pcr_strip_200ul" and
@@ -22,6 +23,8 @@
2223
"nest_96_wellplate_100ul_pcr_full_skirt": 2,
2324
"nest_96_wellplate_200ul_flat": 2,
2425
"nest_96_wellplate_2ml_deep": 2,
26+
"opentrons_96_wellplate_200ul_pcr_full_skirt": 2,
27+
"biorad_96_wellplate_200ul_pcr": 2,
2528
}
2629

2730

api/tests/opentrons/protocol_api/core/engine/test_load_labware_params.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ def test_resolve_load_labware_params(
8080
"nest_96_wellplate_100ul_pcr_full_skirt",
8181
"nest_96_wellplate_200ul_flat",
8282
"nest_96_wellplate_2ml_deep",
83+
"opentrons_96_wellplate_200ul_pcr_full_skirt",
84+
"biorad_96_wellplate_200ul_pcr",
8385
],
8486
)
8587
@pytest.mark.parametrize("namespace", [OPENTRONS_NAMESPACE, None])

protocol-designer/fixtures/protocol/7/doItAllV7.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2369,7 +2369,8 @@
23692369
"schemaVersion": 2,
23702370
"cornerOffsetFromSlot": { "x": 0, "y": 0, "z": 0 },
23712371
"stackingOffsetWithLabware": {
2372-
"opentrons_96_pcr_adapter": { "x": 0, "y": 0, "z": 10.2 }
2372+
"opentrons_96_pcr_adapter": { "x": 0, "y": 0, "z": 10.2 },
2373+
"opentrons_96_well_aluminum_block": { "x": 0, "y": 0, "z": 12.66 }
23732374
}
23742375
},
23752376
"opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1": {

robot-server/tests/integration/http_api/runs/test_lpc_loads_do_not_cause_conflicts_in_run.tavern.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ stages:
129129
slotName: '1'
130130
loadName: biorad_96_wellplate_200ul_pcr
131131
namespace: opentrons
132-
version: 1
132+
version: 2
133133
- id: !anystr
134134
key: !anystr
135135
commandType: loadModule

0 commit comments

Comments
 (0)