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

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

@@ -314,7 +314,7 @@
   },
   "namespace": "opentrons",
   "version": 2,
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "cornerOffsetFromSlot": {
     "x": 0,
     "y": 0,
@@ -323,18 +323,12 @@
   "innerLabwareGeometry": {
     "conicalWell": {
       "sections": [
-        {
-          "shape": "spherical",
-          "radiusOfCurvature": 2.36,
-          "topHeight": 0.2,
-          "bottomHeight": 0.0
-        },
         {
           "shape": "conical",
-          "topDiameter": 3.2,
-          "bottomDiameter": 1.9,
-          "topHeight": 1.88,
-          "bottomHeight": 0.2
+          "topDiameter": 8.55,
+          "bottomDiameter": 8.2,
+          "topHeight": 42.6,
+          "bottomHeight": 13.7
         },
         {
           "shape": "conical",
@@ -345,10 +339,16 @@
         },
         {
           "shape": "conical",
-          "topDiameter": 8.55,
-          "bottomDiameter": 8.2,
-          "topHeight": 42.6,
-          "bottomHeight": 13.7
+          "topDiameter": 3.2,
+          "bottomDiameter": 1.9,
+          "topHeight": 1.88,
+          "bottomHeight": 0.2
+        },
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 2.36,
+          "topHeight": 0.2,
+          "bottomHeight": 0.0
         }
       ]
     }

package/labware/definitions/{3 → 2}/opentrons_24_aluminumblock_nest_1.5ml_snapcap/2.json

@@ -316,7 +316,7 @@
   },
   "namespace": "opentrons",
   "version": 2,
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "cornerOffsetFromSlot": {
     "x": 0,
     "y": 0,
@@ -326,24 +326,31 @@
     "conicalWell": {
       "sections": [
         {
-          "shape": "spherical",
-          "radiusOfCurvature": 2.72,
-          "topHeight": 1.57,
-          "bottomHeight": 0.0
+          "shape": "conical",
+          "topDiameter": 9.9,
+          "bottomDiameter": 9.28,
+          "topHeight": 37.9,
+          "bottomHeight": 35.4
         },
         {
           "shape": "conical",
-          "topDiameter": 8.9,
-          "bottomDiameter": 3.69,
-          "topHeight": 17.7,
-          "bottomHeight": 1.57
+          "topDiameter": 9.28,
+          "bottomDiameter": 8.98,
+          "topHeight": 35.4,
+          "bottomHeight": 17.4
         },
         {
           "shape": "conical",
-          "topDiameter": 9.28,
-          "bottomDiameter": 8.9,
-          "topHeight": 37.9,
-          "bottomHeight": 17.7
+          "topDiameter": 8.98,
+          "bottomDiameter": 3.69,
+          "topHeight": 17.4,
+          "bottomHeight": 1.56
+        },
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 1.87,
+          "topHeight": 1.56,
+          "bottomHeight": 0.0
         }
       ]
     }

package/labware/definitions/{3 → 2}/opentrons_24_aluminumblock_nest_2ml_screwcap/2.json

@@ -314,7 +314,7 @@
   },
   "namespace": "opentrons",
   "version": 2,
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "cornerOffsetFromSlot": {
     "x": 0,
     "y": 0,
@@ -325,10 +325,10 @@
       "sections": [
         {
           "shape": "conical",
-          "bottomDiameter": 1.21,
-          "topDiameter": 6.5,
-          "topHeight": 2.08,
-          "bottomHeight": 0.0
+          "bottomDiameter": 8.14,
+          "topDiameter": 8.55,
+          "topHeight": 43.4,
+          "bottomHeight": 3.04
         },
         {
           "shape": "conical",
@@ -339,10 +339,10 @@
         },
         {
           "shape": "conical",
-          "bottomDiameter": 8.14,
-          "topDiameter": 8.55,
-          "topHeight": 43.4,
-          "bottomHeight": 3.04
+          "bottomDiameter": 1.21,
+          "topDiameter": 6.5,
+          "topHeight": 2.08,
+          "bottomHeight": 0.0
         }
       ]
     }

package/labware/definitions/{3 → 2}/opentrons_24_aluminumblock_nest_2ml_snapcap/2.json

