Revert "fix(shared-data) Update tip overlap values for Flex Pipettes … (

#15178) …(#15147)" This reverts commit 0096c12. The above commit needs to be gated behind a protocol API version.
Opentrons · May 14, 2024 · c7dd9f1 · c7dd9f1
1 parent 0096c12
commit c7dd9f1
Show file tree

Hide file tree

Showing 22 changed files with 6,047 additions and 75 deletions.
diff --git a/shared-data/js/__tests__/__snapshots__/pipettes.test.ts.snap b/shared-data/js/__tests__/__snapshots__/pipettes.test.ts.snap
diff --git a/shared-data/js/__tests__/pipettes.test.ts b/shared-data/js/__tests__/pipettes.test.ts
@@ -84,12 +84,12 @@ describe('pipette data accessors', () => {
               '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
             defaultTipOverlapDictionary: {
               default: 10.5,
-              'opentrons/opentrons_flex_96_tiprack_1000ul/1': 9.65,
-              'opentrons/opentrons_flex_96_tiprack_200ul/1': 9.76,
-              'opentrons/opentrons_flex_96_tiprack_50ul/1': 10.09,
-              'opentrons/opentrons_flex_96_filtertiprack_1000ul/1': 9.65,
-              'opentrons/opentrons_flex_96_filtertiprack_200ul/1': 9.76,
-              'opentrons/opentrons_flex_96_filtertiprack_50ul/1': 10.09,
+              'opentrons/opentrons_flex_96_tiprack_1000ul/1': 10.5,
+              'opentrons/opentrons_flex_96_tiprack_200ul/1': 10.5,
+              'opentrons/opentrons_flex_96_tiprack_50ul/1': 10.5,
+              'opentrons/opentrons_flex_96_filtertiprack_1000ul/1': 10.5,
+              'opentrons/opentrons_flex_96_filtertiprack_200ul/1': 10.5,
+              'opentrons/opentrons_flex_96_filtertiprack_50ul/1': 10.5,
             },
             defaultTipracks: [
               'opentrons/opentrons_flex_96_tiprack_1000ul/1',
@@ -150,8 +150,8 @@ describe('pipette data accessors', () => {
       $otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
       defaultTipOverlapDictionary: {
         default: 10.5,
-        [tiprackFilter50uL]: 10.09,
-        [tiprack50uL]: 10.09,
+        [tiprackFilter50uL]: 10.5,
+        [tiprack50uL]: 10.5,
       },
       defaultTipracks: [tiprack50uL, tiprackFilter50uL],
       maxVolume: 50,
@@ -198,8 +198,8 @@ describe('pipette data accessors', () => {
       $otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
       defaultTipOverlapDictionary: {
         default: 10.5,
-        [tiprackFilter50uL]: 10.09,
-        [tiprack50uL]: 10.09,
+        [tiprackFilter50uL]: 10.5,
+        [tiprack50uL]: 10.5,
       },
       defaultTipracks: [tiprack50uL, tiprackFilter50uL],
       maxVolume: 30,

diff --git a/shared-data/js/labwareTools/__tests__/__snapshots__/createIrregularLabware.test.ts.snap b/shared-data/js/labwareTools/__tests__/__snapshots__/createIrregularLabware.test.ts.snap
@@ -1,3 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`test createIrregularLabware function > failing to validate against labware schema throws w/o "strict" 1`] = `[Error: Generated labware failed to validate, please check your inputs]`;
+
+exports[`test createIrregularLabware function failing to validate against labware schema throws w/o "strict" 1`] = `"Generated labware failed to validate, please check your inputs"`;
diff --git a/shared-data/js/labwareTools/__tests__/__snapshots__/createLabware.test.ts.snap b/shared-data/js/labwareTools/__tests__/__snapshots__/createLabware.test.ts.snap
@@ -1,3 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`createLabware > failing to validate against labware schema throws w/o "strict" 1`] = `[Error: Generated labware failed to validate, please check your inputs]`;
+
+exports[`createLabware failing to validate against labware schema throws w/o "strict" 1`] = `"Generated labware failed to validate, please check your inputs"`;
diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_4.json
@@ -345,12 +345,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.42,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.67,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.42,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.67
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json
@@ -225,12 +225,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.42,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.67,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.42,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.67
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_4.json
@@ -91,8 +91,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
   },
   "maxVolume": 50,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json
@@ -83,8 +83,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
   },
   "maxVolume": 50,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_4.json
@@ -81,8 +81,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
   },
   "maxVolume": 30,
   "minVolume": 1,

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json
@@ -81,8 +81,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
   },
   "maxVolume": 30,
   "minVolume": 1,

diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_4.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_4.json
@@ -177,12 +177,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.16,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.21,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.74,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.21,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.74,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.16
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_5.json
@@ -177,12 +177,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.16,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.21,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.74,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.21,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.74,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.16
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_6.json b/shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/3_6.json
@@ -177,9 +177,9 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.16,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.21,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.74
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_4.json
@@ -271,12 +271,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.65,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.76,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.65,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.76,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json
@@ -193,12 +193,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.65,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.76,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.65,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.76,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json
@@ -193,12 +193,12 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.65,
-    "opentrons/opentrons_flex_96_tiprack_200ul/1": 9.76,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.65,
-    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.76,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 1000,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_4.json
@@ -93,8 +93,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 50,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json
@@ -73,8 +73,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 50,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json
@@ -73,8 +73,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 50,
   "minVolume": 5,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_4.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_4.json
@@ -71,8 +71,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 30,
   "minVolume": 1,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json
@@ -69,8 +69,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 30,
   "minVolume": 1,

diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json
@@ -69,8 +69,8 @@
   },
   "defaultTipOverlapDictionary": {
     "default": 10.5,
-    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.09,
-    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.09
+    "opentrons/opentrons_flex_96_tiprack_50ul/1": 10.5,
+    "opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.5
   },
   "maxVolume": 30,
   "minVolume": 1,