@opentrons/shared-data 0.1.6-alpha.14 → 0.1.6-alpha.16

package/command/types/unsafe.ts

@@ -92,7 +92,7 @@ export interface UnsafeUngripLabwareRunTimeCommand
   result?: any
 }
 export interface UnsafePlaceLabwareParams {
-  labwareId: string
+  labwareURI: string
   location: OnDeckLabwareLocation
 }
 export interface UnsafePlaceLabwareCreateCommand

package/deck/definitions/5/ot3_standard.json

@@ -831,30 +831,6 @@
         "slot": "A3",
         "labware": "opentrons_1_trash_3200ml_fixed",
         "displayName": "Fixed Trash"
-      },
-      {
-        "id": "absorbanceReaderV1LidA3",
-        "slot": "absorbanceReaderV1A3",
-        "labware": "opentrons_flex_lid_absorbance_plate_reader_module",
-        "displayName": "Plate Reader Lid"
-      },
-      {
-        "id": "absorbanceReaderV1LidB3",
-        "slot": "absorbanceReaderV1B3",
-        "labware": "opentrons_flex_lid_absorbance_plate_reader_module",
-        "displayName": "Plate Reader Lid"
-      },
-      {
-        "id": "absorbanceReaderV1LidC3",
-        "slot": "absorbanceReaderV1C3",
-        "labware": "opentrons_flex_lid_absorbance_plate_reader_module",
-        "displayName": "Plate Reader Lid"
-      },
-      {
-        "id": "absorbanceReaderV1LidD3",
-        "slot": "absorbanceReaderV1D3",
-        "labware": "opentrons_flex_lid_absorbance_plate_reader_module",
-        "displayName": "Plate Reader Lid"
       }
     ]
   },

package/labware/definitions/2/opentrons_flex_deck_riser/1.json

@@ -13,7 +13,7 @@
   "dimensions": {
     "xDimension": 140,
     "yDimension": 98,
-    "zDimension": 21
+    "zDimension": 55
   },
   "wells": {},
   "groups": [

package/labware/definitions/2/opentrons_tough_pcr_auto_sealing_lid/1.json

@@ -66,10 +66,15 @@
       "y": 0,
       "z": 8.193
     },
+    "biorad_96_wellplate_200ul_pcr": {
+      "x": 0,
+      "y": 0,
+      "z": 8.08
+    },
     "opentrons_flex_deck_riser": {
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": 34
     }
   },
   "gripForce": 15,
@@ -98,6 +103,18 @@
         "y": 0,
         "z": -1
       }
+    },
+    "lidDisposalOffsets": {
+      "pickUpOffset": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "dropOffset": {
+        "x": 0,
+        "y": 5.0,
+        "z": 50.0
+      }
     }
   }
 }

package/labware/schemas/2.json

@@ -65,6 +65,20 @@
           "type": "number"
         }
       }
+    },
+    "pickUpAndDropOffsets": {
+      "type": "object",
+      "required": ["pickUpOffset", "dropOffset"],
+      "properties": {
+        "pickUpOffset": {
+          "$ref": "#/definitions/coordinates",
+          "description": "Offset added to calculate pick-up coordinates."
+        },
+        "dropOffset": {
+          "$ref": "#/definitions/coordinates",
+          "description": "Offset added to calculate drop coordinates."
+        }
+      }
     }
   },
   "type": "object",
@@ -343,21 +357,23 @@
     },
     "gripperOffsets": {
       "type": "object",
-      "description": "Offsets to be added when calculating the coordinates a gripper should go to when picking up or dropping a labware on this labware.",
+      "description": "Offsets to add when picking up or dropping another labware stacked atop this one. Do not use this to adjust the position of the gripper paddles relative to this labware or the child labware; use `gripHeightFromLabwareBottom` on this definition or the child's definition for that.",
+      "additionalProperties": {
+        "$ref": "#/definitions/pickUpAndDropOffsets",
+        "description": "Properties here are named for, and matched based on, the deck slot that this labware is atop--or, if this labware is atop a module, the deck slot that that module is atop."
+      },
       "properties": {
         "default": {
-          "type": "object",
-          "properties": {
-            "pickUpOffset": {
-              "$ref": "#/definitions/coordinates",
-              "description": "Offset added to calculate pick-up coordinates of a labware placed on this labware."
-            },
-            "dropOffset": {
-              "$ref": "#/definitions/coordinates",
-              "description": "Offset added to calculate drop coordinates of a labware placed on this labware."
-            }
-          },
-          "required": ["pickUpOffset", "dropOffset"]
+          "$ref": "#/definitions/pickUpAndDropOffsets",
+          "description": "The offsets to use if there's no slot-specific match in `additionalProperties`."
+        },
+        "lidOffsets": {
+          "$ref": "#/definitions/pickUpAndDropOffsets",
+          "description": "Additional offsets for gripping this labware, if this labware is a lid. Beware this property's placement: instead of affecting the labware stacked atop this labware, like the rest of the `gripperOffsets` properties, it affects this labware."
+        },
+        "lidDisposalOffsets": {
+          "$ref": "#/definitions/pickUpAndDropOffsets",
+          "description": "Additional offsets for gripping this labware, if this labware is a lid and it's being moved to a trash bin. Beware this property's placement: instead of affecting the labware stacked atop this labware, like the rest of the `gripperOffsets` properties, it affects this labware."
         }
       }
     },

