@opentrons/shared-data 0.1.6-alpha.5 → 0.1.6-alpha.8

package/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json

@@ -4,15 +4,15 @@
     "t50": {
       "uiMaxFlowRate": 26.7,
       "defaultAspirateFlowRate": {
-        "default": 35,
+        "default": 26.7,
         "valuesByApiLevel": { "2.14": 26.7 }
       },
       "defaultDispenseFlowRate": {
-        "default": 57,
+        "default": 26.7,
         "valuesByApiLevel": { "2.14": 26.7 }
       },
       "defaultBlowOutFlowRate": {
-        "default": 57,
+        "default": 26.7,
         "valuesByApiLevel": { "2.14": 26.7 }
       },
       "defaultFlowAcceleration": 1200.0,
@@ -21,57 +21,54 @@
       "aspirate": {
         "default": {
           "1": [
-            [0.11, 0.207815, 0.040201],
-            [0.65, 0.43933, 0.014735],
-            [1.04, 0.256666, 0.133466],
-            [1.67, 0.147126, 0.247388],
-            [2.45, 0.078774, 0.361536],
-            [2.89, 0.042387, 0.450684],
-            [3.2, 0.014781, 0.530464],
-            [3.79, 0.071819, 0.347944],
-            [4.22, 0.051592, 0.424605],
-            [4.93, 0.021219, 0.552775],
-            [5.81, 0.023461, 0.541725],
-            [7.21, 0.008959, 0.625982],
-            [8.93, 0.005456, 0.651235],
-            [10.0, 0.007108, 0.636489],
-            [13.61, 0.002591, 0.681656],
-            [26.99, 0.001163, 0.701094],
-            [45.25, 0.000207, 0.726887]
+            [0.541667, 0.302563, 0.190632],
+            [0.668333, 0.225982, 0.232113],
+            [1.028333, 0.255401, 0.212451],
+            [1.365, 0.149807, 0.321038],
+            [1.965, 0.091112, 0.401156],
+            [2.78, 0.060163, 0.46197],
+            [3.136667, -0.019962, 0.684718],
+            [3.471667, 0.014059, 0.578005],
+            [3.916667, 0.031571, 0.51721],
+            [4.458333, 0.069665, 0.368009],
+            [5.173333, 0.015715, 0.608534],
+            [5.99, 0.011271, 0.631526],
+            [7.39, 0.006269, 0.661487],
+            [9.18, 0.006559, 0.659347],
+            [10.193333, 0.001667, 0.704254],
+            [13.87, 0.002548, 0.695269],
+            [27.368333, 0.000899, 0.718151],
+            [45.855, 0.000182, 0.737772]
           ]
         }
       },
       "dispense": {
         "default": {
           "1": [
-            [0.11, 0.207815, 0.040201],
-            [0.65, 0.43933, 0.014735],
-            [1.04, 0.256666, 0.133466],
-            [1.67, 0.147126, 0.247388],
-            [2.45, 0.078774, 0.361536],
-            [2.89, 0.042387, 0.450684],
-            [3.2, 0.014781, 0.530464],
-            [3.79, 0.071819, 0.347944],
-            [4.22, 0.051592, 0.424605],
-            [4.93, 0.021219, 0.552775],
-            [5.81, 0.023461, 0.541725],
-            [7.21, 0.008959, 0.625982],
-            [8.93, 0.005456, 0.651235],
-            [10.0, 0.007108, 0.636489],
-            [13.61, 0.002591, 0.681656],
-            [26.99, 0.001163, 0.701094],
-            [45.25, 0.000207, 0.726887]
+            [0.541667, 0.302563, 0.190632],
+            [0.668333, 0.225982, 0.232113],
+            [1.028333, 0.255401, 0.212451],
+            [1.365, 0.149807, 0.321038],
+            [1.965, 0.091112, 0.401156],
+            [2.78, 0.060163, 0.46197],
+            [3.136667, -0.019962, 0.684718],
+            [3.471667, 0.014059, 0.578005],
+            [3.916667, 0.031571, 0.51721],
+            [4.458333, 0.069665, 0.368009],
+            [5.173333, 0.015715, 0.608534],
+            [5.99, 0.011271, 0.631526],
+            [7.39, 0.006269, 0.661487],
+            [9.18, 0.006559, 0.659347],
+            [10.193333, 0.001667, 0.704254],
+            [13.87, 0.002548, 0.695269],
+            [27.368333, 0.000899, 0.718151],
+            [45.855, 0.000182, 0.737772]
           ]
         }
       },
       "defaultPushOutVolume": 7
     }
   },
