Skip to content

Commit

Permalink
refactor(shared-data): add filter tipracks to pipette defaultTipracks (
Browse files Browse the repository at this point in the history
  • Loading branch information
jerader authored Mar 27, 2024
1 parent 4454df6 commit 8653b07
Show file tree
Hide file tree
Showing 33 changed files with 194 additions and 608 deletions.
14 changes: 12 additions & 2 deletions shared-data/js/__tests__/pipettes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,17 @@ describe('pipette data accessors', () => {
'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',
'opentrons/opentrons_flex_96_tiprack_200ul/1',
'opentrons/opentrons_flex_96_tiprack_50ul/1',
'opentrons/opentrons_flex_96_filtertiprack_1000ul/1',
'opentrons/opentrons_flex_96_filtertiprack_200ul/1',
'opentrons/opentrons_flex_96_filtertiprack_50ul/1',
],
minVolume: 5,
maxVolume: 1000,
Expand Down Expand Up @@ -138,13 +144,16 @@ describe('pipette data accessors', () => {
})
it('returns the correct liquid info for a p50 pipette 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',
defaultTipOverlapDictionary: {
default: 10.5,
[tiprackFilter50uL]: 10.5,
[tiprack50uL]: 10.5,
},
defaultTipracks: [tiprack50uL],
defaultTipracks: [tiprack50uL, tiprackFilter50uL],
maxVolume: 50,
minVolume: 5,
supportedTips: {
Expand Down Expand Up @@ -188,9 +197,10 @@ describe('pipette data accessors', () => {
$otSharedSchema: '#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json',
defaultTipOverlapDictionary: {
default: 10.5,
[tiprackFilter50uL]: 10.5,
[tiprack50uL]: 10.5,
},
defaultTipracks: [tiprack50uL],
defaultTipracks: [tiprack50uL, tiprackFilter50uL],
maxVolume: 30,
minVolume: 1,
supportedTips: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,8 @@
},
"maxVolume": 50,
"minVolume": 5,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,8 @@
},
"maxVolume": 50,
"minVolume": 5,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,8 @@
},
"maxVolume": 50,
"minVolume": 5,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,8 @@
},
"maxVolume": 50,
"minVolume": 5,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,8 @@
},
"maxVolume": 30,
"minVolume": 1,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,8 @@
},
"maxVolume": 30,
"minVolume": 1,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,8 @@
},
"maxVolume": 30,
"minVolume": 1,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,8 @@
},
"maxVolume": 30,
"minVolume": 1,
"defaultTipracks": ["opentrons/opentrons_flex_96_tiprack_50ul/1"]
"defaultTipracks": [
"opentrons/opentrons_flex_96_tiprack_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,19 @@
"default": 10.5,
"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_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,
"defaultTipracks": [
"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_50ul/1",
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1",
"opentrons/opentrons_flex_96_filtertiprack_200ul/1",
"opentrons/opentrons_flex_96_filtertiprack_50ul/1"
]
}
Loading

0 comments on commit 8653b07

Please sign in to comment.