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

feat(api): Adds pipette models v1.4 to robot config #2689

Merged
merged 5 commits into from
Nov 21, 2018
Merged

feat(api): Adds pipette models v1.4 to robot config #2689

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
2a0a9a7
feat(api): Adds pipette models v1.4 to robot config
andySigler Nov 15, 2018
5c80193
Merge branch 'edge' into api-add-pipette-model-1.4
andySigler Nov 15, 2018
7a76733
shift p10-multi blowout position up 1.5mm
andySigler Nov 16, 2018
fd5a6f9
fixed mistake in p1000 v1.4 blow-out position
andySigler Nov 16, 2018
3947c00
adds v1.4 to pipette barcoding scanning tool
andySigler Nov 16, 2018
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
17 changes: 14 additions & 3 deletions api/src/opentrons/tools/write_pipette_memory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
BAD_BARCODE_MESSAGE = 'Unexpected Serial -> {}'
WRITE_FAIL_MESSAGE = 'Data not saved, HOLD BUTTON'

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

MODELS = {
'v1': {
'P10S': 'p10_single_v1',
Expand All @@ -19,6 +23,15 @@
'P3HSV13': 'p300_single_v1.3',
'P3HMV13': 'p300_multi_v1.3',
'P1KSV13': 'p1000_single_v1.3'
},
'v1.4': {
'P10SV14': 'p10_single_v1.4',
'P10MV14': 'p10_multi_v1.4',
'P50SV14': 'p50_single_v1.4',
'P50MV14': 'p50_multi_v1.4',
'P3HSV14': 'p300_single_v1.4',
'P3HMV14': 'p300_multi_v1.4',
'P1KSV14': 'p1000_single_v1.4'
}
}

Expand Down Expand Up @@ -79,9 +92,7 @@ def _user_submitted_barcode(max_length):


def _parse_model_from_barcode(barcode):
# MUST iterate through v1.3 first, because v1 barcodes did not have
# characters to specify the version number
for version in ['v1.3', 'v1']:
for version in VERSIONS:
for barcode_substring in MODELS[version].keys():
if barcode.startswith(barcode_substring):
return MODELS[version][barcode_substring]
Expand Down
9 changes: 8 additions & 1 deletion api/tests/opentrons/tools/test_qc_scripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@
'P50MV1318010104': 'p50_multi_v1.3',
'P3HSV1318010105': 'p300_single_v1.3',
'P3HMV1318010106': 'p300_multi_v1.3',
'P1KSV1318010107': 'p1000_single_v1.3'
'P1KSV1318010107': 'p1000_single_v1.3',
'P10SV1418010101': 'p10_single_v1.4',
'P10MV1418010102': 'p10_multi_v1.4',
'P50SV1418010103': 'p50_single_v1.4',
'P50MV1418010104': 'p50_multi_v1.4',
'P3HSV1418010105': 'p300_single_v1.4',
'P3HMV1418010106': 'p300_multi_v1.4',
'P1KSV1418010107': 'p1000_single_v1.4'
}


