@opentrons/shared-data 0.1.6-alpha.8 → 0.1.7-alpha.0

package/lib/labware/definitions/{3 → 2}/nest_96_wellplate_200ul_flat/3.json

@@ -19,9 +19,9 @@
         "links": ["https://www.nest-biotech.com/cell-culture-plates/59415537.html"]
     },
     "metadata": {
-        "displayName": "NEST 96 Well Plate 200 \u00b5L Flat",
+        "displayName": "NEST 96 Well Plate 200 µL Flat",
         "displayCategory": "wellPlate",
-        "displayVolumeUnits": "\u00b5L",
+        "displayVolumeUnits": "µL",
         "tags": []
     },
     "dimensions": {
@@ -1106,7 +1106,7 @@
     },
     "namespace": "opentrons",
     "version": 3,
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "cornerOffsetFromSlot": {
         "x": 0,
         "y": 0,

package/lib/labware/definitions/2/nest_96_wellplate_2ml_deep/2.json

@@ -1130,6 +1130,11 @@
             "x": 0,
             "y": 0,
             "z": 16.1
+        },
+        "evotips_flex_96_tiprack_adapter": {
+            "x": 0,
+            "y": 0,
+            "z": 102
         }
     },
     "stackingOffsetWithModule": {

package/lib/labware/definitions/{3 → 2}/nest_96_wellplate_2ml_deep/3.json

@@ -21,7 +21,7 @@
     "metadata": {
         "displayName": "NEST 96 Deep Well Plate 2mL",
         "displayCategory": "wellPlate",
-        "displayVolumeUnits": "\u00b5L",
+        "displayVolumeUnits": "µL",
         "tags": []
     },
     "dimensions": {
@@ -1092,14 +1092,8 @@
     "groups": [
         {
             "metadata": {
-                "displayName": "NEST 96 Deep Well Plate 2mL",
-                "displayCategory": "wellPlate",
                 "wellBottomShape": "v"
             },
-            "brand": {
-                "brand": "NEST",
-                "brandId": []
-            },
             "wells": [
                 "A1",
                 "B1",
@@ -1210,7 +1204,7 @@
     },
     "namespace": "opentrons",
     "version": 3,
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "cornerOffsetFromSlot": {
         "x": 0,
         "y": 0,
@@ -1238,15 +1232,6 @@
     "innerLabwareGeometry": {
         "cuboidalWell": {
             "sections": [
-                {
-                    "shape": "cuboidal",
-                    "topXDimension": 7.4,
-                    "topYDimension": 7.4,
-                    "bottomXDimension": 2.63,
-                    "bottomYDimension": 2.63,
-                    "topHeight": 1.67,
-                    "bottomHeight": 0.0
-                },
                 {
                     "shape": "cuboidal",
                     "topXDimension": 8.2,
@@ -1255,6 +1240,15 @@
                     "bottomYDimension": 7.4,
                     "topHeight": 38.05,
                     "bottomHeight": 1.67
+                },
+                {
+                    "shape": "cuboidal",
+                    "topXDimension": 7.4,
+                    "topYDimension": 7.4,
+                    "bottomXDimension": 2.63,
+                    "bottomYDimension": 2.63,
+                    "topHeight": 1.67,
+                    "bottomHeight": 0.0
                 }
             ]
         }

package/lib/labware/definitions/{3 → 2}/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json

@@ -5,7 +5,7 @@
         ["A3", "B3"],
         ["A4", "B4"]
     ],
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "version": 2,
     "namespace": "opentrons",
     "metadata": {
@@ -90,7 +90,7 @@
             "totalLiquidVolume": 50000,
             "diameter": 27.81,
             "shape": "circular",
-            "depth": 113,
+            "depth": 112.85,
             "x": 71.38,
             "y": 60.25,
             "z": 7.3,
@@ -100,7 +100,7 @@
             "totalLiquidVolume": 50000,
             "diameter": 27.81,
             "shape": "circular",
-            "depth": 113,
+            "depth": 112.85,
             "x": 71.38,
             "y": 25.25,
             "z": 7.3,
@@ -110,7 +110,7 @@
             "totalLiquidVolume": 50000,
             "diameter": 27.81,
             "shape": "circular",
-            "depth": 113,
+            "depth": 112.85,
             "x": 106.38,
             "y": 60.25,
             "z": 7.3,
@@ -120,7 +120,7 @@
             "totalLiquidVolume": 50000,
             "diameter": 27.81,
             "shape": "circular",
-            "depth": 113,
+            "depth": 112.85,
             "x": 106.38,
             "y": 25.25,
             "z": 7.3,
@@ -174,18 +174,12 @@
     "innerLabwareGeometry": {
         "15mlconicalWell": {
             "sections": [
-                {
-                    "shape": "spherical",
-                    "radiusOfCurvature": 2.9,
-                    "topHeight": 0.8,
-                    "bottomHeight": 0.0
-                },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 4,
-                    "topDiameter": 13.5,
-                    "topHeight": 20.7,
-                    "bottomHeight": 0.8
+                    "bottomDiameter": 14.5,
+                    "topDiameter": 14.7,
+                    "topHeight": 118.2,
+                    "bottomHeight": 108.6
                 },
                 {
                     "shape": "conical",
@@ -196,10 +190,16 @@
                 },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 14.5,
-                    "topDiameter": 14.7,
-                    "topHeight": 118.2,
-                    "bottomHeight": 108.6
+                    "bottomDiameter": 4,
+                    "topDiameter": 13.5,
+                    "topHeight": 20.7,
+                    "bottomHeight": 0.8
+                },
+                {
+                    "shape": "spherical",
+                    "radiusOfCurvature": 2.9,
+                    "topHeight": 0.8,
+                    "bottomHeight": 0.0
                 }
             ]
         },
@@ -207,10 +207,10 @@
             "sections": [
                 {
                     "shape": "conical",
-                    "bottomDiameter": 6.15,
-                    "topDiameter": 26.18,
-                    "topHeight": 14.3,
-                    "bottomHeight": 0.0
+                    "bottomDiameter": 27.52,
+                    "topDiameter": 27.81,
+                    "topHeight": 112.85,
+                    "bottomHeight": 100.65
                 },
                 {
                     "shape": "conical",
@@ -221,10 +221,10 @@
                 },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 27.52,
-                    "topDiameter": 27.81,
-                    "topHeight": 112.85,
-                    "bottomHeight": 100.65
+                    "bottomDiameter": 6.15,
+                    "topDiameter": 26.18,
+                    "topHeight": 14.3,
+                    "bottomHeight": 0.0
                 }
             ]
         }

package/lib/labware/definitions/{3 → 2}/opentrons_10_tuberack_nest_4x50ml_6x15ml_conical/2.json

@@ -8,7 +8,7 @@
             "x": 13.88,
             "y": 67.75,
             "z": 6.85,
-            "geometryDefinitionId": "conicalWell"
+            "geometryDefinitionId": "conicalWell15mL"
         },
         "B1": {
             "totalLiquidVolume": 15000,
@@ -18,7 +18,7 @@
             "x": 13.88,
             "y": 42.75,
             "z": 6.85,
-            "geometryDefinitionId": "conicalWell"
+            "geometryDefinitionId": "conicalWell15mL"
         },
         "C1": {
             "totalLiquidVolume": 15000,
@@ -28,7 +28,7 @@
             "x": 13.88,
             "y": 17.75,
             "z": 6.85,
-            "geometryDefinitionId": "conicalWell"
+            "geometryDefinitionId": "conicalWell15mL"
         },
         "A2": {
             "totalLiquidVolume": 15000,
@@ -38,7 +38,7 @@
             "x": 38.88,
             "y": 67.75,
             "z": 6.85,
-            "geometryDefinitionId": "conicalWell"
+            "geometryDefinitionId": "conicalWell15mL"
         },
         "B2": {
             "totalLiquidVolume": 15000,
@@ -48,7 +48,7 @@
             "x": 38.88,
             "y": 42.75,
             "z": 6.85,
-            "geometryDefinitionId": "conicalWell"
+            "geometryDefinitionId": "conicalWell15mL"
         },
         "C2": {
             "totalLiquidVolume": 15000,
@@ -58,47 +58,47 @@
             "x": 38.88,
             "y": 17.75,
             "z": 6.85,
-            "geometryDefinitionId": "conicalWell"
+            "geometryDefinitionId": "conicalWell15mL"
         },
         "A3": {
             "totalLiquidVolume": 50000,
-            "diameter": 27.95,
+            "diameter": 28.18,
             "shape": "circular",
-            "depth": 113.05,
+            "depth": 113.1,
             "x": 71.38,
             "y": 60.25,
             "z": 7.3,
-            "geometryDefinitionId": "b"
+            "geometryDefinitionId": "conicalWell50mL"
         },
         "B3": {
             "totalLiquidVolume": 50000,
-            "diameter": 27.95,
+            "diameter": 28.18,
             "shape": "circular",
-            "depth": 113.05,
+            "depth": 113.1,
             "x": 71.38,
             "y": 25.25,
             "z": 7.3,
-            "geometryDefinitionId": "b"
+            "geometryDefinitionId": "conicalWell50mL"
         },
         "A4": {
             "totalLiquidVolume": 50000,
-            "diameter": 27.95,
+            "diameter": 28.18,
             "shape": "circular",
-            "depth": 113.05,
+            "depth": 113.1,
             "x": 106.38,
             "y": 60.25,
             "z": 7.3,
-            "geometryDefinitionId": "b"
+            "geometryDefinitionId": "conicalWell50mL"
         },
         "B4": {
             "totalLiquidVolume": 50000,
-            "diameter": 27.95,
+            "diameter": 28.18,
             "shape": "circular",
-            "depth": 113.05,
+            "depth": 113.1,
             "x": 106.38,
             "y": 25.25,
             "z": 7.3,
-            "geometryDefinitionId": "b"
+            "geometryDefinitionId": "conicalWell50mL"
         }
     },
     "groups": [
@@ -161,60 +161,73 @@
     ],
     "namespace": "opentrons",
     "version": 2,
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "cornerOffsetFromSlot": {
         "x": 0,
         "y": 0,
         "z": 0
     },
     "innerLabwareGeometry": {
-        "conicalWell": {
+        "conicalWell15mL": {
             "sections": [
                 {
                     "shape": "conical",
-                    "topDiameter": 13.8,
-                    "bottomDiameter": 2.5,
-                    "topHeight": 22.55,
-                    "bottomHeight": 0.0
+                    "topDiameter": 15.5,
+                    "bottomDiameter": 14.56,
+                    "topHeight": 117.8,
+                    "bottomHeight": 113.8
                 },
                 {
                     "shape": "conical",
-                    "topDiameter": 14.78,
+                    "topDiameter": 14.56,
                     "bottomDiameter": 13.8,
-                    "topHeight": 109.03,
+                    "topHeight": 113.8,
                     "bottomHeight": 22.55
                 },
                 {
                     "shape": "conical",
-                    "topDiameter": 15.5,
-                    "bottomDiameter": 14.78,
-                    "topHeight": 117.8,
-                    "bottomHeight": 109.03
+                    "topDiameter": 13.8,
+                    "bottomDiameter": 2.38,
+                    "topHeight": 22.55,
+                    "bottomHeight": 0.92
+                },
+                {
+                    "shape": "spherical",
+                    "radiusOfCurvature": 1.235,
+                    "topHeight": 0.92,
+                    "bottomHeight": 0.0
                 }
             ]
         },
-        "b": {
+        "conicalWell50mL": {
             "sections": [
                 {
                     "shape": "conical",
-                    "topDiameter": 26.0,
-                    "bottomDiameter": 6.0,
-                    "topHeight": 14.28,
-                    "bottomHeight": 0.0
+                    "topDiameter": 28.18,
+                    "bottomDiameter": 27.95,
+                    "topHeight": 113.1,
+                    "bottomHeight": 109.1
                 },
                 {
                     "shape": "conical",
-                    "topDiameter": 27.0,
+                    "topDiameter": 27.95,
+                    "bottomDiameter": 27.69,
+                    "topHeight": 109.1,
+                    "bottomHeight": 108.8
+                },
+                {
+                    "shape": "conical",
+                    "topDiameter": 27.69,
                     "bottomDiameter": 26.0,
-                    "topHeight": 109.0,
-                    "bottomHeight": 14.28
+                    "topHeight": 108.8,
+                    "bottomHeight": 14.35
                 },
                 {
                     "shape": "conical",
-                    "topDiameter": 27.45,
-                    "bottomDiameter": 27.0,
-                    "topHeight": 113.3,
-                    "bottomHeight": 109.0
+                    "topDiameter": 26.0,
+                    "bottomDiameter": 4.5,
+                    "topHeight": 14.35,
+                    "bottomHeight": 0.0
                 }
             ]
         }

package/lib/labware/definitions/{3 → 2}/opentrons_15_tuberack_falcon_15ml_conical/2.json

@@ -24,7 +24,7 @@
         "yDimension": 85.48,
         "zDimension": 124.35
     },
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "version": 2,
     "namespace": "opentrons",
     "wells": {
@@ -226,18 +226,12 @@
     "innerLabwareGeometry": {
         "conicalWell": {
             "sections": [
-                {
-                    "shape": "spherical",
-                    "radiusOfCurvature": 2.9,
-                    "topHeight": 0.8,
-                    "bottomHeight": 0.0
-                },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 4,
-                    "topDiameter": 13.5,
-                    "topHeight": 20.7,
-                    "bottomHeight": 0.8
+                    "bottomDiameter": 14.5,
+                    "topDiameter": 14.7,
+                    "topHeight": 118.2,
+                    "bottomHeight": 108.6
                 },
                 {
                     "shape": "conical",
@@ -248,10 +242,16 @@
                 },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 14.5,
-                    "topDiameter": 14.7,
-                    "topHeight": 118.2,
-                    "bottomHeight": 108.6
+                    "bottomDiameter": 4,
+                    "topDiameter": 13.5,
+                    "topHeight": 20.7,
+                    "bottomHeight": 0.8
+                },
+                {
+                    "shape": "spherical",
+                    "radiusOfCurvature": 2.9,
+                    "topHeight": 0.8,
+                    "bottomHeight": 0.0
                 }
             ]
         }

package/lib/labware/definitions/{3 → 2}/opentrons_15_tuberack_nest_15ml_conical/2.json

@@ -215,7 +215,7 @@
     },
     "namespace": "opentrons",
     "version": 2,
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "cornerOffsetFromSlot": {
         "x": 0,
         "y": 0,
@@ -226,24 +226,30 @@
             "sections": [
                 {
                     "shape": "conical",
-                    "topDiameter": 13.8,
-                    "bottomDiameter": 2.5,
-                    "topHeight": 22.55,
-                    "bottomHeight": 0.0
+                    "topDiameter": 15.5,
+                    "bottomDiameter": 14.56,
+                    "topHeight": 117.8,
+                    "bottomHeight": 113.8
                 },
                 {
                     "shape": "conical",
-                    "topDiameter": 14.78,
+                    "topDiameter": 14.56,
                     "bottomDiameter": 13.8,
-                    "topHeight": 109.03,
+                    "topHeight": 113.8,
                     "bottomHeight": 22.55
                 },
                 {
                     "shape": "conical",
-                    "topDiameter": 15.5,
-                    "bottomDiameter": 14.78,
-                    "topHeight": 117.8,
-                    "bottomHeight": 109.03
+                    "topDiameter": 13.8,
+                    "bottomDiameter": 2.38,
+                    "topHeight": 22.55,
+                    "bottomHeight": 0.92
+                },
+                {
+                    "shape": "spherical",
+                    "radiusOfCurvature": 1.235,
+                    "topHeight": 0.92,
+                    "bottomHeight": 0.0
                 }
             ]
         }

package/lib/labware/definitions/{3 → 2}/opentrons_24_aluminumblock_generic_2ml_screwcap/3.json

@@ -7,7 +7,7 @@
         ["A5", "B5", "C5", "D5"],
         ["A6", "B6", "C6", "D6"]
     ],
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "version": 3,
     "namespace": "opentrons",
     "metadata": {
@@ -324,7 +324,29 @@
     },
     "innerLabwareGeometry": {
         "conicalWell": {
-            "sections": []
+            "sections": [
+                {
+                    "shape": "conical",
+                    "topDiameter": 8.5,
+                    "bottomDiameter": 8.14,
+                    "topHeight": 42.0,
+                    "bottomHeight": 3.04
+                },
+                {
+                    "shape": "conical",
+                    "topDiameter": 8.14,
+                    "bottomDiameter": 6.5,
+                    "topHeight": 3.04,
+                    "bottomHeight": 2.08
+                },
+                {
+                    "shape": "conical",
+                    "topDiameter": 6.5,
+                    "bottomDiameter": 1.21,
+                    "topHeight": 2.08,
+                    "bottomHeight": 0.0
+                }
+            ]
         }
     }
 }

