Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(shared-data): add 20ul tips #16885

Draft
wants to merge 5 commits into
base: edge
Choose a base branch
from
Draft

feat(shared-data): add 20ul tips #16885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
497ba89
add the tiprack definitions
ryanthecoder Nov 20, 2024
28aacb7
add the 20 tips to all the pipette defs
ryanthecoder Nov 20, 2024
c844df6
correct the tip length
ryanthecoder Nov 20, 2024
30a5a34
use placeholder functions from the p1000 p96 instead of the p50 so th…
ryanthecoder Nov 20, 2024
c0874ee
fix defs and tests
ryanthecoder Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 84 additions & 4 deletions shared-data/js/__tests__/pipettes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@ describe('pipette data accessors', () => {
'opentrons/opentrons_flex_96_tiprack_1000ul/1',
'opentrons/opentrons_flex_96_tiprack_200ul/1',
'opentrons/opentrons_flex_96_tiprack_50ul/1',
'opentrons/opentrons_flex_96_tiprack_20ul/1',
'opentrons/opentrons_flex_96_filtertiprack_1000ul/1',
'opentrons/opentrons_flex_96_filtertiprack_200ul/1',
'opentrons/opentrons_flex_96_filtertiprack_50ul/1',
'opentrons/opentrons_flex_96_filtertiprack_20ul/1',
],
minVolume: 5,
maxVolume: 1000,
Expand Down Expand Up @@ -170,15 +172,53 @@ describe('pipette data accessors', () => {
})
})
it('returns the correct liquid info for a p50 pipette model version with default and lowVolume', () => {
const tiprack50uL = 'opentrons/opentrons_flex_96_tiprack_50ul/1'
const tiprackFilter50uL = 'opentrons/opentrons_flex_96_filtertiprack_50ul/1'

const mockLiquidDefault = {
$otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
defaultTipracks: [tiprack50uL, tiprackFilter50uL],
defaultTipracks: [
'opentrons/opentrons_flex_96_tiprack_50ul/1',
'opentrons/opentrons_flex_96_tiprack_20ul/1',
'opentrons/opentrons_flex_96_filtertiprack_50ul/1',
'opentrons/opentrons_flex_96_filtertiprack_20ul/1',
],
maxVolume: 50,
minVolume: 5,
supportedTips: {
t20: {
uiMaxFlowRate: 57,
aspirate: {
default: {
1: expect.anything(),
},
},
defaultAspirateFlowRate: {
default: 35,
valuesByApiLevel: {
'2.14': 35,
},
},
defaultBlowOutFlowRate: {
default: 57,
valuesByApiLevel: {
'2.14': 57,
},
},
defaultDispenseFlowRate: {
default: 57,
valuesByApiLevel: {
'2.14': 57,
},
},
defaultFlowAcceleration: 1200,
defaultPushOutVolume: 2,
defaultReturnTipHeight: 0.71,
defaultTipLength: 52.0,
dispense: {
default: {
1: expect.anything(),
},
},
},
t50: {
uiMaxFlowRate: 57,
aspirate: {
Expand Down Expand Up @@ -218,10 +258,50 @@ describe('pipette data accessors', () => {
} as PipetteV2LiquidSpecs
const mockLiquidLowVolume = {
$otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
defaultTipracks: [tiprack50uL, tiprackFilter50uL],
defaultTipracks: [
'opentrons/opentrons_flex_96_tiprack_50ul/1',
'opentrons/opentrons_flex_96_tiprack_20ul/1',
'opentrons/opentrons_flex_96_filtertiprack_50ul/1',
'opentrons/opentrons_flex_96_filtertiprack_20ul/1',
],
maxVolume: 30,
minVolume: 1,
supportedTips: {
t20: {
uiMaxFlowRate: 26.7,
aspirate: {
default: {
1: expect.anything(),
},
},
defaultAspirateFlowRate: {
default: 26.7,
valuesByApiLevel: {
'2.14': 26.7,
},
},
defaultBlowOutFlowRate: {
default: 26.7,
valuesByApiLevel: {
'2.14': 26.7,
},
},
defaultDispenseFlowRate: {
default: 26.7,
valuesByApiLevel: {
'2.14': 26.7,
},
},
defaultFlowAcceleration: 1200,
defaultPushOutVolume: 7,
defaultReturnTipHeight: 0.71,
defaultTipLength: 52.0,
dispense: {
default: {
1: expect.anything(),
},
},
},
t50: {
uiMaxFlowRate: 26.7,
aspirate: {
Expand Down
Loading
Loading