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.

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

Api direct movements within well #839

Merged
merged 6 commits into from
Feb 23, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
sets Pipette.previous_placeable to None every time instrument mover i…
…s homed or retracted
  • Loading branch information
andySigler authored and Laura-Danielle committed Feb 23, 2018
commit 34bed7f0f909ffda833687634c2d02899c28597c
2 changes: 2 additions & 0 deletions api/opentrons/instruments/pipette.py
Original file line number Diff line number Diff line change
Expand Up @@ -915,6 +915,7 @@ def _pick_up_tip(
self._add_tip(
length=self.robot.config.tip_length[self.mount][self.type]
)
self.previous_placeable = None # no longer inside a placeable
self.robot.poses = self.instrument_mover.fast_home(
self.robot.poses, abs(plunge_depth))

Expand Down Expand Up @@ -1047,6 +1048,7 @@ def _home(mount):
self.robot.poses = self.instrument_actuator.home(
self.robot.poses)
self.robot.poses = self.instrument_mover.home(self.robot.poses)
self.previous_placeable = None # no longer inside a placeable

_home(self.mount)
return self
Expand Down
4 changes: 3 additions & 1 deletion api/tests/opentrons/labware/test_pipette.py
Original file line number Diff line number Diff line change
Expand Up @@ -1499,6 +1499,8 @@ def test_mix_with_named_args(self):
self.p200.dispense = mock.Mock()
self.p200.mix(volume=50, repetitions=2)

print(self.p200.tip_racks)

self.assertEqual(
self.p200.dispense.mock_calls,
[
Expand All @@ -1510,7 +1512,7 @@ def test_mix_with_named_args(self):
self.p200.aspirate.mock_calls,
[
mock.call.aspirate(volume=50,
location=self.p200.tip_racks[0][0],
location=None,
rate=1.0),
mock.call.aspirate(50, rate=1.0)
]
Expand Down