Skip to content

Commit

Permalink
feat(api): p1000_single_v2.2, p20_single_v2.2 (#6922)
Browse files Browse the repository at this point in the history 
Adds data for new pipette models P1000 Single V2.2 and P20 Single V2.2.
These models are required by pipetting function changes.

Co-authored-by: XiaoLing-git <[email protected]>
  • Loading branch information
@sfoster1 @XiaoLing-git
sfoster1 and XiaoLing-git authored Nov 6, 2020
1 parent 88761ed commit 14659b8
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 60 deletions.
6 changes: 4 additions & 2 deletions api/src/opentrons/tools/write_pipette_memory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# must iterate through v1.4 and v1.3 first, because v1 barcodes did not
# have characters to specify the version number
VERSIONS = ['v2.1', 'v2', 'v1.6', 'v1.5', 'v1.4', 'v1.3', 'v1']
VERSIONS = ['v2.2', 'v2.1', 'v2', 'v1.6', 'v1.5', 'v1.4', 'v1.3', 'v1']

MODELS = {
'v1': {
Expand Down Expand Up @@ -62,7 +62,9 @@
'P20MV21': 'p20_multi_v2.1',
},
'v2.2': {
'P20MV22': 'p20_multi_v2.2'
'P20MV22': 'p20_multi_v2.2',
'P20SV22': 'p20_single_v2.2',
'P1KSV22': 'p1000_single_v2.2',
}
}

Expand Down
5 changes: 4 additions & 1 deletion api/tests/opentrons/tools/test_qc_scripts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
'P50MV1418010104': 'p50_multi_v1.4',
'P3HSV1418010105': 'p300_single_v1.4',
'P3HMV1418010106': 'p300_multi_v1.4',
'P1KSV1418010107': 'p1000_single_v1.4'
'P1KSV1418010107': 'p1000_single_v1.4',
'P20MV2120120204': 'p20_multi_v2.1',
'P1KSV2218010107': 'p1000_single_v2.2',
'P20SV2220020501': 'p20_single_v2.2',
}


