@opentrons/shared-data 0.1.7-alpha.0 → 0.1.7-alpha.1

package/labware/fixtures/2/index.ts

@@ -1,9 +1,10 @@
-import fixture_12_trough from './fixture_12_trough.json'
 import fixture_12_trough_v2 from './fixture_12_trough_v2.json'
+import fixture_12_trough from './fixture_12_trough.json'
 import fixture_24_tuberack from './fixture_24_tuberack.json'
-import fixture_384_plate from './fixture_384_plate.json'
 import fixture_96_plate from './fixture_96_plate.json'
+import fixture_384_plate from './fixture_384_plate.json'
 import fixture_calibration_block from './fixture_calibration_block.json'
+import fixture_corning_96_wellplate_360_flat from './fixture_corning_96_wellplate_360_flat.json'
 import fixture_flex_96_tiprack_1000ul from './fixture_flex_96_tiprack_1000ul.json'
 import fixture_flex_96_tiprack_adapter from './fixture_flex_96_tiprack_adapter.json'
 import fixture_irregular_example_1 from './fixture_irregular_example_1.json'
@@ -11,11 +12,10 @@ import fixture_overlappy_wellplate from './fixture_overlappy_wellplate.json'
 import fixture_regular_example_1 from './fixture_regular_example_1.json'
 import fixture_regular_example_2 from './fixture_regular_example_2.json'
 import fixture_tiprack_10_ul from './fixture_tiprack_10_ul.json'
-import fixture_tiprack_1000_ul from './fixture_tiprack_1000_ul.json'
 import fixture_tiprack_300_ul from './fixture_tiprack_300_ul.json'
+import fixture_tiprack_1000_ul from './fixture_tiprack_1000_ul.json'
 import fixture_trash from './fixture_trash.json'
 import fixture_universal_flat_bottom_adapter from './fixture_universal_flat_bottom_adapter.json'
-import fixture_corning_96_wellplate_360_flat from './fixture_corning_96_wellplate_360_flat.json'
 
 export {
   fixture_12_trough_v2,

package/labware/fixtures/3/fixture_2_plate.json

@@ -8,10 +8,29 @@
     "displayVolumeUnits": "mL",
     "displayCategory": "reservoir"
   },
-  "dimensions": {
-    "xDimension": 127.76,
-    "yDimension": 85.8,
-    "zDimension": 44.45
+  "extents": {
+    "total": {
+      "backLeftBottom": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "frontRightTop": {
+        "x": 127.76,
+        "y": -85.8,
+        "z": 44.45
+      }
+    },
+    "footprint": {
+      "backLeft": {
+        "x": 0,
+        "y": 0
+      },
+      "frontRight": {
+        "x": 127.76,
+        "y": -85.8
+      }
+    }
   },
   "parameters": {
     "format": "trough",
@@ -27,7 +46,7 @@
       "diameter": 35.0,
       "totalLiquidVolume": 22000,
       "x": 13.94,
-      "y": 42.9,
+      "y": -42.9,
       "z": 2.29,
       "geometryDefinitionId": "iuweofiuwhfn"
     },
@@ -38,7 +57,7 @@
       "yDimension": 71.88,
       "totalLiquidVolume": 22000,
       "x": 23.03,
-      "y": 42.9,
+      "y": -42.9,
       "z": 2.29,
       "geometryDefinitionId": "daiwudhadfhiew"
     }
@@ -55,11 +74,6 @@
       }
     }
   ],
