Skip to content

Commit c7dd9f1

Browse files
sfoster1sfoster1
authored
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.
1 parent 0096c12 commit c7dd9f1

File tree

22 files changed

+6047
-75
lines changed

22 files changed

+6047
-75
lines changed

‎shared-data/js/__tests__/__snapshots__/pipettes.test.ts.snap‎

Lines changed: 5968 additions & 0 deletions
Large diffs are not rendered by default.

‎shared-data/js/__tests__/pipettes.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ describe('pipette data accessors', () => {
8484
'#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
8585
defaultTipOverlapDictionary: {
8686
default: 10.5,
87-
'opentrons/opentrons_flex_96_tiprack_1000ul/1': 9.65,
88-
'opentrons/opentrons_flex_96_tiprack_200ul/1': 9.76,
89-
'opentrons/opentrons_flex_96_tiprack_50ul/1': 10.09,
90-
'opentrons/opentrons_flex_96_filtertiprack_1000ul/1': 9.65,
91-
'opentrons/opentrons_flex_96_filtertiprack_200ul/1': 9.76,
92-
'opentrons/opentrons_flex_96_filtertiprack_50ul/1': 10.09,
87+
'opentrons/opentrons_flex_96_tiprack_1000ul/1': 10.5,
88+
'opentrons/opentrons_flex_96_tiprack_200ul/1': 10.5,
89+
'opentrons/opentrons_flex_96_tiprack_50ul/1': 10.5,
90+
'opentrons/opentrons_flex_96_filtertiprack_1000ul/1': 10.5,
91+
'opentrons/opentrons_flex_96_filtertiprack_200ul/1': 10.5,
92+
'opentrons/opentrons_flex_96_filtertiprack_50ul/1': 10.5,
9393
},
9494
defaultTipracks: [
9595
'opentrons/opentrons_flex_96_tiprack_1000ul/1',
@@ -150,8 +150,8 @@ describe('pipette data accessors', () => {
150150
$otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
151151
defaultTipOverlapDictionary: {
152152
default: 10.5,
153-
[tiprackFilter50uL]: 10.09,
154-
[tiprack50uL]: 10.09,
153+
[tiprackFilter50uL]: 10.5,
154+
[tiprack50uL]: 10.5,
155155
},
156156
defaultTipracks: [tiprack50uL, tiprackFilter50uL],
157157
maxVolume: 50,
@@ -198,8 +198,8 @@ describe('pipette data accessors', () => {
198198
$otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
199199
defaultTipOverlapDictionary: {
200200
default: 10.5,
201-
[tiprackFilter50uL]: 10.09,
202-
[tiprack50uL]: 10.09,
201+
[tiprackFilter50uL]: 10.5,
202+
[tiprack50uL]: 10.5,
203203
},
204204
defaultTipracks: [tiprack50uL, tiprackFilter50uL],
205205
maxVolume: 30,

‎shared-data/js/labwareTools/__tests__/__snapshots__/createIrregularLabware.test.ts.snap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

33
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]`;
4+
5+
exports[`test createIrregularLabware function failing to validate against labware schema throws w/o "strict" 1`] = `"Generated labware failed to validate, please check your inputs"`;

‎shared-data/js/labwareTools/__tests__/__snapshots__/createLabware.test.ts.snap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

33
exports[`createLabware > failing to validate against labware schema throws w/o "strict" 1`] = `[Error: Generated labware failed to validate, please check your inputs]`;
4+
5+
exports[`createLabware failing to validate against labware schema throws w/o "strict" 1`] = `"Generated labware failed to validate, please check your inputs"`;

‎shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_4.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,12 @@
345345
},
346346
"defaultTipOverlapDictionary": {
347347
"default": 10.5,
348-
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.42,
349-
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
350-
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.67,
351-
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.42,
352-
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53,
353-
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.67
348+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
349+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
350+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
351+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
352+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
353+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
354354
},
355355
"maxVolume": 1000,
356356
"minVolume": 5,

‎shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_5.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@
225225
},
226226
"defaultTipOverlapDictionary": {
227227
"default": 10.5,
228-
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.42,
229-
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
230-
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.67,
231-
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.42,
232-
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53,
233-
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.67
228+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
229+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
230+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
231+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
232+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
233+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
234234
},
235235
"maxVolume": 1000,
236236
"minVolume": 5,

‎shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_4.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
},
9292
"defaultTipOverlapDictionary": {
9393
"default": 10.5,
94-
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
95-
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
94+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
95+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
9696
},
9797
"maxVolume": 50,
9898
"minVolume": 5,

‎shared-data/pipette/definitions/2/liquid/eight_channel/p50/default/3_5.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
},
8484
"defaultTipOverlapDictionary": {
8585
"default": 10.5,
86-
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
87-
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
86+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
87+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
8888
},
8989
"maxVolume": 50,
9090
"minVolume": 5,

‎shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_4.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
},
8282
"defaultTipOverlapDictionary": {
8383
"default": 10.5,
84-
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
85-
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
84+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
85+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
8686
},
8787
"maxVolume": 30,
8888
"minVolume": 1,

‎shared-data/pipette/definitions/2/liquid/eight_channel/p50/lowVolumeDefault/3_5.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
},
8282
"defaultTipOverlapDictionary": {
8383
"default": 10.5,
84-
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.53,
85-
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.53
84+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
85+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05
8686
},
8787
"maxVolume": 30,
8888
"minVolume": 1,

0 commit comments

Comments
 (0)