@opentrons/shared-data 0.1.6-alpha.15 → 0.1.6-alpha.17

package/lib/js/__tests__/liquidClassSchema.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/js/constants.d.ts

@@ -194,6 +194,7 @@ export declare const SINGLE_LEFT_SLOT_FIXTURE: 'singleLeftSlot';
 export declare const SINGLE_CENTER_SLOT_FIXTURE: 'singleCenterSlot';
 export declare const SINGLE_RIGHT_SLOT_FIXTURE: 'singleRightSlot';
 export declare const STAGING_AREA_RIGHT_SLOT_FIXTURE: 'stagingAreaRightSlot';
+export declare const TRASH_BIN_FIXTURE: 'trashBin';
 export declare const TRASH_BIN_ADAPTER_FIXTURE: 'trashBinAdapter';
 export declare const WASTE_CHUTE_RIGHT_ADAPTER_COVERED_FIXTURE: 'wasteChuteRightAdapterCovered';
 export declare const WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE: 'wasteChuteRightAdapterNoCover';
@@ -216,7 +217,6 @@ export declare const WASTE_CHUTE_FIXTURES: CutoutFixtureId[];
 export declare const WASTE_CHUTE_ONLY_FIXTURES: CutoutFixtureId[];
 export declare const WASTE_CHUTE_STAGING_AREA_FIXTURES: CutoutFixtureId[];
 export declare const LOW_VOLUME_PIPETTES: string[];
-export declare const NON_USER_ADDRESSABLE_LABWARE: string[];
 export declare const DEFAULT_LIQUID_COLORS: string[];
 export declare const DEPRECATED_WHALE_GREY = "#9395a0";
 export declare const INTERACTIVE_WELL_DATA_ATTRIBUTE = "data-wellname";

package/lib/js/helpers/index.d.ts

@@ -1,4 +1,5 @@
 import type { DeckDefinition, LabwareDefinition2, ModuleModel, RobotType, ThermalAdapterName } from '../types';
+import type { CutoutId } from '../../deck/types/schemaV5';
 export { getWellNamePerMultiTip } from './getWellNamePerMultiTip';
 export { getWellTotalVolume } from './getWellTotalVolume';
 export { wellIsRect } from './wellIsRect';
@@ -29,6 +30,7 @@ export * from './sortRunTimeParameters';
 export declare const getLabwareDefIsStandard: (def: LabwareDefinition2) => boolean;
 export declare const getLabwareDefURI: (def: LabwareDefinition2) => string;
 export declare const constructLabwareDefURI: (namespace: string, loadName: string, version: string) => string;
+export declare const RETIRED_LABWARE: string[];
 export declare const getLabwareDisplayName: (labwareDef: LabwareDefinition2) => string;
 export declare const getTiprackVolume: (labwareDef: LabwareDefinition2) => number;
 export declare function getLabwareHasQuirk(labwareDef: LabwareDefinition2, quirk: string): boolean;
@@ -54,3 +56,4 @@ export declare const getIsLabwareAboveHeight: (labwareDef: LabwareDefinition2, h
 export declare const getAdapterName: (labwareLoadname: string) => ThermalAdapterName;
 export declare const getCalibrationAdapterLoadName: (moduleModel: ModuleModel) => string | null;
 export declare const getDeckDefFromRobotType: (robotType: RobotType) => DeckDefinition;
+export declare const getCutoutIdFromAddressableArea: (addressableAreaName: string, deckDefinition: DeckDefinition) => CutoutId | null;

package/lib/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/lib/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/lib/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/lib/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."
                 }
             }
         },