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): add p1000 function #2425

Merged
merged 2 commits into from
Oct 5, 2018
Merged

feat(api): add p1000 function #2425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c07e2
feat(api): Add function for p1000 ul-to-millimeter conversions
andySigler Sep 18, 2018
fcc7004
Merge branch 'edge' into api-add-p1000-function
andySigler Oct 4, 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
13 changes: 11 additions & 2 deletions api/opentrons/legacy_api/instruments/pipette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,9 +1520,18 @@ def _p300_multi_piecewise(self, ul, func):

def _p1000_piecewise(self, ul, func):
if func == 'aspirate':
return 65
if (ul > 0) and (ul < 88.2951):
return 0.0647*ul + 53.153
elif (ul >= 88.2951) and (ul < 119.062):
return 0.0217*ul + 56.9474
elif (ul >= 119.062) and (ul < 211.8242):
return 0.0086*ul + 58.9607
elif (ul >= 211.8242) and (ul < 490.5573):
return 0.0029*ul + 59.9144
elif (ul >= 490.5573):
return 0.0008*ul + 60.9102
else:
return 65
return 0*ul + 61.3275

def _volume_percentage(self, volume):
"""Returns the plunger percentage for a given volume.
Expand Down