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

Jump to bottom

Api direct movements within well #839

Merged
merged 6 commits into from
Feb 23, 2018
Merged

Api direct movements within well #839

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d45e9d1
pipettes move 'direct' if staying within same Well, inless explicitel…
andySigler Feb 6, 2018
ae04726
fixes test
andySigler Feb 6, 2018
34bed7f
sets Pipette.previous_placeable to None every time instrument mover i…
andySigler Feb 14, 2018
6b73d11
_position_for_aspirate() only moves to top of well when necessary
andySigler Feb 15, 2018
f78da83
only move plunger to bottom is not already at bottom, during _positio…
andySigler Feb 15, 2018
ad4d417
removes low_current_z= kwarg from test
andySigler Feb 23, 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
Prev Previous commit
removes low_current_z= kwarg from test
  • Loading branch information
@andySigler
andySigler committed Feb 23, 2018
commit ad4d41795a437483dc2df506260512a86dc4e93d
16 changes: 8 additions & 8 deletions api/tests/opentrons/labware/test_pipette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,20 +1697,20 @@ def test_direct_movement_within_well(self):

expected = [
mock.call(
self.plate[0], instrument=self.p200, low_current_z=False, strategy='arc'),
self.plate[0], instrument=self.p200, strategy='arc'),
mock.call(
self.plate[0].top(), instrument=self.p200, low_current_z=False, strategy='direct'),
self.plate[0].top(), instrument=self.p200, strategy='direct'),
mock.call(
self.plate[0].bottom(), instrument=self.p200, low_current_z=False, strategy='direct'),
self.plate[0].bottom(), instrument=self.p200, strategy='direct'),
mock.call(
self.plate[1], instrument=self.p200, low_current_z=False, strategy='arc'),
self.plate[1], instrument=self.p200, strategy='arc'),
mock.call(
self.plate[2], instrument=self.p200, low_current_z=False, strategy='arc'),
self.plate[2], instrument=self.p200, strategy='arc'),
mock.call(
self.plate[2].bottom(), instrument=self.p200, low_current_z=False, strategy='direct')
self.plate[2].bottom(), instrument=self.p200, strategy='direct')
]
self.assertEqual(self.robot.move_to.mock_calls, expected)

from pprint import pprint
pprint(self.robot.move_to.mock_calls)
self.assertEqual(self.robot.move_to.mock_calls, expected)

def build_pick_up_tip(self, well):
Expand Down