-  "cornerOffsetFromSlot": {
-    "x": 0,
-    "y": 0,
-    "z": 0
-  },
   "innerLabwareGeometry": {
     "daiwudhadfhiew": {
       "sections": [

package/labware/fixtures/3/fixture_corning_24_plate.json

@@ -23,10 +23,29 @@
     "displayCategory": "wellPlate",
     "tags": []
   },
-  "dimensions": {
-    "xDimension": 127.76,
-    "yDimension": 85.47,
-    "zDimension": 20.27
+  "extents": {
+    "total": {
+      "backLeftBottom": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "frontRightTop": {
+        "x": 127.76,
+        "y": -85.47,
+        "z": 20.27
+      }
+    },
+    "footprint": {
+      "backLeft": {
+        "x": 0,
+        "y": 0
+      },
+      "frontRight": {
+        "x": 127.76,
+        "y": -85.47
+      }
+    }
   },
   "wells": {
     "D1": {
@@ -35,7 +54,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 17.48,
-      "y": 13.77,
+      "y": -71.7,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -45,7 +64,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 17.48,
-      "y": 33.07,
+      "y": -52.4,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -55,7 +74,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 17.48,
-      "y": 52.37,
+      "y": -33.1,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -65,7 +84,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 17.48,
-      "y": 71.67,
+      "y": -13.8,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -75,7 +94,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 36.78,
-      "y": 13.77,
+      "y": -71.7,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -85,7 +104,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 36.78,
-      "y": 33.07,
+      "y": -52.4,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -95,7 +114,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 36.78,
-      "y": 52.37,
+      "y": -33.1,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -105,7 +124,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 36.78,
-      "y": 71.67,
+      "y": -13.8,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -115,7 +134,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 56.08,
-      "y": 13.77,
+      "y": -71.7,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -125,7 +144,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 56.08,
-      "y": 33.07,
+      "y": -52.4,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -135,7 +154,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 56.08,
-      "y": 52.37,
+      "y": -33.1,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -145,7 +164,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 56.08,
-      "y": 71.67,
+      "y": -13.8,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -155,7 +174,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 75.38,
-      "y": 13.77,
+      "y": -71.7,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -165,7 +184,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 75.38,
-      "y": 33.07,
+      "y": -52.4,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -175,7 +194,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 75.38,
-      "y": 52.37,
+      "y": -33.1,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -185,7 +204,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 75.38,
-      "y": 71.67,
+      "y": -13.8,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -195,7 +214,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 94.68,
-      "y": 13.77,
+      "y": -71.7,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -205,7 +224,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 94.68,
-      "y": 33.07,
+      "y": -52.4,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -215,7 +234,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 94.68,
-      "y": 52.37,
+      "y": -33.1,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -225,7 +244,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 94.68,
-      "y": 71.67,
+      "y": -13.8,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -235,7 +254,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 113.98,
-      "y": 13.77,
+      "y": -71.7,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -245,7 +264,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 113.98,
-      "y": 33.07,
+      "y": -52.4,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -255,7 +274,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 113.98,
-      "y": 52.37,
+      "y": -33.1,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     },
@@ -265,7 +284,7 @@
       "diameter": 16.26,
       "totalLiquidVolume": 3400,
       "x": 113.98,
-      "y": 71.67,
+      "y": -13.8,
       "z": 2.87,
       "geometryDefinitionId": "venirhgerug"
     }
@@ -309,11 +328,6 @@
       }
     }
   ],
-  "cornerOffsetFromSlot": {
-    "x": 0,
-    "y": 0,
-    "z": 0
-  },
   "stackingOffsetWithLabware": {
     "opentrons_aluminum_flat_bottom_plate": {
       "x": 0,

package/labware/schemas/3.json

@@ -51,7 +51,20 @@
       "type": "string",
       "pattern": "^[a-z0-9._]+$"
     },
-    "vector": {
+    "vector2D": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["x", "y"],
+      "properties": {
+        "x": {
+          "type": "number"
+        },
+        "y": {
+          "type": "number"
+        }
+      }
+    },
+    "vector3D": {
       "type": "object",
       "additionalProperties": false,
       "required": ["x", "y", "z"],
@@ -67,16 +80,46 @@
         }
       }
     },
