chore(shared-data): pipette: refactor pickup, drop

These configs had a couple things to change: - pickup and drop actually represent configuration for two different actions: the press fit / plunger eject sequence that the low throughput pipettes do, and the cam action sequence that the high throughput pipettes do when handling a full rack. information was actually overloaded and lost: there was only room for one speed for both separate actions. By separating the configs for each action, we get that information back - fold in the per tip current information into the pickup config so it looks a bit more natural and also can be distributed between the action kinds
Opentrons · Nov 9, 2023 · de6adb5 · de6adb5
1 parent f2ca4d0
commit de6adb5
Show file tree

Hide file tree

Showing 72 changed files with 1,564 additions and 1,224 deletions.
diff --git a/shared-data/js/__tests__/pipetteSchemaV2.test.ts b/shared-data/js/__tests__/pipetteSchemaV2.test.ts
@@ -90,9 +90,8 @@ describe('test schema against all general specs definitions', () => {
   expect(generalPaths.length).toBeGreaterThan(0)
 
   generalPaths.forEach(generalPath => {
-    const generalDef = require(generalPath)
-
     it(`${generalPath} validates against schema`, () => {
+      const generalDef = require(generalPath)
       const valid = validateGeneralSpecs(generalDef)
       const validationErrors = validateGeneralSpecs.errors
       expect(validationErrors).toBe(null)

diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json
@@ -4,17 +4,28 @@
   "model": "p10",
   "displayCategory": "GEN1",
   "pickUpTipConfigurations": {
-    "speed": 30.0,
-    "presses": 3,
-    "increment": 1.0,
-    "distance": 10.0
+    "pressFit": {
+      "speed": 30.0,
+      "presses": 3,
+      "increment": 1.0,
+      "distance": 10.0,
+      "currentByTipCount": {
+        "1": 0.1,
+        "2": 0.1,
+        "3": 0.15,
+        "4": 0.2,
+        "5": 0.25,
+        "6": 0.3,
+        "7": 0.35,
+        "8": 0.4
+      }
+    }
   },
   "dropTipConfigurations": {
-    "current": 0.5,
-    "speed": 5.0,
-    "presses": 0,
-    "increment": 0.0,
-    "distance": 0.0
+    "plungerEject": {
+      "current": 0.5,
+      "speed": 5.0
+    }
   },
   "plungerMotorConfigurations": {
     "idle": 0.05,
@@ -33,17 +44,7 @@
   },
   "partialTipConfigurations": {
     "partialTipSupported": true,
-    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8],
-    "perTipPickupCurrent": {
-      "1": 0.1,
-      "2": 0.1,
-      "3": 0.15,
-      "4": 0.2,
-      "5": 0.25,
-      "6": 0.3,
-      "7": 0.35,
-      "8": 0.4
-    }
+    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
   },
   "channels": 8,
   "shaftDiameter": 1.0,

diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json
@@ -4,17 +4,28 @@
   "model": "p10",
   "displayCategory": "GEN1",
   "pickUpTipConfigurations": {
-    "speed": 30.0,
-    "presses": 3,
-    "increment": 1.0,
-    "distance": 10.0
+    "pressFit": {
+      "speed": 30.0,
+      "presses": 3,
+      "increment": 1.0,
+      "distance": 10.0,
+      "currentByTipCount": {
+        "1": 0.1,
+        "2": 0.1,
+        "3": 0.15,
+        "4": 0.2,
+        "5": 0.25,
+        "6": 0.3,
+        "7": 0.35,
+        "8": 0.4
+      }
+    }
   },
   "dropTipConfigurations": {
-    "current": 0.5,
-    "speed": 5.0,
-    "presses": 0,
-    "increment": 0.0,
-    "distance": 0.0
+    "plungerEject": {
+      "current": 0.5,
+      "speed": 5.0
+    }
   },
   "plungerMotorConfigurations": {
     "idle": 0.05,
@@ -33,17 +44,7 @@
   },
   "partialTipConfigurations": {
     "partialTipSupported": true,
-    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8],
-    "perTipPickupCurrent": {
-      "1": 0.1,
-      "2": 0.1,
-      "3": 0.15,
-      "4": 0.2,
-      "5": 0.25,
-      "6": 0.3,
-      "7": 0.35,
-      "8": 0.4
-    }
+    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
   },
   "channels": 8,
   "shaftDiameter": 1.0,

diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json
@@ -4,17 +4,28 @@
   "model": "p10",
   "displayCategory": "GEN1",
   "pickUpTipConfigurations": {
-    "speed": 30.0,
-    "presses": 3,
-    "increment": 1.0,
-    "distance": 10.0
+    "pressFit": {
+      "speed": 30.0,
+      "presses": 3,
+      "increment": 1.0,
+      "distance": 10.0,
+      "currentByTipCount": {
+        "1": 0.1,
+        "2": 0.1,
+        "3": 0.15,
+        "4": 0.2,
+        "5": 0.25,
+        "6": 0.3,
+        "7": 0.35,
+        "8": 0.4
+      }
+    }
   },
   "dropTipConfigurations": {
-    "current": 0.5,
-    "speed": 5.0,
-    "presses": 0,
-    "increment": 0.0,
-    "distance": 0.0
+    "plungerEject": {
+      "current": 0.5,
+      "speed": 5.0
+    }
   },
   "plungerMotorConfigurations": {
     "idle": 0.05,
@@ -33,17 +44,7 @@
   },
   "partialTipConfigurations": {
     "partialTipSupported": true,
-    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8],
-    "perTipPickupCurrent": {
-      "1": 0.1,
-      "2": 0.1,
-      "3": 0.15,
-      "4": 0.2,
-      "5": 0.25,
-      "6": 0.3,
-      "7": 0.35,
-      "8": 0.4
-    }
+    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
   },
   "channels": 8,
   "shaftDiameter": 1.0,

diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json
@@ -4,17 +4,28 @@
   "model": "p10",
   "displayCategory": "GEN1",
   "pickUpTipConfigurations": {
-    "speed": 30.0,
-    "presses": 3,
-    "increment": 3.0,
-    "distance": 10.0
+    "pressFit": {
+      "speed": 30.0,
+      "presses": 3,
+      "increment": 3.0,
+      "distance": 10.0,
+      "currentByTipCount": {
+        "1": 0.1,
+        "2": 0.14,
+        "3": 0.21,
+        "4": 0.28,
+        "5": 0.34,
+        "6": 0.41,
+        "7": 0.48,
+        "8": 0.55
+      }
+    }
   },
   "dropTipConfigurations": {
-    "current": 0.5,
-    "speed": 5.0,
-    "presses": 0,
-    "increment": 0.0,
-    "distance": 0.0
+    "plungerEject": {
+      "current": 0.5,
+      "speed": 5.0
+    }
   },
   "plungerMotorConfigurations": {
     "idle": 0.05,
@@ -33,17 +44,7 @@
   },
   "partialTipConfigurations": {
     "partialTipSupported": true,
-    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8],
-    "perTipPickupCurrent": {
-      "1": 0.1,
-      "2": 0.14,
-      "3": 0.21,
-      "4": 0.28,
-      "5": 0.34,
-      "6": 0.41,
-      "7": 0.48,
-      "8": 0.55
-    }
+    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
   },
   "channels": 8,
   "shaftDiameter": 1.0,

diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json b/shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json
@@ -4,17 +4,28 @@
   "model": "p10",
   "displayCategory": "GEN1",
   "pickUpTipConfigurations": {
-    "speed": 30.0,
-    "presses": 3,
-    "increment": 3.0,
-    "distance": 10.0
+    "pressFit": {
+      "speed": 30.0,
+      "presses": 3,
+      "increment": 3.0,
+      "distance": 10.0,
+      "currentByTipCount": {
+        "1": 0.1,
+        "2": 0.14,
+        "3": 0.21,
+        "4": 0.28,
+        "5": 0.34,
+        "6": 0.41,
+        "7": 0.48,
+        "8": 0.55
+      }
+    }
   },
   "dropTipConfigurations": {
-    "current": 0.5,
-    "speed": 5.0,
-    "presses": 0,
-    "increment": 0.0,
-    "distance": 0.0
+    "plungerEject": {
+      "current": 0.5,
+      "speed": 5.0
+    }
   },
   "plungerMotorConfigurations": {
     "idle": 0.05,
@@ -33,17 +44,7 @@
   },
   "partialTipConfigurations": {
     "partialTipSupported": true,
-    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8],
-    "perTipPickupCurrent": {
-      "1": 0.1,
-      "2": 0.14,
-      "3": 0.21,
-      "4": 0.28,
-      "5": 0.34,
-      "6": 0.41,
-      "7": 0.48,
-      "8": 0.55
-    }
+    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
   },
   "channels": 8,
   "shaftDiameter": 1.0,

diff --git a/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json b/shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json
@@ -4,14 +4,28 @@
   "model": "p1000",
   "displayCategory": "FLEX",
   "pickUpTipConfigurations": {
-    "presses": 1,
-    "speed": 10,
-    "increment": 0.0,
-    "distance": 13.0
+    "pressFit": {
+      "presses": 1,
+      "speed": 10,
+      "increment": 0.0,
+      "distance": 13.0,
+      "currentByTipCount": {
+        "1": 0.15,
+        "2": 0.13,
+        "3": 0.19,
+        "4": 0.25,
+        "5": 0.31,
+        "6": 0.38,
+        "7": 0.44,
+        "8": 0.5
+      }
+    }
   },
   "dropTipConfigurations": {
-    "current": 1.0,
-    "speed": 10
+    "plungerEject": {
+      "current": 1.0,
+      "speed": 10
+    }
   },
   "plungerMotorConfigurations": {
     "idle": 0.3,
@@ -39,17 +53,7 @@
   },
   "partialTipConfigurations": {
     "partialTipSupported": true,
-    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8],
-    "perTipPickupCurrent": {
-      "1": 0.15,
-      "2": 0.13,
-      "3": 0.19,
-      "4": 0.25,
-      "5": 0.31,
-      "6": 0.38,
-      "7": 0.44,
-      "8": 0.5
-    }
+    "availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
   },
   "backCompatNames": [],
   "channels": 8,