@@ -316,7 +316,7 @@
   },
   "namespace": "opentrons",
   "version": 2,
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "cornerOffsetFromSlot": {
     "x": 0,
     "y": 0,
@@ -326,52 +326,59 @@
     "conicalWell": {
       "sections": [
         {
-          "shape": "spherical",
-          "radiusOfCurvature": 3.19,
-          "topHeight": 1.21,
-          "bottomHeight": 0.0
+          "shape": "conical",
+          "topDiameter": 9.28,
+          "bottomDiameter": 8.9,
+          "topHeight": 39.28,
+          "bottomHeight": 15.04
         },
         {
           "shape": "conical",
-          "bottomDiameter": 5,
-          "topDiameter": 6,
-          "topHeight": 1.83,
-          "bottomHeight": 1.21
+          "topDiameter": 8.9,
+          "bottomDiameter": 8.74,
+          "topHeight": 15.04,
+          "bottomHeight": 6.26
         },
         {
           "shape": "conical",
-          "bottomDiameter": 6,
-          "topDiameter": 7,
-          "topHeight": 2.59,
-          "bottomHeight": 1.83
+          "topDiameter": 8.74,
+          "bottomDiameter": 8.0,
+          "topHeight": 6.26,
+          "bottomHeight": 3.98
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.0,
+          "bottomDiameter": 7.2,
+          "topHeight": 3.98,
+          "bottomHeight": 2.74
         },
         {
           "shape": "conical",
-          "bottomDiameter": 7,
           "topDiameter": 7.2,
+          "bottomDiameter": 7.0,
           "topHeight": 2.74,
           "bottomHeight": 2.59
         },
         {
           "shape": "conical",
-          "bottomDiameter": 7.2,
-          "topDiameter": 8,
-          "topHeight": 3.89,
-          "bottomHeight": 2.74
+          "topDiameter": 7.0,
+          "bottomDiameter": 6.0,
+          "topHeight": 2.59,
+          "bottomHeight": 1.83
         },
         {
           "shape": "conical",
-          "bottomDiameter": 8,
-          "topDiameter": 8.9,
-          "topHeight": 15.05,
-          "bottomHeight": 3.89
+          "topDiameter": 6.0,
+          "bottomDiameter": 5.0,
+          "topHeight": 1.83,
+          "bottomHeight": 1.21
         },
         {
-          "shape": "conical",
-          "bottomDiameter": 8.9,
-          "topDiameter": 9.28,
-          "topHeight": 39.28,
-          "bottomHeight": 15.04
+          "shape": "spherical",
+          "radiusOfCurvature": 3.19,
+          "topHeight": 1.21,
+          "bottomHeight": 0.0
         }
       ]
     }

package/labware/definitions/{3 → 2}/opentrons_24_tuberack_eppendorf_1.5ml_safelock_snapcap/2.json

@@ -7,7 +7,7 @@
     ["A5", "B5", "C5", "D5"],
     ["A6", "B6", "C6", "D6"]
   ],
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "version": 2,
   "namespace": "opentrons",
   "metadata": {
@@ -337,38 +337,39 @@
     "conicalWell": {
       "sections": [
         {
-          "shape": "spherical",
-          "radiusOfCurvature": 2.6,
-          "topHeight": 0.2,
-          "bottomHeight": 0.0
+          "shape": "conical",
+          "bottomDiameter": 9.6,
+          "topDiameter": 10,
+          "topHeight": 37.8,
+          "bottomHeight": 32.49
         },
         {
           "shape": "conical",
-          "bottomDiameter": 2,
-          "topDiameter": 3.26,
-          "topHeight": 1,
-          "bottomHeight": 0.2
+          "bottomDiameter": 9.2,
+          "topDiameter": 9.6,
+          "topHeight": 32.49,
+          "bottomHeight": 31.97
         },
         {
           "shape": "conical",
-          "bottomDiameter": 3.26,
-          "topDiameter": 4,
-          "topHeight": 2.9,
-          "bottomHeight": 1
+          "bottomDiameter": 9.02,
+          "topDiameter": 9.2,
+          "topHeight": 31.97,
+          "bottomHeight": 31.16
         },
         {
           "shape": "conical",
-          "bottomDiameter": 4,
-          "topDiameter": 6,
-          "topHeight": 9.24,
-          "bottomHeight": 2.9
+          "bottomDiameter": 8.9,
+          "topDiameter": 9.02,
+          "topHeight": 31.16,
+          "bottomHeight": 28.16
         },
         {
           "shape": "conical",
-          "bottomDiameter": 6,
-          "topDiameter": 8,
-          "topHeight": 15.89,
-          "bottomHeight": 9.24
+          "bottomDiameter": 8.5,
+          "topDiameter": 8.9,
+          "topHeight": 28.16,
+          "bottomHeight": 17.56
         },
         {
           "shape": "conical",
@@ -379,38 +380,37 @@
         },
         {
           "shape": "conical",
-          "bottomDiameter": 8.5,
-          "topDiameter": 8.9,
-          "topHeight": 28.16,
-          "bottomHeight": 17.56
+          "bottomDiameter": 6,
+          "topDiameter": 8,
+          "topHeight": 15.89,
+          "bottomHeight": 9.24
         },
         {
           "shape": "conical",
-          "bottomDiameter": 8.9,
-          "topDiameter": 9.02,
-          "topHeight": 31.16,
-          "bottomHeight": 28.16
+          "bottomDiameter": 4,
+          "topDiameter": 6,
+          "topHeight": 9.24,
+          "bottomHeight": 2.9
         },
         {
           "shape": "conical",
-          "bottomDiameter": 9.02,
-          "topDiameter": 9.2,
-          "topHeight": 31.97,
-          "bottomHeight": 31.16
+          "bottomDiameter": 3.26,
+          "topDiameter": 4,
+          "topHeight": 2.9,
+          "bottomHeight": 1
         },
         {
           "shape": "conical",
-          "bottomDiameter": 9.2,
-          "topDiameter": 9.6,
-          "topHeight": 32.49,
-          "bottomHeight": 31.97
+          "bottomDiameter": 2,
+          "topDiameter": 3.26,
+          "topHeight": 1,
+          "bottomHeight": 0.2
         },
         {
-          "shape": "conical",
-          "bottomDiameter": 9.6,
-          "topDiameter": 10,
-          "topHeight": 37.8,
-          "bottomHeight": 32.49
+          "shape": "spherical",
+          "radiusOfCurvature": 2.6,
+          "topHeight": 0.2,
+          "bottomHeight": 0.0
         }
       ]
     }

package/labware/definitions/{3 → 2}/opentrons_24_tuberack_eppendorf_2ml_safelock_snapcap/2.json

@@ -7,7 +7,7 @@
     ["A5", "B5", "C5", "D5"],
     ["A6", "B6", "C6", "D6"]
   ],
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "version": 2,
   "namespace": "opentrons",
   "metadata": {
@@ -334,7 +334,140 @@
   },
   "innerLabwareGeometry": {
     "conicalWell": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "conical",
+          "topDiameter": 10.0,
+          "bottomDiameter": 9.6,
+          "topHeight": 39.02,
+          "bottomHeight": 33.96
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 9.6,
+          "bottomDiameter": 9.2,
+          "topHeight": 33.96,
+          "bottomHeight": 32.5
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 9.2,
+          "bottomDiameter": 9.1,
+          "topHeight": 32.5,
+          "bottomHeight": 25.26
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 9.1,
+          "bottomDiameter": 9.0,
+          "topHeight": 25.26,
+          "bottomHeight": 13.32
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 9.0,
+          "bottomDiameter": 8.9,
+          "topHeight": 13.32,
+          "bottomHeight": 10.17
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.9,
+          "bottomDiameter": 8.78,
+          "topHeight": 10.17,
+          "bottomHeight": 6.97
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.78,
+          "bottomDiameter": 8.6,
+          "topHeight": 6.97,
+          "bottomHeight": 5.43
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.6,
+          "bottomDiameter": 8.5,
+          "topHeight": 5.43,
+          "bottomHeight": 5.15
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.5,
+          "bottomDiameter": 8.4,
+          "topHeight": 5.15,
+          "bottomHeight": 5.03
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.4,
+          "bottomDiameter": 8.2,
+          "topHeight": 5.03,
+          "bottomHeight": 4.53
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.2,
+          "bottomDiameter": 8.0,
+          "topHeight": 4.53,
+          "bottomHeight": 4.29
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 8.0,
+          "bottomDiameter": 7.7,
+          "topHeight": 4.29,
+          "bottomHeight": 3.93
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 7.7,
+          "bottomDiameter": 7.6,
+          "topHeight": 3.93,
+          "bottomHeight": 3.67
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 7.6,
+          "bottomDiameter": 7.2,
+          "topHeight": 3.67,
+          "bottomHeight": 3.14
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 7.2,
+          "bottomDiameter": 6.8,
+          "topHeight": 3.14,
+          "bottomHeight": 2.75
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 6.8,
+          "bottomDiameter": 6.4,
+          "topHeight": 2.75,
+          "bottomHeight": 2.45
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 6.4,
+          "bottomDiameter": 6.0,
+          "topHeight": 2.45,
+          "bottomHeight": 2.2
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 6.0,
+          "bottomDiameter": 5.0,
+          "topHeight": 2.2,
+          "bottomHeight": 1.45
+        },
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 2.88,
+          "topHeight": 1.45,
+          "bottomHeight": 0.0
+        }
+      ]
     }
   }
 }

package/labware/definitions/{3 → 2}/opentrons_24_tuberack_generic_2ml_screwcap/2.json

@@ -7,7 +7,7 @@
     ["A5", "B5", "C5", "D5"],
     ["A6", "B6", "C6", "D6"]
   ],
-  "schemaVersion": 3,
+  "schemaVersion": 2,
   "version": 2,
   "namespace": "opentrons",
   "metadata": {
@@ -323,7 +323,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/labware/definitions/{3 → 2}/opentrons_24_tuberack_nest_0.5ml_screwcap/2.json

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