Expand Down
186 changes: 186 additions & 0 deletions shared-data/robot-data/pipetteModelSpecs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,34 @@
"quirks": [],
"tipLength": 33
},
"p10_single_v1.4": {
"name": "p10_single",
"plungerPositions": {
"top": 19.5,
"bottom": 1.5,
"blowOut": -1.5,
"dropTip": -5.5
},
"pickUpCurrent": 0.1,
"pickUpDistance": 10,
"modelOffset": [0.0, 0.0, -13],
"plungerCurrent": 0.3,
"dropTipCurrent": 0.5,
"ulPerMm": {
"aspirate": [
[1.8263, -0.0958, 1.088],
[ 2.5222, -0.104, 1.1031],
[ 3.2354, -0.0447, 0.9536],
[ 3.9984, -0.012, 0.8477],
[12.5135, -0.0021, 0.8079]
],
"dispense": [
[12.5135, 0, 0.7945]
]
},
"quirks": [],
"tipLength": 33
},
"p10_multi_v1": {
"name": "p10_multi",
"plungerPositions": {
Expand Down Expand Up @@ -109,6 +137,33 @@
"quirks": [],
"tipLength": 33
},
"p10_multi_v1.4": {
"name": "p10_multi",
"plungerPositions": {
"top": 19.5,
"bottom": 2,
"blowOut": -1,
"dropTip": -4.5
},
"pickUpCurrent": 0.4,
"pickUpDistance": 10,
"modelOffset": [0.0, 31.5, -25.8],
"plungerCurrent": 0.5,
"dropTipCurrent": 0.5,
"ulPerMm": {
"aspirate": [
[1.893415617, -1.1069, 3.042593193],
[2.497849452, -0.1888, 1.30410391],
[5.649462387, -0.0081, 0.8528667891],
[12.74444519, -0.0018, 0.8170558891]
],
"dispense": [
[12.74444519, 0, 0.8058688085]
]
},
"quirks": [],
"tipLength": 33
},
"p50_single_v1": {
"name": "p50_single",
"plungerPositions": {
Expand Down Expand Up @@ -159,6 +214,31 @@
"quirks": [],
"tipLength": 51.7
},
"p50_single_v1.4": {
"name": "p50_single",
"plungerPositions": {
"top": 19.5,
"bottom": 2,
"blowOut": 0.5,
"dropTip": -5
},
"pickUpCurrent": 0.1,
"pickUpDistance": 10,
"modelOffset": [0.0, 0.0, 0.0],
"plungerCurrent": 0.3,
"dropTipCurrent": 0.5,
"ulPerMm": {
"aspirate": [
[11.79687499, -0.0098, 3.064988953],
[50, -0.0004, 2.954068131]
],
"dispense": [
[50, 0, 2.931601299]
]
},
"quirks": [],
"tipLength": 51.7
},
"p50_multi_v1": {
"name": "p50_multi",
"plungerPositions": {
Expand Down Expand Up @@ -209,6 +289,31 @@
"quirks": [],
"tipLength": 51.7
},
"p50_multi_v1.4": {
"name": "p50_multi",
"plungerPositions": {
"top": 19.5,
"bottom": 2,
"blowOut": 0.5,
"dropTip": -4
},
"pickUpCurrent": 0.6,
"pickUpDistance": 10,
"modelOffset": [0.0, 31.5, -25.8],
"plungerCurrent": 0.5,
"dropTipCurrent": 0.5,
"ulPerMm": {
"aspirate": [
[12.29687531, -0.0049, 3.134703694],
[50, -0.0002, 3.077116024]
],
"dispense": [
[50, 0, 3.06368702]
]
},
"quirks": [],
"tipLength": 51.7
},
"p300_single_v1": {
"name": "p300_single",
"plungerPositions": {
Expand Down Expand Up @@ -265,6 +370,34 @@
"quirks": [],
"tipLength": 51.7
},
"p300_single_v1.4": {
"name": "p300_single",
"plungerPositions": {
"top": 19.5,
"bottom": 3,
"blowOut": 0,
"dropTip": -5.5
},
"pickUpCurrent": 0.1,
"pickUpDistance": 10,
"modelOffset": [0.0, 0.0, 0.0],
"plungerCurrent": 0.3,
"dropTipCurrent": 0.5,
"ulPerMm": {
"aspirate": [
[36.19844973, 0.043, 16.548],
[54.98518519, 0.012, 17.658],
[73.90077516, 0.008, 17.902],
[111.8437953, 0.004, 18.153],
[302.3895337, 0.001, 18.23]
],
"dispense": [
[302.3895337, 0, 18.83156277]
]
},
"quirks": [],
"tipLength": 51.7
},
"p300_multi_v1": {
"name": "p300_multi",
"plungerPositions": {
Expand Down Expand Up @@ -315,6 +448,31 @@
"quirks": [],
"tipLength": 51.7
},
"p300_multi_v1.4": {
"name": "p300_multi",
"plungerPositions": {
"top": 19.5,
"bottom": 3.5,
"blowOut": 1.5,
"dropTip": -3.5
},
"pickUpCurrent": 0.6,
"pickUpDistance": 10,
"modelOffset": [0.0, 31.5, -25.8],
"plungerCurrent": 0.5,
"dropTipCurrent": 0.5,
"ulPerMm": {
"aspirate": [
[57.25698968, 0.017, 18.132],
[309.2612689, 0.001, 19.03]
],
"dispense": [
[309.2612689, 0, 19.29389273]
]
},
"quirks": [],
"tipLength": 51.7
},
"p1000_single_v1": {
"name": "p1000_single",
"plungerPositions": {
Expand Down Expand Up @@ -370,5 +528,33 @@
},
"quirks": ["needs-pickup-shake"],
"tipLength": 76.7
},
"p1000_single_v1.4": {
"name": "p1000_single",
"plungerPositions": {
"top": 19.5,
"bottom": 2.5,
"blowOut": 0.5,
"dropTip": -4
},
"pickUpCurrent": 0.1,
"pickUpDistance": 15,
"modelOffset": [0.0, 0.0, 20.0],
"plungerCurrent": 0.5,
"dropTipCurrent": 0.7,
"ulPerMm": {
"aspirate": [
[88.2951, 0.0647, 53.153],
[119.062, 0.0217, 56.9474],
[211.8242, 0.0086, 58.9607],
[490.5573, 0.0029, 59.9144],
[1000, 0.0008, 60.9102]
],
"dispense": [
[1000, 0, 61.3275]
]
},
"quirks": ["needs-pickup-shake"],
"tipLength": 76.7
}
}