+    "axisAlignedBoundingBox2D": {
+      "type": "object",
+      "required": ["backLeft", "frontRight"],
+      "additionalProperties": false,
+      "properties": {
+        "backLeft": {
+          "description": "(-x, +y) relative to the labware origin.",
+          "$ref": "#/definitions/vector2D"
+        },
+        "frontRight": {
+          "description": "(+x, -y) relative to the labware origin.",
+          "$ref": "#/definitions/vector2D"
+        }
+      }
+    },
+    "axisAlignedBoundingBox3D": {
+      "type": "object",
+      "required": ["backLeftBottom", "frontRightTop"],
+      "additionalProperties": false,
+      "properties": {
+        "backLeftBottom": {
+          "description": "(-x, +y, -z) relative to the labware origin.",
+          "$ref": "#/definitions/vector3D"
+        },
+        "frontRightTop": {
+          "description": "(+x, -y, +z) relative to the labware origin.",
+          "$ref": "#/definitions/vector3D"
+        }
+      }
+    },
     "pickUpAndDropOffsets": {
       "type": "object",
       "required": ["pickUpOffset", "dropOffset"],
       "properties": {
         "pickUpOffset": {
-          "$ref": "#/definitions/vector",
+          "$ref": "#/definitions/vector3D",
           "description": "Offset added to calculate pick-up coordinates."
         },
         "dropOffset": {
-          "$ref": "#/definitions/vector",
+          "$ref": "#/definitions/vector3D",
           "description": "Offset added to calculate drop coordinates."
         }
       }
@@ -164,15 +207,16 @@
           "$ref": "#/definitions/positiveNumber"
         },
         "x": {
-          "description": "x location of center-bottom of well in reference to left-front-bottom of labware",
+          "description": "x location of center-bottom of well in reference to the labware origin",
           "$ref": "#/definitions/positiveNumber"
         },
         "y": {
-          "description": "y location of center-bottom of well in reference to left-front-bottom of labware",
-          "$ref": "#/definitions/positiveNumber"
+          "description": "y location of center-bottom of well in reference to the labware origin",
+          "type": "number",
+          "maximum": 0
         },
         "z": {
-          "description": "z location of center-bottom of well in reference to left-front-bottom of labware",
+          "description": "z location of center-bottom of well in reference to the labware origin",
           "$ref": "#/definitions/positiveNumber"
         },
         "geometryDefinitionId": {
@@ -450,9 +494,8 @@
     "metadata",
     "brand",
     "parameters",
-    "cornerOffsetFromSlot",
     "ordering",
-    "dimensions",
+    "extents",
     "wells",
     "groups"
   ],
@@ -570,24 +613,19 @@
         }
       }
     },
-    "cornerOffsetFromSlot": {
-      "description": "Distance from left-front-bottom corner of slot to left-front-bottom corner of labware bounding box. Used for labware that spans multiple slots. For labware that does not span multiple slots, x/y/z should all be zero.",
-      "$ref": "#/definitions/vector"
-    },
-    "dimensions": {
+    "extents": {
+      "description": "The outer dimensions of the labware.",
       "type": "object",
+      "required": ["total", "footprint"],
       "additionalProperties": false,
-      "description": "Outer dimensions of a labware",
-      "required": ["xDimension", "yDimension", "zDimension"],
       "properties": {
-        "yDimension": {
-          "$ref": "#/definitions/positiveNumber"
+        "total": {
+          "description": "The all-encompassing outer dimensions of the labware.",
+          "$ref": "#/definitions/axisAlignedBoundingBox3D"
         },
-        "zDimension": {
-          "$ref": "#/definitions/positiveNumber"
-        },
-        "xDimension": {
-          "$ref": "#/definitions/positiveNumber"
+        "footprint": {
+          "description": "The outer dimensions of the labware where it meets the deck.",
+          "$ref": "#/definitions/axisAlignedBoundingBox2D"
         }
       }
     },
@@ -663,14 +701,14 @@
       "type": "object",
       "description": "Supported labware that can be stacked upon, with overlap height between both labware.",
       "additionalProperties": {
-        "$ref": "#/definitions/vector"
+        "$ref": "#/definitions/vector3D"
       }
     },
     "stackingOffsetWithModule": {
       "type": "object",
       "description": "Supported module that can be stacked upon, with overlap height between labware and module.",
       "additionalProperties": {
-        "$ref": "#/definitions/vector"
+        "$ref": "#/definitions/vector3D"
       }
     },
     "gripperOffsets": {