Skip to content

Commit c80798d

Browse files
refactor(shared-data): update 96-channel liquid handling functions (#13993)
Updates from hardware for 96 channel ul/mm --------- Co-authored-by: Seth Foster <[email protected]>
1 parent 67d3c55 commit c80798d

File tree

5 files changed

+400
-1240
lines changed

5 files changed

+400
-1240
lines changed

shared-data/pipette/definitions/2/liquid/ninety_six_channel/p1000/default/1_0.json

+80-248
Original file line numberDiff line numberDiff line change
@@ -20,96 +20,36 @@
2020
"aspirate": {
2121
"default": {
2222
"1": [
23-
[0.4148, -1705.1015, 20.5455],
24-
[0.4476, -80.633, 47.2788],
25-
[0.5512, -1.5936, 11.9026],
26-
[0.6027, -18.9998, 21.4972],
27-
[0.6503, -15.8781, 19.6156],
28-
[0.7733, 3.0612, 7.2993],
29-
[0.8391, -5.2227, 13.7056],
30-
[0.9736, 3.0706, 6.7467],
31-
[1.16, -0.374, 10.1005],
32-
[1.3964, 1.3004, 8.1582],
33-
[1.5815, -0.4837, 10.6494],
34-
[1.8306, 1.1464, 8.0714],
35-
[2.0345, 0.0132, 10.1459],
36-
[2.6221, 0.5374, 9.0794],
37-
[2.9655, -1.7582, 15.0986],
38-
[3.5124, 0.2754, 9.0681],
39-
[4.6591, 1.406, 5.097],
40-
[5.367, 0.394, 9.8123],
41-
[6.0839, 0.3365, 10.1205],
42-
[6.8312, 0.3379, 10.1121],
43-
[7.5676, 0.2611, 10.637],
44-
[8.2397, 0.095, 11.8939],
45-
[8.9776, 0.2015, 11.0165],
46-
[10.413, 0.1332, 11.6294],
47-
[11.8539, 0.1074, 11.8979],
48-
[13.3655, 0.1286, 11.6464],
49-
[14.8236, 0.0758, 12.3519],
50-
[16.3203, 0.083, 12.2457],
51-
[17.7915, 0.0581, 12.6515],
52-
[19.2145, 0.0273, 13.1995],
53-
[20.6718, 0.0388, 12.9792],
54-
[22.1333, 0.0357, 13.044],
55-
[25.0761, 0.0332, 13.0977],
56-
[28.0339, 0.029, 13.2035],
57-
[30.967, 0.0201, 13.4538],
58-
[33.8727, 0.013, 13.6737],
59-
[36.8273, 0.0172, 13.5324],
60-
[39.7594, 0.0121, 13.7191],
61-
[42.6721, 0.0083, 13.8687],
62-
[45.5964, 0.0085, 13.8618],
63-
[48.5297, 0.0084, 13.8668],
64-
[51.4512, 0.0064, 13.9651]
23+
[1.933333, 2.844459, 4.750159],
24+
[2.833333, 1.12901, 8.066694],
25+
[3.603333, 0.254744, 10.543779],
26+
[4.836667, 1.101839, 7.491414],
27+
[5.755, 0.277649, 11.47775],
28+
[6.643333, 0.14813, 12.223126],
29+
[7.548333, 0.145635, 12.239705],
30+
[8.475, 0.15097, 12.199433],
31+
[13.02, 0.071736, 12.870946],
32+
[22.318333, 0.042305, 13.254131],
33+
[36.463333, 0.021195, 13.725284],
34+
[54.82, 0.001805, 14.43229]
6535
]
6636
}
6737
},
6838
"dispense": {
6939
"default": {
7040
"1": [
71-
[0.4148, -1705.1015, 20.5455],
72-
[0.4476, -80.633, 47.2788],
73-
[0.5512, -1.5936, 11.9026],
74-
[0.6027, -18.9998, 21.4972],
75-
[0.6503, -15.8781, 19.6156],
76-
[0.7733, 3.0612, 7.2993],
77-
[0.8391, -5.2227, 13.7056],
78-
[0.9736, 3.0706, 6.7467],
79-
[1.16, -0.374, 10.1005],
80-
[1.3964, 1.3004, 8.1582],
81-
[1.5815, -0.4837, 10.6494],
82-
[1.8306, 1.1464, 8.0714],
83-
[2.0345, 0.0132, 10.1459],
84-
[2.6221, 0.5374, 9.0794],
85-
[2.9655, -1.7582, 15.0986],
86-
[3.5124, 0.2754, 9.0681],
87-
[4.6591, 1.406, 5.097],
88-
[5.367, 0.394, 9.8123],
89-
[6.0839, 0.3365, 10.1205],
90-
[6.8312, 0.3379, 10.1121],
91-
[7.5676, 0.2611, 10.637],
92-
[8.2397, 0.095, 11.8939],
93-
[8.9776, 0.2015, 11.0165],
94-
[10.413, 0.1332, 11.6294],
95-
[11.8539, 0.1074, 11.8979],
96-
[13.3655, 0.1286, 11.6464],
97-
[14.8236, 0.0758, 12.3519],
98-
[16.3203, 0.083, 12.2457],
99-
[17.7915, 0.0581, 12.6515],
100-
[19.2145, 0.0273, 13.1995],
101-
[20.6718, 0.0388, 12.9792],
102-
[22.1333, 0.0357, 13.044],
103-
[25.0761, 0.0332, 13.0977],
104-
[28.0339, 0.029, 13.2035],
105-
[30.967, 0.0201, 13.4538],
106-
[33.8727, 0.013, 13.6737],
107-
[36.8273, 0.0172, 13.5324],
108-
[39.7594, 0.0121, 13.7191],
109-
[42.6721, 0.0083, 13.8687],
110-
[45.5964, 0.0085, 13.8618],
111-
[48.5297, 0.0084, 13.8668],
112-
[51.4512, 0.0064, 13.9651]
41+
[1.933333, 2.844459, 4.750159],
42+
[2.833333, 1.12901, 8.066694],
43+
[3.603333, 0.254744, 10.543779],
44+
[4.836667, 1.101839, 7.491414],
45+
[5.755, 0.277649, 11.47775],
46+
[6.643333, 0.14813, 12.223126],
47+
[7.548333, 0.145635, 12.239705],
48+
[8.475, 0.15097, 12.199433],
49+
[13.02, 0.071736, 12.870946],
50+
[22.318333, 0.042305, 13.254131],
51+
[36.463333, 0.021195, 13.725284],
52+
[54.82, 0.001805, 14.43229]
11353
]
11454
}
11555
},
@@ -134,94 +74,34 @@
13474
"aspirate": {
13575
"default": {
13676
"1": [
137-
[0.8314, -2.9322, 24.0741],
138-
[0.8853, -30.0996, 48.7784],
139-
[0.9778, -4.3627, 25.9941],
140-
[0.975, 802.2301, -762.6744],
141-
[1.1272, -4.6837, 24.0666],
142-
[1.2747, -3.91, 23.1945],
143-
[1.5656, -2.8032, 21.7836],
144-
[1.6667, -7.2039, 28.6731],
145-
[2.4403, -0.5147, 17.5244],
146-
[3.0564, -1.6013, 20.1761],
147-
[3.6444, -1.1974, 18.9418],
148-
[4.1189, -1.7877, 21.0928],
149-
[4.6467, -0.8591, 17.2684],
150-
[5.2597, -0.207, 14.2379],
151-
[5.8581, -0.2196, 14.3044],
152-
[6.4772, -0.1025, 13.6183],
153-
[7.8158, 0.0537, 12.6063],
154-
[9.1664, 0.0507, 12.6302],
155-
[10.5064, 0.0285, 12.8339],
156-
[14.8361, 0.0818, 12.273],
157-
[19.3933, 0.0801, 12.2991],
158-
[23.9242, 0.0487, 12.9079],
159-
[28.4922, 0.0379, 13.1666],
160-
[36.145, 0.0277, 13.4572],
161-
[43.7972, 0.0184, 13.7916],
162-
[51.5125, 0.0154, 13.9248],
163-
[59.2467, 0.0121, 14.0931],
164-
[66.9428, 0.0084, 14.3151],
165-
[74.6853, 0.0079, 14.3498],
166-
[82.3722, 0.0052, 14.5512],
167-
[90.1106, 0.0054, 14.5333],
168-
[97.8369, 0.0043, 14.6288],
169-
[105.6153, 0.0046, 14.5983],
170-
[113.3686, 0.0036, 14.7076],
171-
[121.1108, 0.003, 14.7785],
172-
[136.61, 0.0026, 14.826],
173-
[152.0708, 0.0018, 14.9298],
174-
[167.6433, 0.0021, 14.8827],
175-
[183.1011, 0.0012, 15.0438],
176-
[198.5845, 0.0011, 15.0538],
177-
[214.0264, 0.0008, 15.123]
77+
[1.39875, 4.681865, 0.866627],
78+
[2.5225, 2.326382, 4.161359],
79+
[3.625, 1.361424, 6.595466],
80+
[4.69125, 0.848354, 8.455342],
81+
[5.705, 0.519685, 9.997214],
82+
[6.70625, 0.36981, 10.852249],
83+
[7.69375, 0.267029, 11.541523],
84+
[8.67875, 0.210129, 11.979299],
85+
[47.05, 0.030309, 13.539909],
86+
[95.24375, 0.003774, 14.78837],
87+
[211.0225, 0.000928, 15.059476]
17888
]
17989
}
18090
},
18191
"dispense": {
18292
"default": {
18393
"1": [
184-
[0.8314, -2.9322, 24.0741],
185-
[0.8853, -30.0996, 48.7784],
186-
[0.9778, -4.3627, 25.9941],
187-
[0.975, 802.2301, -762.6744],
188-
[1.1272, -4.6837, 24.0666],
189-
[1.2747, -3.91, 23.1945],
190-
[1.5656, -2.8032, 21.7836],
191-
[1.6667, -7.2039, 28.6731],
192-
[2.4403, -0.5147, 17.5244],
193-
[3.0564, -1.6013, 20.1761],
194-
[3.6444, -1.1974, 18.9418],
195-
[4.1189, -1.7877, 21.0928],
196-
[4.6467, -0.8591, 17.2684],
197-
[5.2597, -0.207, 14.2379],
198-
[5.8581, -0.2196, 14.3044],
199-
[6.4772, -0.1025, 13.6183],
200-
[7.8158, 0.0537, 12.6063],
201-
[9.1664, 0.0507, 12.6302],
202-
[10.5064, 0.0285, 12.8339],
203-
[14.8361, 0.0818, 12.273],
204-
[19.3933, 0.0801, 12.2991],
205-
[23.9242, 0.0487, 12.9079],
206-
[28.4922, 0.0379, 13.1666],
207-
[36.145, 0.0277, 13.4572],
208-
[43.7972, 0.0184, 13.7916],
209-
[51.5125, 0.0154, 13.9248],
210-
[59.2467, 0.0121, 14.0931],
211-
[66.9428, 0.0084, 14.3151],
212-
[74.6853, 0.0079, 14.3498],
213-
[82.3722, 0.0052, 14.5512],
214-
[90.1106, 0.0054, 14.5333],
215-
[97.8369, 0.0043, 14.6288],
216-
[105.6153, 0.0046, 14.5983],
217-
[113.3686, 0.0036, 14.7076],
218-
[121.1108, 0.003, 14.7785],
219-
[136.61, 0.0026, 14.826],
220-
[152.0708, 0.0018, 14.9298],
221-
[167.6433, 0.0021, 14.8827],
222-
[183.1011, 0.0012, 15.0438],
223-
[198.5845, 0.0011, 15.0538],
224-
[214.0264, 0.0008, 15.123]
94+
[1.39875, 4.681865, 0.866627],
95+
[2.5225, 2.326382, 4.161359],
96+
[3.625, 1.361424, 6.595466],
97+
[4.69125, 0.848354, 8.455342],
98+
[5.705, 0.519685, 9.997214],
99+
[6.70625, 0.36981, 10.852249],
100+
[7.69375, 0.267029, 11.541523],
101+
[8.67875, 0.210129, 11.979299],
102+
[47.05, 0.030309, 13.539909],
103+
[95.24375, 0.003774, 14.78837],
104+
[211.0225, 0.000928, 15.059476]
225105
]
226106
}
227107
},
@@ -246,94 +126,46 @@
246126
"aspirate": {
247127
"default": {
248128
"1": [
249-
[0.7511, 3.9556, 6.455],
250-
[1.3075, 2.1664, 5.8839],
251-
[1.8737, 1.1513, 7.2111],
252-
[3.177, 0.9374, 7.612],
253-
[4.5368, 0.5531, 8.8328],
254-
[7.3103, 0.3035, 9.9651],
255-
[10.0825, 0.1513, 11.0781],
256-
[12.9776, 0.1293, 11.2991],
257-
[15.9173, 0.0976, 11.7115],
258-
[18.8243, 0.0624, 12.2706],
259-
[21.8529, 0.07, 12.1275],
260-
[24.8068, 0.0418, 12.7442],
261-
[27.7744, 0.0356, 12.8984],
262-
[35.2873, 0.0303, 13.0454],
263-
[42.7989, 0.0202, 13.4038],
264-
[50.4562, 0.0196, 13.4293],
265-
[58.1081, 0.0145, 13.6843],
266-
[65.7267, 0.0104, 13.9252],
267-
[73.2857, 0.0068, 14.1606],
268-
[81.0016, 0.0091, 13.9883],
269-
[88.6617, 0.0064, 14.2052],
270-
[103.9829, 0.0051, 14.3271],
271-
[119.4408, 0.0049, 14.3475],
272-
[134.889, 0.0037, 14.485],
273-
[150.273, 0.0026, 14.6402],
274-
[181.2798, 0.0026, 14.6427],
275-
[212.4724, 0.0022, 14.7002],
276-
[243.577, 0.0015, 14.8558],
277-
[274.7216, 0.0012, 14.9205],
278-
[305.8132, 0.0009, 15.0118],
279-
[368.0697, 0.0007, 15.0668],
280-
[430.2513, 0.0005, 15.1594],
281-
[492.3487, 0.0003, 15.2291],
282-
[554.5713, 0.0003, 15.2367],
283-
[616.6825, 0.0002, 15.2949],
284-
[694.4168, 0.0002, 15.3027],
285-
[772.0327, 0.0001, 15.3494],
286-
[849.617, 0.0001, 15.3717],
287-
[927.2556, 0.0001, 15.3745],
288-
[1004.87, 0.0001, 15.3912],
289-
[1051.4648, 0.0001, 15.391]
129+
[3.76, 2.041301, 4.284751],
130+
[5.684286, 0.49624, 10.09418],
131+
[8.445714, 0.187358, 11.849952],
132+
[12.981429, 0.073135, 12.814653],
133+
[17.667143, 0.060853, 12.974083],
134+
[46.515714, 0.025888, 13.591828],
135+
[95.032857, 0.006561, 14.490827],
136+
[114.488571, 0.00306, 14.823556],
137+
[192.228571, 0.001447, 15.00822],
138+
[309.921429, 0.000995, 15.095087],
139+
[436.984286, 0.000322, 15.303634],
140+
[632.861429, 0.000208, 15.353582],
141+
[828.952857, 0.00013, 15.402544],
142+
[976.118571, 0.000095, 15.431673],
143+
[1005.275714, -0.000067, 15.589843],
144+
[1024.768571, -0.000021, 15.543681],
145+
[1049.145714, -0.000013, 15.535884]
290146
]
291147
}
292148
},
293149
"dispense": {
294150
"default": {
295151
"1": [
296-
[0.7511, 3.9556, 6.455],
297-
[1.3075, 2.1664, 5.8839],
298-
[1.8737, 1.1513, 7.2111],
299-
[3.177, 0.9374, 7.612],
300-
[4.5368, 0.5531, 8.8328],
301-
[7.3103, 0.3035, 9.9651],
302-
[10.0825, 0.1513, 11.0781],
303-
[12.9776, 0.1293, 11.2991],
304-
[15.9173, 0.0976, 11.7115],
305-
[18.8243, 0.0624, 12.2706],
306-
[21.8529, 0.07, 12.1275],
307-
[24.8068, 0.0418, 12.7442],
308-
[27.7744, 0.0356, 12.8984],
309-
[35.2873, 0.0303, 13.0454],
310-
[42.7989, 0.0202, 13.4038],
311-
[50.4562, 0.0196, 13.4293],
312-
[58.1081, 0.0145, 13.6843],
313-
[65.7267, 0.0104, 13.9252],
314-
[73.2857, 0.0068, 14.1606],
315-
[81.0016, 0.0091, 13.9883],
316-
[88.6617, 0.0064, 14.2052],
317-
[103.9829, 0.0051, 14.3271],
318-
[119.4408, 0.0049, 14.3475],
319-
[134.889, 0.0037, 14.485],
320-
[150.273, 0.0026, 14.6402],
321-
[181.2798, 0.0026, 14.6427],
322-
[212.4724, 0.0022, 14.7002],
323-
[243.577, 0.0015, 14.8558],
324-
[274.7216, 0.0012, 14.9205],
325-
[305.8132, 0.0009, 15.0118],
326-
[368.0697, 0.0007, 15.0668],
327-
[430.2513, 0.0005, 15.1594],
328-
[492.3487, 0.0003, 15.2291],
329-
[554.5713, 0.0003, 15.2367],
330-
[616.6825, 0.0002, 15.2949],
331-
[694.4168, 0.0002, 15.3027],
332-
[772.0327, 0.0001, 15.3494],
333-
[849.617, 0.0001, 15.3717],
334-
[927.2556, 0.0001, 15.3745],
335-
[1004.87, 0.0001, 15.3912],
336-
[1051.4648, 0.0001, 15.391]
152+
[3.76, 2.041301, 4.284751],
153+
[5.684286, 0.49624, 10.09418],
154+
[8.445714, 0.187358, 11.849952],
155+
[12.981429, 0.073135, 12.814653],
156+
[17.667143, 0.060853, 12.974083],
157+
[46.515714, 0.025888, 13.591828],
158+
[95.032857, 0.006561, 14.490827],
159+
[114.488571, 0.00306, 14.823556],
160+
[192.228571, 0.001447, 15.00822],
161+
[309.921429, 0.000995, 15.095087],
162+
[436.984286, 0.000322, 15.303634],
163+
[632.861429, 0.000208, 15.353582],
164+
[828.952857, 0.00013, 15.402544],
165+
[976.118571, 0.000095, 15.431673],
166+
[1005.275714, -0.000067, 15.589843],
167+
[1024.768571, -0.000021, 15.543681],
168+
[1049.145714, -0.000013, 15.535884]
337169
]
338170
}
339171
},

0 commit comments

Comments
 (0)