-  "defaultTipOverlapDictionary": {
-    "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
-  },
   "maxVolume": 30,
   "minVolume": 1,
   "defaultTipracks": [

package/pipette/schemas/2/pipetteGeometrySchema.json

@@ -84,6 +84,34 @@
       "patternProperties": {
         "[A-Z]+[0-9]+": { "$ref": "#/definitions/xyzArray" }
       }
+    },
+    "lldSettings": {
+      "type": "object",
+      "description": "Minimum space requirements for Liquid Level Detection to work properly",
+      "additionalProperties": false,
+      "properties": {
+        "t50": {
+          "type": "object",
+          "properties": {
+            "minHeight": { "type": "number" },
+            "minVolume": { "type": "number" }
+          }
+        },
+        "t200": {
+          "type": "object",
+          "properties": {
+            "minHeight": { "type": "number" },
+            "minVolume": { "type": "number" }
+          }
+        },
+        "t1000": {
+          "type": "object",
+          "properties": {
+            "minHeight": { "type": "number" },
+            "minVolume": { "type": "number" }
+          }
+        }
+      }
     }
   }
 }

package/pipette/schemas/2/pipetteLiquidPropertiesSchema.json

@@ -41,8 +41,7 @@
     "maxVolume",
     "minVolume",
     "defaultTipracks",
-    "supportedTips",
-    "defaultTipOverlapDictionary"
+    "supportedTips"
   ],
   "additionalProperties": false,
   "properties": {
@@ -106,16 +105,6 @@
         }
       }
     },
-    "defaultTipOverlapDictionary": {
-      "type": "object",
-      "description": "Map of tip overlap values with defaults",
-      "required": ["default"],
-      "$comment": "Other keys in here should be labware URIs",
-      "properties": {
-        "default": { "type": "number" }
-      },
-      "additionalProperties": { "type": "number" }
-    },
     "maxVolume": { "$ref": "#/definitions/positiveNumber" },
     "minVolume": { "$ref": "#/definitions/positiveNumber" },
     "defaultTipracks": {

package/pipette/schemas/2/pipettePropertiesSchema.json

@@ -45,22 +45,36 @@
       "type": "number",
       "enum": [1, 2, 3, 4, 5, 6, 7, 8, 12, 96, 384]
     },
-    "distanceByTipCount": {
+    "configurationsByNozzleMap": {
       "type": "object",
-      "patternProperties": {
-        "\\d+": { "$ref": "#/definitions/distanceRange" }
-      }
-    },
-    "speedByTipCount": {
-      "type": "object",
-      "patternProperties": {
-        "\\d+": { "$ref": "#/definitions/speedRange" }
-      }
-    },
-    "currentByTipCount": {
-      "type": "object",
-      "patternProperties": {
-        "\\d+": { "$ref": "#/definitions/currentRange" }
+      "description": "Pipette configurations keyed by validated sets of nozzle layouts. Maps must be ordered from smallest to largest regarding nozzle count.",
+      "items": {
+        "type": "object",
+        "description": "Tip types by which each set of configration values are differentiated.",
+        "required": ["default"],
+        "items": {
+          "speed": { "$ref": "#/definitions/speedRange" },
+          "distance": { "$ref": "#/definitions/distanceRange" },
+          "current": { "$ref": "#/definitions/currentRange" },
+          "tipOverlaps": {
+            "type": "object",
+            "description": "Set of versioned tip overlap values with version 0 acting as the default",
+            "required": ["v0"],
+            "patternProperties": {
+              "^v\\d+$": {
+                "type": "object",
+                "description": "Map of tip overlap values with defaults",
+                "required": ["default"],
+                "$comment": "Other keys in here should be labware URIs",
+                "properties": {
+                  "default": { "type": "number" }
+                },
+                "additionalProperties": { "type": "number" }
+              }
+            },
+            "additionalProperties": false
+          }
+        }
       }
     }
   },
@@ -179,6 +193,18 @@
         "run": { "$ref": "#/definitions/currentRange" }
       }
     },
