@opentrons/shared-data 0.1.6-alpha.17 → 0.1.6-alpha.21

package/command/schemas/11.json

@@ -2133,6 +2133,40 @@
             ]
           }
         },
+        "correctionByVolume": {
+          "title": "Correctionbyvolume",
+          "description": "Settings for volume correction keyed by by target aspiration volume, representing additional volume the plunger should move to accurately hit target volume.",
+          "type": "array",
+          "items": {
+            "type": "array",
+            "minItems": 2,
+            "maxItems": 2,
+            "items": [
+              {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "number",
+                    "minimum": 0.0
+                  }
+                ]
+              },
+              {
+                "anyOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "number"
+                  }
+                ]
+              }
+            ]
+          }
+        },
         "preWet": {
           "title": "Prewet",
           "description": "Whether to perform a pre-wet action.",
@@ -2163,6 +2197,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
+        "correctionByVolume",
         "preWet",
         "mix",
         "delay"
@@ -2411,6 +2446,40 @@
             ]
           }
         },
+        "correctionByVolume": {
+          "title": "Correctionbyvolume",
+          "description": "Settings for volume correction keyed by by target dispense volume, representing additional volume the plunger should move to accurately hit target volume.",
+          "type": "array",
+          "items": {
+            "type": "array",
+            "minItems": 2,
+            "maxItems": 2,
+            "items": [
+              {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "number",
+                    "minimum": 0.0
+                  }
+                ]
+              },
+              {
+                "anyOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "number"
+                  }
+                ]
+              }
+            ]
+          }
+        },
         "mix": {
           "title": "Mix",
           "description": "Mixing settings for after a dispense",
@@ -2472,6 +2541,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
+        "correctionByVolume",
         "mix",
         "pushOutByVolume",
         "delay"
@@ -2553,6 +2623,40 @@
             ]
           }
         },
+        "correctionByVolume": {
+          "title": "Correctionbyvolume",
+          "description": "Settings for volume correction keyed by by target dispense volume, representing additional volume the plunger should move to accurately hit target volume.",
+          "type": "array",
+          "items": {
+            "type": "array",
+            "minItems": 2,
+            "maxItems": 2,
+            "items": [
+              {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "minimum": 0
+                  },
+                  {
+                    "type": "number",
+                    "minimum": 0.0
+                  }
+                ]
+              },
+              {
+                "anyOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "number"
+                  }
+                ]
+              }
+            ]
+          }
+        },
         "conditioningByVolume": {
           "title": "Conditioningbyvolume",
           "description": "Settings for conditioning volume keyed by target dispense volume.",
@@ -2641,6 +2745,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
+        "correctionByVolume",
         "conditioningByVolume",
         "disposalByVolume",
         "delay"

package/liquid-class/definitions/1/water.json

@@ -64,6 +64,7 @@
               [10.0, 24.0],
               [50.0, 35.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -133,6 +134,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 50.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -208,6 +210,7 @@
               "z": 2
             },
             "flowRateByVolume": [[50.0, 50.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [45.0, 5.0],
@@ -288,6 +291,7 @@
               [10.0, 24.0],
               [50.0, 35.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -357,6 +361,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 50.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -432,6 +437,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 50.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [45.0, 5.0],
@@ -512,6 +518,7 @@
               [10.0, 478.0],
               [50.0, 478.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -585,6 +592,7 @@
               [10.0, 478.0],
               [50.0, 478.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -658,6 +666,7 @@
               [10.0, 478.0],
               [50.0, 478.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [45.0, 5.0],
@@ -729,6 +738,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -798,6 +808,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -867,6 +878,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [195.0, 5.0],
@@ -938,6 +950,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -1007,6 +1020,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -1076,6 +1090,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [995.0, 5.0],
@@ -1156,6 +1171,7 @@
               [10.0, 478.0],
               [50.0, 478.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -1229,6 +1245,7 @@
               [10.0, 478.0],
               [50.0, 478.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -1302,6 +1319,7 @@
               [10.0, 478.0],
               [50.0, 478.0]
             ],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [45.0, 5.0],
@@ -1373,6 +1391,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -1442,6 +1461,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -1511,6 +1531,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [195.0, 5.0],
@@ -1582,6 +1603,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -1651,6 +1673,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -1720,6 +1743,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 716.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [995.0, 5.0],
@@ -1796,6 +1820,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -1865,6 +1890,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -1934,6 +1960,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [45.0, 5.0],
@@ -2005,6 +2032,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -2074,6 +2102,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -2143,6 +2172,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [195.0, 5.0],
@@ -2214,6 +2244,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "preWet": false,
             "mix": {
               "enable": false,
@@ -2283,6 +2314,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "mix": {
               "enable": false,
               "params": {
@@ -2352,6 +2384,7 @@
               "z": 2
             },
             "flowRateByVolume": [[1.0, 200.0]],
+            "correctionByVolume": [[0.0, 0.0]],
             "conditioningByVolume": [
               [1.0, 5.0],
               [995.0, 5.0],

package/liquid-class/fixtures/1/fixture_glycerol50.json

@@ -59,6 +59,10 @@
               "z": -5
             },
             "flowRateByVolume": [[10.0, 50.0]],
+            "correctionByVolume": [
+              [1.0, -2.5],
+              [10.0, 3.0]
+            ],
             "preWet": true,
             "mix": {
               "enable": true,
@@ -134,6 +138,10 @@
               [10.0, 40.0],
               [20.0, 30.0]
             ],
+            "correctionByVolume": [
+              [2.0, -1.5],
+              [20.0, 2.0]
+            ],
             "mix": {
               "enable": true,
               "params": {
@@ -208,6 +216,10 @@
               [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": {

package/liquid-class/schemas/1.json

@@ -144,6 +144,17 @@
       },
       "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
+      },
+      "minItems": 1
+    },
     "mix": {
       "type": "object",
       "description": "Mixing properties.",
@@ -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,6 +431,7 @@
         "positionReference",
         "offset",
         "flowRateByVolume",
+        "correctionByVolume",
         "conditioningByVolume",
         "disposalByVolume",
         "delay"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/shared-data",
-  "version": "0.1.6-alpha.17",
+  "version": "0.1.6-alpha.21",
   "description": "Shared system definitions and utilities for Opentrons robots and software",
   "repository": {
     "type": "git",