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

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": [
@@ -33,11 +34,10 @@
                 "z": 5
               },
               "speed": 100,
-              "airGapByVolume": {
-                "default": 2,
-                "5": 3,
-                "10": 4
-              },
+              "airGapByVolume": [
+                [5.0, 3.0],
+                [10.0, 4.0]
+              ],
               "touchTip": {
                 "enable": true,
                 "params": {
@@ -59,11 +59,11 @@
               "y": 0,
               "z": -5
             },
-            "flowRateByVolume": {
-              "default": 50,
-              "10": 40,
-              "20": 30
-            },
+            "flowRateByVolume": [[10.0, 50.0]],
+            "correctionByVolume": [
+              [1.0, -2.5],
+              [10.0, 3.0]
+            ],
             "preWet": true,
             "mix": {
               "enable": true,
@@ -103,11 +103,10 @@
                 "z": 5
               },
               "speed": 100,
-              "airGapByVolume": {
-                "default": 2,
-                "5": 3,
-                "10": 4
-              },
+              "airGapByVolume": [
+                [5.0, 3.0],
+                [10.0, 4.0]
+              ],
               "blowout": {
                 "enable": true,
                 "params": {
@@ -136,11 +135,14 @@
               "y": 0,
               "z": -5
             },
-            "flowRateByVolume": {
-              "default": 50,
-              "10": 40,
-              "20": 30
-            },
+            "flowRateByVolume": [
+              [10.0, 40.0],
+              [20.0, 30.0]
+            ],
+            "correctionByVolume": [
+              [2.0, -1.5],
+              [20.0, 2.0]
+            ],
             "mix": {
               "enable": true,
               "params": {
@@ -148,11 +150,10 @@
                 "volume": 15
               }
             },
-            "pushOutByVolume": {
-              "default": 5,
-              "10": 7,
-              "20": 10
-            },
+            "pushOutByVolume": [
+              [10.0, 7.0],
+              [20.0, 10.0]
+            ],
             "delay": {
               "enable": true,
               "params": {
@@ -184,11 +185,10 @@
                 "z": 5
               },
               "speed": 100,
-              "airGapByVolume": {
-                "default": 2,
-                "5": 3,
-                "10": 4
-              },
+              "airGapByVolume": [
+                [5.0, 3.0],
+                [10.0, 4.0]
+              ],
               "touchTip": {
                 "enable": true,
                 "params": {
@@ -213,19 +213,16 @@
               "y": 0,
               "z": -5
             },
-            "flowRateByVolume": {
-              "default": 50,
-              "10": 40,
-              "20": 30
-            },
-            "conditioningByVolume": {
-              "default": 10,
-              "5": 5
-            },
-            "disposalByVolume": {
-              "default": 2,
-              "5": 3
-            },
+            "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

@@ -90,59 +90,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",
@@ -310,6 +321,9 @@
         "flowRateByVolume": {
           "$ref": "#/definitions/flowRateByVolume"
         },
+        "correctionByVolume": {
+          "$ref": "#/definitions/correctionByVolume"
+        },
         "preWet": {
           "type": "boolean",
           "description": "Whether to perform a pre-wet action."
@@ -327,6 +341,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
+        "correctionByVolume",
         "preWet",
         "mix",
         "delay"
@@ -352,6 +367,9 @@
         "flowRateByVolume": {
           "$ref": "#/definitions/flowRateByVolume"
         },
+        "correctionByVolume": {
+          "$ref": "#/definitions/correctionByVolume"
+        },
         "mix": {
           "$ref": "#/definitions/mix"
         },
@@ -368,6 +386,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
+        "correctionByVolume",
         "mix",
         "pushOutByVolume",
         "delay"
@@ -393,6 +412,9 @@
         "flowRateByVolume": {
           "$ref": "#/definitions/flowRateByVolume"
         },
+        "correctionByVolume": {
+          "$ref": "#/definitions/correctionByVolume"
+        },
         "conditioningByVolume": {
           "$ref": "#/definitions/conditioningByVolume"
         },
@@ -409,7 +431,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
-        "mix",
+        "correctionByVolume",
         "conditioningByVolume",
         "disposalByVolume",
         "delay"
@@ -426,6 +448,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 +504,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
   },