Skip to content

Commit 54a4017

Browse files
ryanthecoderryanthecoder
authored
feat(shared-data): add peak shared data definition (#16876)
<!-- Thanks for taking the time to open a Pull Request (PR)! Please make sure you've read the "Opening Pull Requests" section of our Contributing Guide: https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests GitHub provides robust markdown to format your PR. Links, diagrams, pictures, and videos along with text formatting make it possible to create a rich and informative PR. For more information on GitHub markdown, see: https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax To ensure your code is reviewed quickly and thoroughly, please fill out the sections below to the best of your ability! --> # Overview This new pipette type features a different threaded rod drive nut and some other mechanical changes that increase the maximum speed that the plunger can move so that this pipette can be used in emulsification applications. <!-- Describe your PR at a high level. State acceptance criteria and how this PR fits into other work. Link issues, PRs, and other relevant resources. --> ## Test Plan and Hands on Testing <!-- Describe your testing of the PR. Emphasize testing not reflected in the code. Attach protocols, logs, screenshots and any other assets that support your testing. --> ## Changelog <!-- List changes introduced by this PR considering future developers and the end user. Give careful thought and clear documentation to breaking changes. --> ## Review requests <!-- - What do you need from reviewers to feel confident this PR is ready to merge? - Ask questions. --> ## Risk assessment <!-- - Indicate the level of attention this PR needs. - Provide context to guide reviewers. - Discuss trade-offs, coupling, and side effects. - Look for the possibility, even if you think it's small, that your change may affect some other part of the system. - For instance, changing return tip behavior may also change the behavior of labware calibration. - How do your unit tests and on hands on testing mitigate this PR's risks and the risk of future regressions? - Especially in high risk PRs, explain how you know your testing is enough. -->
1 parent 71b21ae commit 54a4017

File tree

11 files changed

+630
-3
lines changed

11 files changed

+630
-3
lines changed

‎shared-data/command/schemas/11.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2690,6 +2690,7 @@
26902690
"p1000_single_gen2",
26912691
"p1000_single_flex",
26922692
"p1000_multi_flex",
2693+
"p1000_multi_emulsify",
26932694
"p1000_96",
26942695
"p200_96"
26952696
],

‎shared-data/pipette/definitions/2/general/eight_channel_emulsify/p1000/3_0.json