package/lib/labware/definitions/{3 → 2}/opentrons_24_aluminumblock_nest_0.5ml_screwcap/2.json

@@ -314,7 +314,7 @@
     },
     "namespace": "opentrons",
     "version": 2,
-    "schemaVersion": 3,
+    "schemaVersion": 2,
     "cornerOffsetFromSlot": {
         "x": 0,
         "y": 0,
@@ -323,25 +323,19 @@
     "innerLabwareGeometry": {
         "conicalWell": {
             "sections": [
-                {
-                    "shape": "spherical",
-                    "radiusOfCurvature": 3.64,
-                    "topHeight": 0.14,
-                    "bottomHeight": 0.0
-                },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 2,
-                    "topDiameter": 3,
-                    "topHeight": 0.95,
-                    "bottomHeight": 0.14
+                    "bottomDiameter": 8.56,
+                    "topDiameter": 8.56,
+                    "topHeight": 25.2,
+                    "bottomHeight": 13.95
                 },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 3,
-                    "topDiameter": 5.8,
-                    "topHeight": 10.2,
-                    "bottomHeight": 0.95
+                    "bottomDiameter": 7.9,
+                    "topDiameter": 8.56,
+                    "topHeight": 13.95,
+                    "bottomHeight": 11.9
                 },
                 {
                     "shape": "conical",
@@ -352,17 +346,23 @@
                 },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 7.9,
-                    "topDiameter": 8.56,
-                    "topHeight": 13.95,
-                    "bottomHeight": 11.9
+                    "bottomDiameter": 3,
+                    "topDiameter": 5.8,
+                    "topHeight": 10.2,
+                    "bottomHeight": 0.95
                 },
                 {
                     "shape": "conical",
-                    "bottomDiameter": 8.56,
-                    "topDiameter": 8.56,
-                    "topHeight": 25.2,
-                    "bottomHeight": 13.95
+                    "bottomDiameter": 2,
+                    "topDiameter": 3,
+                    "topHeight": 0.95,
+                    "bottomHeight": 0.14
+                },
+                {
+                    "shape": "spherical",
+                    "radiusOfCurvature": 3.64,
+                    "topHeight": 0.14,
+                    "bottomHeight": 0.0
                 }
             ]
         }