Expand Down
288 changes: 231 additions & 57 deletions shared-data/pipette/definitions/pipetteModelSpecs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,8 +1517,8 @@
"units": "mm/s",
"type": "float"
},
"modelOffset": [0.0, 0.0, -14.55],
"nozzleOffset": [0.0, 0.0, 10.45],
"modelOffset": [0.0, 0.0, -14.55],
"plungerCurrent": {
"value": 1.0,
"min": 0.01,
Expand All @@ -1543,64 +1543,64 @@
"ulPerMm": [
{
"aspirate": [
[0.9034, 0.147, 0.6223],
[1.0379, 0.0252, 0.6226],
[1.1913, 0.0856, 0.5599],
[1.3481, 0.078, 0.569],
[1.5008, 0.0533, 0.6023],
[1.6468, 0.0272, 0.6414],
[1.7939, 0.0259, 0.6435],
[1.9416, 0.0235, 0.6479],
[2.0951, 0.0321, 0.6311],
[2.4797, 0.0263, 0.6433],
[2.8632, 0.0191, 0.6611],
[3.2394, 0.0108, 0.6849],
[3.6157, 0.0087, 0.6918],
[3.9974, 0.0096, 0.6883],
[4.3741, 0.0059, 0.7033],
[4.7578, 0.0077, 0.6954],
[5.1419, 0.0067, 0.6999],
[5.9051, 0.0047, 0.7105],
[7.4406, 0.0039, 0.7154],
[8.9842, 0.003, 0.7218],
[10.5104, 0.0014, 0.7366],
[12.0673, 0.0022, 0.7274],
[13.6096, 0.0012, 0.7395],
[15.1334, 0.0004, 0.7509],
[16.6911, 0.0013, 0.7371],
[18.2255, 0.0005, 0.751],
[19.7847, 0.001, 0.7412],
[21.3395, 0.0008, 0.746]
[0.8679, 0.1607, 0.5953],
[1.0259, 0.1345, 0.5032],
[1.1863, 0.1113, 0.527],
[1.3419, 0.0766, 0.5682],
[1.4882, 0.0377, 0.6204],
[1.6413, 0.0482, 0.6047],
[1.7935, 0.039, 0.6199],
[1.9447, 0.0313, 0.6336],
[2.0929, 0.021, 0.6538],
[2.4644, 0.0174, 0.6612],
[2.8527, 0.0233, 0.6466],
[3.2241, 0.0089, 0.6878],
[3.6095, 0.0141, 0.671],
[3.9964, 0.0122, 0.6779],
[4.3696, 0.0044, 0.7088],
[4.7483, 0.0059, 0.7026],
[5.1447, 0.0112, 0.6772],
[5.9135, 0.0055, 0.7066],
[7.4416, 0.0033, 0.7199],
[8.9724, 0.0023, 0.7269],
[10.5091, 0.0019, 0.7305],
[12.0515, 0.0017, 0.7331],
[13.6004, 0.0015, 0.7349],
[15.142, 0.001, 0.7422],
[16.679, 0.0007, 0.7469],
[18.221, 0.0007, 0.7466],
[19.7746, 0.0009, 0.7434],
[21.3288, 0.0008, 0.7455]
],
"dispense": [
[0.9034, 0.147, 0.6223],
[1.0379, 0.0252, 0.6226],
[1.1913, 0.0856, 0.5599],
[1.3481, 0.078, 0.569],
[1.5008, 0.0533, 0.6023],
[1.6468, 0.0272, 0.6414],
[1.7939, 0.0259, 0.6435],
[1.9416, 0.0235, 0.6479],
[2.0951, 0.0321, 0.6311],
[2.4797, 0.0263, 0.6433],
[2.8632, 0.0191, 0.6611],
[3.2394, 0.0108, 0.6849],
[3.6157, 0.0087, 0.6918],
[3.9974, 0.0096, 0.6883],
[4.3741, 0.0059, 0.7033],
[4.7578, 0.0077, 0.6954],
[5.1419, 0.0067, 0.6999],
[5.9051, 0.0047, 0.7105],
[7.4406, 0.0039, 0.7154],
[8.9842, 0.003, 0.7218],
[10.5104, 0.0014, 0.7366],
[12.0673, 0.0022, 0.7274],
[13.6096, 0.0012, 0.7395],
[15.1334, 0.0004, 0.7509],
[16.6911, 0.0013, 0.7371],
[18.2255, 0.0005, 0.751],
[19.7847, 0.001, 0.7412],
[21.3395, 0.0008, 0.746]
[0.8679, 0.1607, 0.5953],
[1.0259, 0.1345, 0.5032],
[1.1863, 0.1113, 0.527],
[1.3419, 0.0766, 0.5682],
[1.4882, 0.0377, 0.6204],
[1.6413, 0.0482, 0.6047],
[1.7935, 0.039, 0.6199],
[1.9447, 0.0313, 0.6336],
[2.0929, 0.021, 0.6538],
[2.4644, 0.0174, 0.6612],
[2.8527, 0.0233, 0.6466],
[3.2241, 0.0089, 0.6878],
[3.6095, 0.0141, 0.671],
[3.9964, 0.0122, 0.6779],
[4.3696, 0.0044, 0.7088],
[4.7483, 0.0059, 0.7026],
[5.1447, 0.0112, 0.6772],
[5.9135, 0.0055, 0.7066],
[7.4416, 0.0033, 0.7199],
[8.9724, 0.0023, 0.7269],
[10.5091, 0.0019, 0.7305],
[12.0515, 0.0017, 0.7331],
[13.6004, 0.0015, 0.7349],
[15.142, 0.001, 0.7422],
[16.679, 0.0007, 0.7469],
[18.221, 0.0007, 0.7466],
[19.7746, 0.0009, 0.7434],
[21.3288, 0.0008, 0.7455]
]
}
],
Expand Down Expand Up @@ -5368,6 +5368,180 @@
"quirks": ["pickupTipShake"],
"returnTipHeight": 0.83,
"idleCurrent": 0.3
},
"p1000_single_v2.2": {
"name": "p1000_single_gen2",
"backCompatNames": ["p1000_single"],
"top": {
"value": 19.5,
"min": 5,
"max": 19.5,
"units": "mm",
"type": "float"
},
"bottom": {
"value": -18.5,
"min": -20,
"max": 19,
"units": "mm",
"type": "float"
},
"blowout": {
"value": -23,
"min": -30,
"max": 10,
"units": "mm",
"type": "float"
},
"dropTip": {
"value": -37,
"min": -45,
"max": 2,
"units": "mm",
"type": "float"
},
"pickUpCurrent": {
"value": 0.17,
"min": 0.05,
"max": 2.0,
"units": "amps",
"type": "float"
},
"pickUpDistance": {
"value": 17,
"min": 1,
"max": 30,
"units": "mm",
"type": "float"
},
"pickUpIncrement": {
"value": 0.0,
"min": 0.0,
"max": 10.0,
"units": "mm",
"type": "float"
},
"pickUpPresses": {
"value": 1,
"min": 0,
"max": 10,
"units": "presses",
"type": "int"
},
"pickUpSpeed": {
"value": 10,
"min": 1,
"max": 30,
"units": "mm/s",
"type": "float"
},
"nozzleOffset": [0.0, 0.0, 50.14],
"modelOffset": [0.0, 0.0, 25.14],
"ulPerMm": [
{
"aspirate": [
[83.9281, 0.0176, 25.7039],
[90.6789, 0.0125, 24.7768],
[104.4067, 0.0141, 24.6307],
[118.1219, 0.0108, 24.9777],
[131.7286, 0.0071, 25.4124],
[159.2686, 0.0072, 25.3936],
[186.7464, 0.0049, 25.7722],
[200.4731, 0.0038, 25.9749],
[214.2558, 0.0038, 25.9699],
[241.8258, 0.0032, 26.1015],
[269.5028, 0.0029, 26.1641],
[324.6789, 0.0019, 26.4311],
[379.9153, 0.0015, 26.585],
[407.5544, 0.0012, 26.6765],
[435.225, 0.0011, 26.7098],
[462.8847, 0.001, 26.7775],
[490.4011, 0.0006, 26.9595],
[518.1417, 0.0009, 26.783],
[545.5994, 0.0003, 27.094],
[573.2856, 0.0007, 26.8988],
[600.8433, 0.0004, 27.0549],
[628.3706, 0.0003, 27.1059],
[655.9225, 0.0004, 27.1005],
[711.0492, 0.0003, 27.1166],
[766.1336, 0.0003, 27.169],
[821.3261, 0.0003, 27.1451],
[876.3753, 0.0002, 27.2404],
[931.3206, 0.0001, 27.2769],
[986.4186, 0.0002, 27.2505],
[1013.9597, 0.0001, 27.2644]
],
"dispense": [
[83.9281, 0.0176, 25.7039],
[90.6789, 0.0125, 24.7768],
[104.4067, 0.0141, 24.6307],
[118.1219, 0.0108, 24.9777],
[131.7286, 0.0071, 25.4124],
[159.2686, 0.0072, 25.3936],
[186.7464, 0.0049, 25.7722],
[200.4731, 0.0038, 25.9749],
[214.2558, 0.0038, 25.9699],
[241.8258, 0.0032, 26.1015],
[269.5028, 0.0029, 26.1641],
[324.6789, 0.0019, 26.4311],
[379.9153, 0.0015, 26.585],
[407.5544, 0.0012, 26.6765],
[435.225, 0.0011, 26.7098],
[462.8847, 0.001, 26.7775],
[490.4011, 0.0006, 26.9595],
[518.1417, 0.0009, 26.783],
[545.5994, 0.0003, 27.094],
[573.2856, 0.0007, 26.8988],
[600.8433, 0.0004, 27.0549],
[628.3706, 0.0003, 27.1059],
[655.9225, 0.0004, 27.1005],
[711.0492, 0.0003, 27.1166],
[766.1336, 0.0003, 27.169],
[821.3261, 0.0003, 27.1451],
[876.3753, 0.0002, 27.2404],
[931.3206, 0.0001, 27.2769],
[986.4186, 0.0002, 27.2505],
[1013.9597, 0.0001, 27.2644]
]
}
],
"plungerCurrent": {
"value": 1.0,
"min": 0.1,
"max": 1.0,
"units": "amps",
"type": "float"
},
"dropTipCurrent": {
"value": 1.25,
"min": 0.1,
"max": 1.25,
"units": "amps",
"type": "float"
},
"dropTipSpeed": {
"value": 7,
"min": 0.001,
"max": 30,
"units": "mm/sec",
"type": "float"
},
"tipOverlap": {
"default": 9.7,
"opentrons/opentrons_96_tiprack_1000ul/1": 11.5,
"opentrons/opentrons_96_filtertiprack_1000ul/1": 11.5,
"opentrons/geb_96_tiprack_1000ul/1": 9.5
},
"tipLength": {
"value": 78.3,
"units": "mm",
"type": "float",
"min": 0,
"max": 100
},
"quirks": ["pickupTipShake"],
"returnTipHeight": 0.83,
"idleCurrent": 0.3
}
},
"mutableConfigs": [
Expand Down

0 comments on commit 14659b8

Please sign in to comment.