package/labware/schemas/3.json

@@ -65,6 +65,20 @@
         }
       }
     },
+    "pickUpAndDropOffsets": {
+      "type": "object",
+      "required": ["pickUpOffset", "dropOffset"],
+      "properties": {
+        "pickUpOffset": {
+          "$ref": "#/definitions/coordinates",
+          "description": "Offset added to calculate pick-up coordinates."
+        },
+        "dropOffset": {
+          "$ref": "#/definitions/coordinates",
+          "description": "Offset added to calculate drop coordinates."
+        }
+      }
+    },
     "SphericalSegment": {
       "type": "object",
       "description": "A partial sphere shaped section at the bottom of the well.",
@@ -568,21 +582,23 @@
     },
     "gripperOffsets": {
       "type": "object",
-      "description": "Offsets to be added when calculating the coordinates a gripper should go to when picking up or dropping a labware on this labware.",
+      "description": "Offsets to add when picking up or dropping another labware stacked atop this one. Do not use this to adjust the position of the gripper paddles relative to this labware or the child labware; use `gripHeightFromLabwareBottom` on this definition or the child's definition for that.",
+      "additionalProperties": {
+        "$ref": "#/definitions/pickUpAndDropOffsets",
+        "description": "Properties here are named for, and matched based on, the deck slot that this labware is atop--or, if this labware is atop a module, the deck slot that that module is atop."
+      },
       "properties": {
         "default": {
-          "type": "object",
-          "properties": {
-            "pickUpOffset": {
-              "$ref": "#/definitions/coordinates",
-              "description": "Offset added to calculate pick-up coordinates of a labware placed on this labware."
-            },
-            "dropOffset": {
-              "$ref": "#/definitions/coordinates",
-              "description": "Offset added to calculate drop coordinates of a labware placed on this labware."
-            }
-          },
-          "required": ["pickUpOffset", "dropOffset"]
+          "$ref": "#/definitions/pickUpAndDropOffsets",
+          "description": "The offsets to use if there's no slot-specific match in `additionalProperties`."
+        },
+        "lidOffsets": {
+          "$ref": "#/definitions/pickUpAndDropOffsets",
+          "description": "Additional offsets for gripping this labware, if this labware is a lid. Beware this property's placement: instead of affecting the labware stacked atop this labware, like the rest of the `gripperOffsets` properties, it affects this labware."
+        },
+        "lidDisposalOffsets": {
+          "$ref": "#/definitions/pickUpAndDropOffsets",
+          "description": "Additional offsets for gripping this labware, if this labware is a lid and it's being moved to a trash bin. Beware this property's placement: instead of affecting the labware stacked atop this labware, like the rest of the `gripperOffsets` properties, it affects this labware."
         }
       }
     },

package/lib/command/index.d.ts

@@ -4279,7 +4279,7 @@ export declare const commandSchemaLatest: {
             description: string;
             type: string;
             properties: {
-                labwareId: {
+                labwareURI: {
                     title: string;
                     description: string;
                     type: string;

package/lib/command/schemas/10.json

@@ -4692,7 +4692,7 @@
             "type": "object",
             "properties": {
                 "axes": {
-                    "description": "The axes for which to update the position estimators.",
+                    "description": "The axes for which to update the position estimators. Any axes that are not physically present will be ignored.",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/MotorAxis"
@@ -4817,9 +4817,9 @@
             "description": "Payload required for an UnsafePlaceLabware command.",
             "type": "object",
             "properties": {
-                "labwareId": {
-                    "title": "Labwareid",
-                    "description": "The id of the labware to place.",
+                "labwareURI": {
+                    "title": "Labwareuri",
+                    "description": "Labware URI for labware.",
                     "type": "string"
                 },
                 "location": {
@@ -4841,7 +4841,7 @@
                     ]
                 }
             },
-            "required": ["labwareId", "location"]
+            "required": ["labwareURI", "location"]
         },
         "UnsafePlaceLabwareCreate": {
             "title": "UnsafePlaceLabwareCreate",