Lines changed: 320 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,320 @@
1+
{
2+
"$otSharedSchema": "#/pipette/schemas/2/pipettePropertiesSchema.json",
3+
"displayName": "FLEX 8-Channel Emulsifying 1000 μL",
4+
"model": "p1000",
5+
"displayCategory": "FLEX",
6+
"validNozzleMaps": {
7+
"maps": {
8+
"SingleA1": ["A1"],
9+
"SingleH1": ["H1"],
10+
"H1toG1": ["G1", "H1"],
11+
"H1toF1": ["F1", "G1", "H1"],
12+
"H1toE1": ["E1", "F1", "G1", "H1"],
13+
"H1toD1": ["D1", "E1", "F1", "G1", "H1"],
14+
"H1toC1": ["C1", "D1", "E1", "F1", "G1", "H1"],
15+
"H1toB1": ["B1", "C1", "D1", "E1", "F1", "G1", "H1"],
16+
"Full": ["A1", "B1", "C1", "D1", "E1", "F1", "G1", "H1"]
17+
}
18+
},
19+
"pickUpTipConfigurations": {
20+
"pressFit": {
21+
"presses": 1,
22+
"increment": 0.0,
23+
"configurationsByNozzleMap": {
24+
"SingleA1": {
25+
"default": {
26+
"speed": 10.0,
27+
"distance": 11.0,
28+
"current": 0.15,
29+
"tipOverlaps": {
30+
"v0": {
31+
"default": 10.5,
32+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
33+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
34+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
35+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
36+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
37+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
38+
},
39+
"v1": {
40+
"default": 10.08,
41+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
42+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.08,
43+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.26,
44+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
45+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.08,
46+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.26
47+
}
48+
}
49+
}
50+
},
51+
"SingleH1": {
52+
"default": {
53+
"speed": 10.0,
54+
"distance": 11.0,
55+
"current": 0.15,
56+
"tipOverlaps": {
57+
"v0": {
58+
"default": 10.5,
59+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
60+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
61+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
62+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
63+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
64+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
65+
},
66+
"v1": {
67+
"default": 9.52,
68+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.71,
69+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.52,
70+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.2,
71+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.71,
72+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.52,
73+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.2
74+
}
75+
}
76+
}
77+
},
78+
"H1toG1": {
79+
"default": {
80+
"speed": 10.0,
81+
"distance": 13.0,
82+
"current": 0.2,
83+
"tipOverlaps": {
84+
"v0": {
85+
"default": 10.5,
86+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
87+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
88+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
89+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
90+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
91+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
92+
},
93+
"v1": {
94+
"default": 9.24,
95+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.52,
96+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.24,
97+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.73,
98+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.52,
99+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.24,
100+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.73
101+
}
102+
}
103+
}
104+
},
105+
"H1toF1": {
106+
"default": {
107+
"speed": 10.0,
108+
"distance": 13.0,
109+
"current": 0.2,
110+
"tipOverlaps": {
111+
"v0": {
112+
"default": 10.5,
113+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
114+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
115+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
116+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
117+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
118+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
119+
},
120+
"v1": {
121+
"default": 9.2,
122+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.3,
123+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.2,
124+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.8,
125+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.3,
126+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.2,
127+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.8
128+
}
129+
}
130+
}
131+
},
132+
"H1toE1": {
133+
"default": {
134+
"speed": 10.0,
135+
"distance": 13.0,
136+
"current": 0.35,
137+
"tipOverlaps": {
138+
"v0": {
139+
"default": 10.5,
140+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
141+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
142+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
143+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
144+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
145+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
146+
},
147+
"v1": {
148+
"default": 9.2,
149+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.3,
150+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.2,
151+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.8,
152+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.3,
153+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.2,
154+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.8
155+
}
156+
}
157+
}
158+
},
159+
"H1toD1": {
160+
"default": {
161+
"speed": 10.0,
162+
"distance": 13.0,
163+
"current": 0.4,
164+
"tipOverlaps": {
165+
"v0": {
166+
"default": 10.5,
167+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
168+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
169+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
170+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
171+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
172+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
173+
},
174+
"v1": {
175+
"default": 9.2,
176+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.3,
177+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.2,
178+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.8,
179+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.3,
180+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.2,
181+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.8
182+
}
183+
}
184+
}
185+
},
186+
"H1toC1": {
187+
"default": {
188+
"speed": 10.0,
189+
"distance": 13.0,
190+
"current": 0.4,
191+
"tipOverlaps": {
192+
"v0": {
193+
"default": 10.5,
194+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
195+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
196+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
197+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
198+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
199+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
200+
},
201+
"v1": {
202+
"default": 9.2,
203+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.3,
204+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.2,
205+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.8,
206+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.3,
207+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.2,
208+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.8
209+
}
210+
}
211+
}
212+
},
213+
"H1toB1": {
214+
"default": {
215+
"speed": 10.0,
216+
"distance": 13.0,
217+
"current": 0.5,
218+
"tipOverlaps": {
219+
"v0": {
220+
"default": 10.5,
221+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
222+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
223+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
224+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
225+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
226+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
227+
},
228+
"v1": {
229+
"default": 9.13,
230+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.23,
231+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.13,
232+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.9,
233+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.23,
234+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.13,
235+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.9
236+
}
237+
}
238+
}
239+
},
240+
"Full": {
241+
"default": {
242+
"speed": 10.0,
243+
"distance": 13.0,
244+
"current": 0.55,
245+
"tipOverlaps": {
246+
"v0": {
247+
"default": 10.5,
248+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 10.1,
249+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 10.05,
250+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 10.17,
251+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 10.1,
252+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 10.05,
253+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 10.17
254+
},
255+
"v1": {
256+
"default": 10.5,
257+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.42,
258+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.27,
259+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.67,
260+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.42,
261+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.27,
262+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.67
263+
},
264+
"v3": {
265+
"default": 9.28,
266+
"opentrons/opentrons_flex_96_tiprack_200ul/1": 9.37,
267+
"opentrons/opentrons_flex_96_tiprack_50ul/1": 9.28,
268+
"opentrons/opentrons_flex_96_tiprack_1000ul/1": 9.67,
269+
"opentrons/opentrons_flex_96_filtertiprack_200ul/1": 9.37,
270+
"opentrons/opentrons_flex_96_filtertiprack_50ul/1": 9.28,
271+
"opentrons/opentrons_flex_96_filtertiprack_1000ul/1": 9.67
272+
}
273+
}
274+
}
275+
}
276+
}
277+
}
278+
},
279+
"dropTipConfigurations": {
280+
"plungerEject": {
281+
"current": 1.0,
282+
"speed": 10
283+
}
284+
},
285+
"plungerMotorConfigurations": {
286+
"idle": 0.3,
287+
"run": 1.0
288+
},
289+
"plungerPositionsConfigurations": {
290+
"default": {
291+
"top": 0.0,
292+
"bottom": 71.5,
293+
"blowout": 76.5,
294+
"drop": 91.5
295+
}
296+
},
297+
"availableSensors": {
298+
"sensors": ["capacitive", "environment"],
299+
"capacitive": {
300+
"count": 2
301+
},
302+
"environment": {
303+
"count": 1
304+
}
305+
},
306+
"partialTipConfigurations": {
307+
"partialTipSupported": true,
308+
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
309+
},
310+
"backCompatNames": [],
311+
"channels": 8,
312+
"shaftDiameter": 4.5,
313+
"shaftULperMM": 15.904,
314+
"backlashDistance": 0.1,
315+
"quirks": [],
316+
"plungerHomingConfigurations": {
317+
"current": 1.0,
318+
"speed": 30
319+
}
320+
}

