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

package/liquid-class/fixtures/{fixture_glycerol50.json → 1/fixture_glycerol50.json}

@@ -1,6 +1,7 @@
 {
   "liquidClassName": "fixture_glycerol50",
-  "displayName": "Glycerol 50%",
+  "displayName": "Viscous",
+  "description": "50% glycerol",
   "schemaVersion": 1,
   "namespace": "opentrons",
   "byPipette": [
@@ -11,11 +12,13 @@
           "tiprack": "opentrons_96_tiprack_20ul",
           "aspirate": {
             "submerge": {
-              "positionReference": "liquid-meniscus",
-              "offset": {
-                "x": 0,
-                "y": 0,
-                "z": -5
+              "startPosition": {
+                "positionReference": "liquid-meniscus",
+                "offset": {
+                  "x": 0,
+                  "y": 0,
+                  "z": -5
+                }
               },
               "speed": 100,
               "delay": {
@@ -26,23 +29,24 @@
               }
             },
             "retract": {
-              "positionReference": "well-top",
-              "offset": {
-                "x": 0,
-                "y": 0,
-                "z": 5
+              "endPosition": {
+                "positionReference": "well-top",
+                "offset": {
+                  "x": 0,
+                  "y": 0,
+                  "z": 5
+                }
               },
               "speed": 100,
-              "airGapByVolume": {
-                "default": 2,
-                "5": 3,
-                "10": 4
-              },
+              "airGapByVolume": [
+                [5.0, 3.0],
+                [10.0, 4.0]
+              ],
               "touchTip": {
                 "enable": true,
                 "params": {
                   "zOffset": 2,
-                  "mmToEdge": 1,
+                  "mmFromEdge": 1,
                   "speed": 50
                 }
               },
@@ -53,17 +57,19 @@
                 }
               }
             },
-            "positionReference": "well-bottom",
-            "offset": {
-              "x": 0,
-              "y": 0,
-              "z": -5
-            },
-            "flowRateByVolume": {
-              "default": 50,
-              "10": 40,
-              "20": 30
+            "aspiratePosition": {
+              "positionReference": "well-bottom",
+              "offset": {
+                "x": 0,
+                "y": 0,
+                "z": -5
+              }
             },
+            "flowRateByVolume": [[10.0, 50.0]],
+            "correctionByVolume": [
+              [1.0, -2.5],
+              [10.0, 3.0]
+            ],
             "preWet": true,
             "mix": {
               "enable": true,
@@ -81,11 +87,13 @@
           },
           "singleDispense": {
             "submerge": {
-              "positionReference": "liquid-meniscus",
-              "offset": {
-                "x": 0,
-                "y": 0,
-                "z": -5
+              "startPosition": {
+                "positionReference": "liquid-meniscus",
+                "offset": {
+                  "x": 0,
+                  "y": 0,
+                  "z": -5
+                }
               },
               "speed": 100,
               "delay": {
@@ -96,18 +104,19 @@
               }
             },
             "retract": {
-              "positionReference": "well-top",
-              "offset": {
-                "x": 0,
-                "y": 0,
-                "z": 5
+              "endPosition": {
+                "positionReference": "well-top",
+                "offset": {
+                  "x": 0,
+                  "y": 0,
+                  "z": 5
+                }
               },
               "speed": 100,
-              "airGapByVolume": {
-                "default": 2,
-                "5": 3,
-                "10": 4
-              },
+              "airGapByVolume": [
+                [5.0, 3.0],
+                [10.0, 4.0]
+              ],
               "blowout": {
                 "enable": true,
                 "params": {
@@ -119,7 +128,7 @@
                 "enable": true,
                 "params": {
                   "zOffset": 2,
-                  "mmToEdge": 1,
+                  "mmFromEdge": 1,
                   "speed": 50
                 }
               },
@@ -130,17 +139,22 @@
                 }
               }
             },
-            "positionReference": "well-bottom",
-            "offset": {
-              "x": 0,
-              "y": 0,
-              "z": -5
-            },
-            "flowRateByVolume": {
-              "default": 50,
-              "10": 40,
-              "20": 30
+            "dispensePosition": {
+              "positionReference": "well-bottom",
+              "offset": {
+                "x": 0,
+                "y": 0,
+                "z": -5
+              }
             },
+            "flowRateByVolume": [
+              [10.0, 40.0],
+              [20.0, 30.0]
+            ],
+            "correctionByVolume": [
+              [2.0, -1.5],
+              [20.0, 2.0]
+            ],
             "mix": {
               "enable": true,
               "params": {
@@ -148,11 +162,10 @@
                 "volume": 15
               }
             },
-            "pushOutByVolume": {
-              "default": 5,
-              "10": 7,
-              "20": 10
-            },
+            "pushOutByVolume": [
+              [10.0, 7.0],
+              [20.0, 10.0]
+            ],
             "delay": {
               "enable": true,
               "params": {
@@ -162,11 +175,13 @@
           },
           "multiDispense": {
             "submerge": {
-              "positionReference": "liquid-meniscus",
-              "offset": {
-                "x": 0,
-                "y": 0,
-                "z": -5
+              "startPosition": {
+                "positionReference": "liquid-meniscus",
+                "offset": {
+                  "x": 0,
+                  "y": 0,
+                  "z": -5
+                }
               },
               "speed": 100,
               "delay": {
@@ -177,23 +192,24 @@
               }
             },
             "retract": {
-              "positionReference": "well-top",
-              "offset": {
-                "x": 0,
-                "y": 0,
-                "z": 5
+              "endPosition": {
+                "positionReference": "well-top",
+                "offset": {
+                  "x": 0,
+                  "y": 0,
+                  "z": 5
+                }
               },
               "speed": 100,
-              "airGapByVolume": {
-                "default": 2,
-                "5": 3,
-                "10": 4
-              },
+              "airGapByVolume": [
+                [5.0, 3.0],
+                [10.0, 4.0]
+              ],
               "touchTip": {
                 "enable": true,
                 "params": {
                   "zOffset": 2,
-                  "mmToEdge": 1,
+                  "mmFromEdge": 1,
                   "speed": 50
                 }
               },
@@ -207,25 +223,24 @@
                 "enable": false
               }
             },
-            "positionReference": "well-bottom",
-            "offset": {
-              "x": 0,
-              "y": 0,
-              "z": -5
-            },
-            "flowRateByVolume": {
-              "default": 50,
-              "10": 40,
-              "20": 30
-            },
-            "conditioningByVolume": {
-              "default": 10,
-              "5": 5
-            },
-            "disposalByVolume": {
-              "default": 2,
-              "5": 3
+            "dispensePosition": {
+              "positionReference": "well-bottom",
+              "offset": {
+                "x": 0,
+                "y": 0,
+                "z": -5
+              }
             },
+            "flowRateByVolume": [
+              [10.0, 40.0],
+              [20.0, 30.0]
+            ],
+            "correctionByVolume": [
+              [3.0, -0.5],
+              [30.0, 1.0]
+            ],
+            "conditioningByVolume": [[5.0, 5.0]],
+            "disposalByVolume": [[5.0, 3.0]],
             "delay": {
               "enable": true,
               "params": {

package/liquid-class/schemas/1.json

@@ -58,6 +58,20 @@
       "required": ["x", "y", "z"],
       "additionalProperties": false
     },
+    "tipPosition": {
+      "type": "object",
+      "description": "Positional reference and relative offset for where a tip should go.",
+      "properties": {
+        "positionReference": {
+          "$ref": "#/definitions/positionReference"
+        },
+        "offset": {
+          "$ref": "#/definitions/coordinate"
+        }
+      },
+      "required": ["positionReference", "offset"],
+      "additionalProperties": false
+    },
     "touchTip": {
       "type": "object",
       "description": "Shared properties for the touch-tip function.",
@@ -73,7 +87,7 @@
               "type": "number",
               "description": "Offset from the top of the well for touch-tip, in millimeters."
             },
-            "mmToEdge": {
+            "mmFromEdge": {
               "type": "number",
               "description": "Offset away from the the well edge, in millimeters."
             },
@@ -82,7 +96,7 @@
               "description": "Touch-tip speed, in millimeters per second."
             }
           },
-          "required": ["zOffset", "mmToEdge", "speed"],
+          "required": ["zOffset", "mmFromEdge", "speed"],
           "additionalProperties": false
         }
       },
@@ -90,59 +104,70 @@
       "additionalProperties": false
     },
     "airGapByVolume": {
-      "type": "object",
+      "type": "array",
       "description": "Settings for air gap keyed by target aspiration volume.",
-      "properties": {
-        "default": { "$ref": "#/definitions/positiveNumber" }
-      },
-      "patternProperties": {
-        "d+": { "$ref": "#/definitions/positiveNumber" }
+      "items": {
+        "type": "array",
+        "items": { "$ref": "#/definitions/positiveNumber" },
+        "minItems": 2,
+        "maxItems": 2
       },
-      "required": ["default"]
+      "minItems": 1
     },
     "flowRateByVolume": {
-      "type": "object",
+      "type": "array",
       "description": "Settings for flow rate keyed by target aspiration/dispense volume.",
-      "properties": {
-        "default": { "$ref": "#/definitions/positiveNumber" }
-      },
-      "patternProperties": {
-        "d+": { "$ref": "#/definitions/positiveNumber" }
+      "items": {
+        "type": "array",
+        "items": { "$ref": "#/definitions/positiveNumber" },
+        "minItems": 2,
+        "maxItems": 2
       },
-      "required": ["default"]
+      "minItems": 1
     },
     "pushOutByVolume": {
-      "type": "object",
+      "type": "array",
       "description": "Settings for pushout keyed by target aspiration volume.",
-      "properties": {
-        "default": { "$ref": "#/definitions/positiveNumber" }
-      },
-      "patternProperties": {
-        "d+": { "$ref": "#/definitions/positiveNumber" }
+      "items": {
+        "type": "array",
+        "items": { "$ref": "#/definitions/positiveNumber" },
+        "minItems": 2,
+        "maxItems": 2
       },
-      "required": ["default"]
+      "minItems": 1
     },
     "disposalByVolume": {
-      "type": "object",
-      "description": "Settings for disposal volume keyed by target dispense volume.",
-      "properties": {
-        "default": { "$ref": "#/definitions/positiveNumber" }
-      },
-      "patternProperties": {
-        "d+": { "$ref": "#/definitions/positiveNumber" }
+      "type": "array",
+      "description": "An array of two tuples containing positive numbers.",
+      "items": {
+        "type": "array",
+        "items": { "$ref": "#/definitions/positiveNumber" },
+        "minItems": 2,
+        "maxItems": 2
       },
-      "required": ["default"]
+      "minItems": 1
     },
     "conditioningByVolume": {
-      "type": "object",
+      "type": "array",
       "description": "Settings for conditioning volume keyed by target dispense volume.",
-      "properties": {
-        "default": { "$ref": "#/definitions/positiveNumber" }
+      "items": {
+        "type": "array",
+        "items": { "$ref": "#/definitions/positiveNumber" },
+        "minItems": 2,
+        "maxItems": 2
       },
-      "patternProperties": {
-        "d+": { "$ref": "#/definitions/positiveNumber" }
+      "minItems": 1
+    },
+    "correctionByVolume": {
+      "type": "array",
+      "description": "Settings for volume correction keyed by target aspiration/dispense volume, representing additional volume the plunger should move to accurately hit target volume.",
+      "items": {
+        "type": "array",
+        "items": { "type": "number" },
+        "minItems": 2,
+        "maxItems": 2
       },
-      "required": ["default"]
+      "minItems": 1
     },
     "mix": {
       "type": "object",
@@ -203,11 +228,8 @@
       "type": "object",
       "description": "Shared properties for the submerge function before aspiration or dispense.",
       "properties": {
-        "positionReference": {
-          "$ref": "#/definitions/positionReference"
-        },
-        "offset": {
-          "$ref": "#/definitions/coordinate"
+        "startPosition": {
+          "$ref": "#/definitions/tipPosition"
         },
         "speed": {
           "$ref": "#/definitions/positiveNumber",
@@ -217,18 +239,15 @@
           "$ref": "#/definitions/delay"
         }
       },
-      "required": ["positionReference", "offset", "speed", "delay"],
+      "required": ["startPosition", "speed", "delay"],
       "additionalProperties": false
     },
     "retractAspirate": {
       "type": "object",
       "description": "Shared properties for the retract function after aspiration or dispense.",
       "properties": {
-        "positionReference": {
-          "$ref": "#/definitions/positionReference"
-        },
-        "offset": {
-          "$ref": "#/definitions/coordinate"
+        "endPosition": {
+          "$ref": "#/definitions/tipPosition"
         },
         "speed": {
           "$ref": "#/definitions/positiveNumber",
@@ -244,24 +263,15 @@
           "$ref": "#/definitions/delay"
         }
       },
-      "required": [
-        "positionReference",
-        "offset",
-        "speed",
-        "airGapByVolume",
-        "delay"
-      ],
+      "required": ["endPosition", "speed", "airGapByVolume", "delay"],
       "additionalProperties": false
     },
     "retractDispense": {
       "type": "object",
       "description": "Shared properties for the retract function after aspiration or dispense.",
       "properties": {
-        "positionReference": {
-          "$ref": "#/definitions/positionReference"
-        },
-        "offset": {
-          "$ref": "#/definitions/coordinate"
+        "endPosition": {
+          "$ref": "#/definitions/tipPosition"
         },
         "speed": {
           "$ref": "#/definitions/positiveNumber",
@@ -281,8 +291,7 @@
         }
       },
       "required": [
-        "positionReference",
-        "offset",
+        "endPosition",
         "speed",
         "airGapByVolume",
         "blowout",
@@ -301,15 +310,15 @@
         "retract": {
           "$ref": "#/definitions/retractAspirate"
         },
-        "positionReference": {
-          "$ref": "#/definitions/positionReference"
-        },
-        "offset": {
-          "$ref": "#/definitions/coordinate"
+        "aspiratePosition": {
+          "$ref": "#/definitions/tipPosition"
         },
         "flowRateByVolume": {
           "$ref": "#/definitions/flowRateByVolume"
         },
+        "correctionByVolume": {
+          "$ref": "#/definitions/correctionByVolume"
+        },
         "preWet": {
           "type": "boolean",
           "description": "Whether to perform a pre-wet action."
@@ -324,9 +333,9 @@
       "required": [
         "submerge",
         "retract",
-        "positionReference",
-        "offset",
+        "aspiratePosition",
         "flowRateByVolume",
+        "correctionByVolume",
         "preWet",
         "mix",
         "delay"
@@ -343,15 +352,15 @@
         "retract": {
           "$ref": "#/definitions/retractDispense"
         },
-        "positionReference": {
-          "$ref": "#/definitions/positionReference"
-        },
-        "offset": {
-          "$ref": "#/definitions/coordinate"
+        "dispensePosition": {
+          "$ref": "#/definitions/tipPosition"
         },
         "flowRateByVolume": {
           "$ref": "#/definitions/flowRateByVolume"
         },
+        "correctionByVolume": {
+          "$ref": "#/definitions/correctionByVolume"
+        },
         "mix": {
           "$ref": "#/definitions/mix"
         },
@@ -365,9 +374,9 @@
       "required": [
         "submerge",
         "retract",
-        "positionReference",
-        "offset",
+        "dispensePosition",
         "flowRateByVolume",
+        "correctionByVolume",
         "mix",
         "pushOutByVolume",
         "delay"
@@ -384,15 +393,15 @@
         "retract": {
           "$ref": "#/definitions/retractDispense"
         },
-        "positionReference": {
-          "$ref": "#/definitions/positionReference"
-        },
-        "offset": {
-          "$ref": "#/definitions/coordinate"
+        "dispensePosition": {
+          "$ref": "#/definitions/tipPosition"
         },
         "flowRateByVolume": {
           "$ref": "#/definitions/flowRateByVolume"
         },
+        "correctionByVolume": {
+          "$ref": "#/definitions/correctionByVolume"
+        },
         "conditioningByVolume": {
           "$ref": "#/definitions/conditioningByVolume"
         },
@@ -406,10 +415,9 @@
       "required": [
         "submerge",
         "retract",
-        "positionReference",
-        "offset",
+        "dispensePosition",
         "flowRateByVolume",
-        "mix",
+        "correctionByVolume",
         "conditioningByVolume",
         "disposalByVolume",
         "delay"
@@ -426,6 +434,10 @@
       "type": "string",
       "description": "User-readable name of the liquid class."
     },
+    "description": {
+      "type": "string",
+      "description": "User-readable description of the liquid class"
+    },
     "schemaVersion": {
       "description": "Which schema version a liquid class is using",
       "type": "number",
@@ -478,6 +490,7 @@
   "required": [
     "liquidClassName",
     "displayName",
+    "description",
     "schemaVersion",
     "namespace",
     "byPipette"

package/module/definitions/3/absorbanceReaderV1.json

@@ -11,8 +11,8 @@
     "bareOverallHeight": 18.5,
     "overLabwareHeight": 0.0,
     "lidHeight": 60.0,
-    "xDimension": 95.5,
-    "yDimension": 155.3,
+    "xDimension": 155.3,
+    "yDimension": 95.5,
     "labwareInterfaceXDimension": 127.8,
     "labwareInterfaceYDimension": 85.5
   },
@@ -35,6 +35,7 @@
   },
   "compatibleWith": [],
   "incompatibleWithDecks": ["ot2_standard"],
+  "uniqueModuleData": {},
   "twoDimensionalRendering": {
     "name": "svg",
     "type": "element",