Update OT-2 fixed trashes.

I don't understand how to interpret the dimensions in the old fixed trash labware, and I'm scared of messing with the drop-tip point, so I guess let's make these 0-sized points in the same place as the old dropTipsOffsets. This means the fixedTrash and shortFixedTrash addressable areas will no longer have the same origin as the v3 defs' slot 12. That's fine and actually makes sense. Those addressable areas are supposed to be equivalent to a v3 well position, not a v3 deck slot position.
Opentrons · Dec 6, 2023 · 79e1bc5 · 79e1bc5
1 parent aab4acf
commit 79e1bc5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/shared-data/deck/definitions/4/ot2_short_trash.json b/shared-data/deck/definitions/4/ot2_short_trash.json
@@ -215,15 +215,14 @@
       {
         "id": "shortFixedTrash",
         "areaType": "fixedTrash",
-        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "offsetFromCutoutFixture": [82.84, 80.0, 58],
         "boundingBox": {
-          "xDimension": 172.86,
-          "yDimension": 165.86,
-          "zDimension": 58
+          "xDimension": 0,
+          "yDimension": 0,
+          "zDimension": 0
         },
         "displayName": "Slot 12/Short Fixed Trash",
-        "ableToDropTips": true,
-        "dropTipsOffset": [82.84, 80.0, 58]
+        "ableToDropTips": true
       }
     ],
     "cutouts": [

diff --git a/shared-data/deck/definitions/4/ot2_standard.json b/shared-data/deck/definitions/4/ot2_standard.json
@@ -215,15 +215,14 @@
       {
         "id": "fixedTrash",
         "areaType": "fixedTrash",
-        "offsetFromCutoutFixture": [0.0, 0.0, 0.0],
+        "offsetFromCutoutFixture": [82.84, 80, 82],
         "boundingBox": {
-          "xDimension": 172.86,
-          "yDimension": 165.86,
-          "zDimension": 82
+          "xDimension": 0,
+          "yDimension": 0,
+          "zDimension": 0
         },
         "displayName": "Slot 12/Fixed Trash",
-        "ableToDropTips": true,
-        "dropTipsOffset": [82.84, 80.0, 82.0]
+        "ableToDropTips": true
       }
     ],
     "cutouts": [

diff --git a/shared-data/python/tests/deck/test_position.py b/shared-data/python/tests/deck/test_position.py
@@ -76,9 +76,7 @@ def get_v4_slot_positions(
     stacks_with_slots = (
         (cutout, cutout_fixture, addressable_area)
         for (cutout, cutout_fixture, addressable_area) in get_v4_stacks(definition)
-        # v3 has a "slot" for the fixed trash, but in v4, fixedTrash is its own area type. Count
-        # it as a "slot," since we still want to compare the positions across schema versions.
-        if addressable_area["areaType"] in {"slot", "fixedTrash"}
+        if addressable_area["areaType"] == "slot"
     )
 
     slot_positions = (
@@ -100,14 +98,4 @@ def test_v3_and_v4_positional_equivalence(definition_name: str) -> None:
     v3_slot_positions = get_v3_slot_positions(deck_v3)
     v4_slot_positions = get_v4_slot_positions(deck_v4)
 
-    # For the purposes of this comparison, the v4 addressable areas named "fixedTrash" and
-    # "shortFixedTrash" should be compared to slot 12 in v3.
-    v4_slot_positions = set(
-        (
-            "12" if slot_id in {"fixedTrash", "shortFixedTrash"} else slot_id,
-            slot_position,
-        )
-        for slot_id, slot_position in v4_slot_positions
-    )
-
     assert v3_slot_positions == v4_slot_positions