‎shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/3_0.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"$otSharedSchema": "#/pipette/schemas/2/pipetteGeometrySchema.json",
3+
"pathTo3D": "pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf",
4+
"nozzleOffset": [-8.0, -16.0, -259.15],
5+
"pipetteBoundingBoxOffsets": {
6+
"backLeftCorner": [-38.5, 0.0, -259.15],
7+
"frontRightCorner": [11.5, -95.0, -259.15]
8+
},
9+
"orderedRows": [
10+
{
11+
"key": "A",
12+
"orderedNozzles": ["A1"]
13+
},
14+
{
15+
"key": "B",
16+
"orderedNozzles": ["B1"]
17+
},
18+
{ "key": "C", "orderedNozzles": ["C1"] },
19+
{ "key": "D", "orderedNozzles": ["D1"] },
20+
{ "key": "E", "orderedNozzles": ["E1"] },
21+
{ "key": "F", "orderedNozzles": ["F1"] },
22+
{ "key": "G", "orderedNozzles": ["G1"] },
23+
{ "key": "H", "orderedNozzles": ["H1"] }
24+
],
25+
"orderedColumns": [
26+
{
27+
"key": "1",
28+
"orderedNozzles": ["A1", "B1", "C1", "D1", "E1", "F1", "G1", "H1"]
29+
}
30+
],
31+
"nozzleMap": {
32+
"A1": [-8.0, -16.0, -259.15],
33+
"B1": [-8.0, -25.0, -259.15],
34+
"C1": [-8.0, -34.0, -259.15],
35+
"D1": [-8.0, -43.0, -259.15],
36+
"E1": [-8.0, -52.0, -259.15],
37+
"F1": [-8.0, -61.0, -259.15],
38+
"G1": [-8.0, -70.0, -259.15],
39+
"H1": [-8.0, -79.0, -259.15]
40+
},
41+
"lldSettings": {
42+
"t50": {
43+
"minHeight": 1.0,
44+
"minVolume": 0
45+
},
46+
"t200": {
47+
"minHeight": 1.0,
48+
"minVolume": 0
49+
},
50+
"t1000": {
51+
"minHeight": 1.5,
52+
"minVolume": 0
53+
}
54+
}
55+
}

‎shared-data/pipette/definitions/2/geometry/eight_channel_emulsify/p1000/placeholder.gltf

Whitespace-only changes.

0 commit comments

Comments
 (0)