feat(shared-data): aluminum block split adapter definition (#13209)

added aluminum block adapter and overlaps for nest and biorad pcr plates
Opentrons · Aug 1, 2023 · 015f744 · 015f744
1 parent 914c567
commit 015f744
Show file tree

Hide file tree

Showing 7 changed files with 2,059 additions and 3 deletions.
diff --git a/api/src/opentrons/protocol_api/core/engine/load_labware_params.py b/api/src/opentrons/protocol_api/core/engine/load_labware_params.py
@@ -7,7 +7,8 @@
 # Default versions of Opentrons standard labware definitions in Python Protocol API
 # v2.14 and above. Labware not explicitly listed here default to 1.
 #
-# This will need to be extended t
+# TODO(jbl 2023-08-01) this needs to be done more holistically, both to find the version and make sure that
+#   it corresponds to the API level is was released with
 _APILEVEL_2_14_OT_DEFAULT_VERSIONS: Dict[str, int] = {
     # v1 of many labware definitions have wrong `zDimension`s. (Jira RSS-202.)
     # For "opentrons_96_aluminumblock_generic_pcr_strip_200ul" and
@@ -22,6 +23,8 @@
     "nest_96_wellplate_100ul_pcr_full_skirt": 2,
     "nest_96_wellplate_200ul_flat": 2,
     "nest_96_wellplate_2ml_deep": 2,
+    "opentrons_96_wellplate_200ul_pcr_full_skirt": 2,
+    "biorad_96_wellplate_200ul_pcr": 2,
 }
 
 

diff --git a/api/tests/opentrons/protocol_api/core/engine/test_load_labware_params.py b/api/tests/opentrons/protocol_api/core/engine/test_load_labware_params.py
@@ -80,6 +80,8 @@ def test_resolve_load_labware_params(
         "nest_96_wellplate_100ul_pcr_full_skirt",
         "nest_96_wellplate_200ul_flat",
         "nest_96_wellplate_2ml_deep",
+        "opentrons_96_wellplate_200ul_pcr_full_skirt",
+        "biorad_96_wellplate_200ul_pcr",
     ],
 )
 @pytest.mark.parametrize("namespace", [OPENTRONS_NAMESPACE, None])

diff --git a/protocol-designer/fixtures/protocol/7/doItAllV7.json b/protocol-designer/fixtures/protocol/7/doItAllV7.json
@@ -2369,7 +2369,8 @@
       "schemaVersion": 2,
       "cornerOffsetFromSlot": { "x": 0, "y": 0, "z": 0 },
       "stackingOffsetWithLabware": {
-        "opentrons_96_pcr_adapter": { "x": 0, "y": 0, "z": 10.2 }
+        "opentrons_96_pcr_adapter": { "x": 0, "y": 0, "z": 10.2 },
+        "opentrons_96_well_aluminum_block": { "x": 0, "y": 0, "z": 12.66 }
       }
     },
     "opentrons/opentrons_24_aluminumblock_nest_1.5ml_snapcap/1": {

diff --git a/.../tests/integration/http_api/runs/test_lpc_loads_do_not_cause_conflicts_in_run.tavern.yaml b/.../tests/integration/http_api/runs/test_lpc_loads_do_not_cause_conflicts_in_run.tavern.yaml
@@ -129,7 +129,7 @@ stages:
                 slotName: '1'
               loadName: biorad_96_wellplate_200ul_pcr
               namespace: opentrons
-              version: 1
+              version: 2
           - id: !anystr
             key: !anystr
             commandType: loadModule