+    "validNozzleMaps": {
+      "maps": {
+        "description": "The Opentrons validated map configurations for this pipette.",
+        "type": "object",
+        "additionalProperties": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "pickUpTipConfigurations": {
       "description": "Object containing configurations for picking up tips common to all partial configurations",
       "anyOf": [
@@ -188,23 +214,13 @@
           "properties": {
             "pressFit": {
               "type": "object",
-              "required": [
-                "presses",
-                "speedByTipCount",
-                "increment",
-                "distanceByTipCount",
-                "currentByTipCount"
-              ],
+              "required": ["presses", "increment", "configurationsByNozzleMap"],
               "additionalProperties": false,
               "properties": {
                 "presses": { "$ref": "#/definitions/positiveNumber" },
-                "speedByTipCount": { "$ref": "#/definitions/speedByTipCount" },
                 "increment": { "$ref": "#/definitions/positiveNumber" },
-                "distanceByTipCount": {
-                  "$ref": "#/definitions/distanceByTipCount"
-                },
-                "currentByTipCount": {
-                  "$ref": "#/definitions/currentByTipCount"
+                "configurationsByNozzleMap": {
+                  "$ref": "#/definitions/configurationsByNozzleMap"
                 }
               }
             }
@@ -219,9 +235,7 @@
               "required": [
                 "prep_move_distance",
                 "prep_move_speed",
-                "speed",
-                "distance",
-                "currentByTipCount"
+                "configurationsByNozzleMap"
               ],
               "additionalProperties": false,
               "properties": {
@@ -229,10 +243,8 @@
                   "$ref": "#/definitions/positiveNumber"
                 },
                 "prep_move_speed": { "$ref": "#/definitions/positiveNumber" },
-                "speed": { "$ref": "#/definitions/positiveNumber" },
-                "distance": { "$ref": "#/definitions/positiveNumber" },
-                "currentByTipCount": {
-                  "$ref": "#/definitions/currentByTipCount"
+                "configurationsByNozzleMap": {
+                  "$ref": "#/definitions/configurationsByNozzleMap"
                 },
                 "connectTiprackDistanceMM": {
                   "$ref": "#/definitions/positiveNumber"

package/protocol/README.md

@@ -2,7 +2,7 @@
 
 1. Create new JSON schema in `shared-data/protocol/schemas/${schemaVersion}.json`
 2. Create TS types for new schema in `shared-data/protocol/types`
-3. Create or modify Python types as necessary in both `python/opentrons_shared_data/protocol/dev_types` and in the python api `dev_types` in `api/src/opentrons/protocol_api/dev_types.py`
+3. Create or modify Python types as necessary in both `python/opentrons_shared_data/protocol/types` and in the python api `types` in `api/src/opentrons/protocol_api/types.py`
 4. Create new executor in api to handle new schema. Be sure to include unit tests
 5. Add new test in `api/tests/opentrons/test_execute.py` for the schema
 6. Add new test in `shared-data/js/__tests__/protocolSchemaV${schemaVersion}.test.js` to ensure new schema definition functions as intended

package/protocol/fixtures/6/heaterShakerCommands.json

@@ -1241,7 +1241,7 @@
   "commands": [
     {
       "commandType": "loadPipette",
-      "id": "0abc123",
+      "key": "0abc123",
       "params": {
         "pipetteId": "pipetteId",
         "mount": "left"
@@ -1249,7 +1249,7 @@
     },
     {
       "commandType": "loadModule",
-      "id": "1abc123",
+      "key": "1abc123",
       "params": {
         "moduleId": "magneticModuleId",
         "location": { "slotName": "3" }
@@ -1257,7 +1257,7 @@
     },
     {
       "commandType": "loadModule",
-      "id": "2abc123",
+      "key": "2abc123",
       "params": {
         "moduleId": "heaterShakerId",
         "location": { "slotName": "1" }
@@ -1265,7 +1265,7 @@
     },
     {
       "commandType": "loadLabware",
-      "id": "3abc123",
+      "key": "3abc123",
       "params": {
         "labwareId": "sourcePlateId",
         "location": {
@@ -1275,7 +1275,7 @@
     },
     {
       "commandType": "loadLabware",
-      "id": "4abc123",
+      "key": "4abc123",
       "params": {
         "labwareId": "destPlateId",
         "location": {
@@ -1285,7 +1285,7 @@
     },
     {
       "commandType": "loadLabware",
-      "id": "5abc123",
+      "key": "5abc123",
       "params": {
         "labwareId": "tipRackId",
         "location": { "slotName": "8" }
@@ -1293,7 +1293,7 @@
     },
     {
       "commandType": "loadLabware",
-      "id": "6abc123",
+      "key": "6abc123",
       "params": {
         "labwareId": "fixedTrash",
         "location": {
@@ -1303,7 +1303,7 @@
     },
     {
       "commandType": "loadLiquid",
-      "id": "7abc123",
+      "key": "7abc123",
       "params": {
         "liquidId": "waterId",
         "labwareId": "sourcePlateId",
@@ -1316,7 +1316,7 @@
 
     {
       "commandType": "pickUpTip",
-      "id": "8abc123",
+      "key": "8abc123",
       "params": {
         "pipetteId": "pipetteId",
         "labwareId": "tipRackId",
@@ -1325,7 +1325,7 @@
     },
     {
       "commandType": "aspirate",
-      "id": "9abc123",
+      "key": "9abc123",
       "params": {
         "pipetteId": "pipetteId",
         "labwareId": "sourcePlateId",
@@ -1340,14 +1340,14 @@
     },
     {
       "commandType": "delay",
-      "id": "10abc123",
+      "key": "10abc123",
       "params": {
         "seconds": 42
       }
     },
     {
       "commandType": "dispense",
-      "id": "11abc123",
+      "key": "11abc123",
       "params": {
         "pipetteId": "pipetteId",
         "labwareId": "destPlateId",
@@ -1362,7 +1362,7 @@
     },
     {
       "commandType": "heaterShaker/setAndWaitForShakeSpeed",
-      "id": "13abc123",
+      "key": "13abc123",
       "params": {
         "moduleId": "heaterShakerId",
         "rpm": 2000
@@ -1370,7 +1370,7 @@
     },
     {
       "commandType": "heaterShaker/setTargetTemperature",
-      "id": "14abc123",
+      "key": "14abc123",
       "params": {
         "moduleId": "heaterShakerId",
         "celsius": 42
@@ -1378,28 +1378,28 @@
     },
     {
       "commandType": "heaterShaker/waitForTemperature",
-      "id": "15abc123",
+      "key": "15abc123",
       "params": {
         "moduleId": "heaterShakerId"
       }
     },
     {
       "commandType": "heaterShaker/openLabwareLatch",
-      "id": "16abc123",
+      "key": "16abc123",
       "params": {
         "moduleId": "heaterShakerId"
       }
     },
     {
       "commandType": "heaterShaker/closeLabwareLatch",
-      "id": "17abc123",
+      "key": "17abc123",
       "params": {
         "moduleId": "heaterShakerId"
       }
     },
     {
       "commandType": "heaterShaker/deactivateHeater",
-      "id": "16abc123",
+      "key": "16abc123",
       "params": {
         "moduleId": "heaterShakerId"
       }

package/protocol/fixtures/6/heaterShakerCommandsWithResultsKey.json

@@ -2494,7 +2494,7 @@
   },
   "commands": [
     {
-      "id": "0",
+      "key": "0",
       "commandType": "loadPipette",
       "params": {
         "pipetteId": "3dff4f90-3412-11eb-ad93-ed232a2337cf",
@@ -2502,7 +2502,7 @@
       }
     },
     {
-      "id": "1",
+      "key": "1",
       "commandType": "loadPipette",
       "params": {
         "pipetteId": "4da579b0-a9bf-11eb-bce6-9f1d5b9c1a1b",
@@ -2510,7 +2510,7 @@
       }
     },
     {
-      "id": "2",
+      "key": "2",
       "commandType": "loadModule",
       "params": {
         "moduleId": "3e012450-3412-11eb-ad93-ed232a2337cf:heaterShakerModuleType",
@@ -2523,7 +2523,7 @@
       }
     },
     {
-      "id": "5",
+      "key": "5",
       "commandType": "loadLabware",
       "params": {
         "labwareId": "fixedTrash",
@@ -2590,7 +2590,7 @@
       }
     },
     {
-      "id": "6",
+      "key": "6",
       "commandType": "loadLabware",
       "params": {
         "labwareId": "3e047fb0-3412-11eb-ad93-ed232a2337cf:opentrons/opentrons_96_tiprack_1000ul/1",
@@ -3622,7 +3622,7 @@
       }
     },
     {
-      "id": "7",
+      "key": "7",
       "commandType": "loadLabware",
       "params": {
         "labwareId": "5ae317e0-3412-11eb-ad93-ed232a2337cf:opentrons/nest_1_reservoir_195ml/1",
@@ -3691,7 +3691,7 @@
       }
     },
     {
-      "id": "8",
+      "key": "8",
       "commandType": "loadLabware",
       "params": {
         "labwareId": "aac5d680-3412-11eb-ad93-ed232a2337cf:opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1",