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

561 remove closures #249

Merged
merged 136 commits into from
Jul 12, 2017
Merged
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
e7240e1
renames script that activates nodenv
SimplyAhmazing May 1, 2017
6e87842
removes unused make cmd
SimplyAhmazing May 1, 2017
fcec41b
adds call to integration test
SimplyAhmazing May 1, 2017
d33f8d6
freeze electron to v1.4.7
SimplyAhmazing May 1, 2017
a9c2349
remove install cmd
SimplyAhmazing May 1, 2017
f4119a5
cleaning up used cmd & scripts
SimplyAhmazing May 1, 2017
2393fd9
skip running integration tests on windows
SimplyAhmazing May 2, 2017
7796000
merges upstream master
SimplyAhmazing May 2, 2017
2625e70
integration tests pass when commenting nodePrefs option
SimplyAhmazing May 2, 2017
a276965
fixes reference to virtual smoothie port
SimplyAhmazing May 2, 2017
0ed42bd
fix integration tests; adds test for login dialog
SimplyAhmazing May 2, 2017
fd5d7fe
try running integration test on windows
SimplyAhmazing May 2, 2017
8d19935
dont run e2e test on windows
SimplyAhmazing May 2, 2017
fe8a520
remove unneeded run-dev script
SimplyAhmazing May 2, 2017
db50a57
make app-src and app-shell share same node_modules
SimplyAhmazing May 2, 2017
26b007f
remove linking node_modules; clean up app-shell package.json
SimplyAhmazing May 2, 2017
c05cc68
fix trailing comma
SimplyAhmazing May 2, 2017
4c31408
fix another trailing comma
SimplyAhmazing May 2, 2017
6301b3a
remove singleton class; removing calls to singleton
SimplyAhmazing May 3, 2017
e44fa01
removes references to singleton robot in containers module
SimplyAhmazing May 3, 2017
85810e6
removes references to singleton robot in drivers tests
SimplyAhmazing May 3, 2017
6552b0c
Merge branch '559-refactor-robot-to-not-be-a-singleton' of github.com…
SimplyAhmazing May 3, 2017
e62e43b
removes singleton refs in helpers tests
SimplyAhmazing May 3, 2017
5b299c8
adds TODO
SimplyAhmazing May 3, 2017
ec062d5
remove singleton refs in integretation tests; adds TODO
SimplyAhmazing May 3, 2017
0c15342
removes refs to singleton from labware tests; removes singleton refs …
SimplyAhmazing May 3, 2017
5bc8308
remove singletons refs in "protocol" tests
SimplyAhmazing May 3, 2017
11f1e45
admist deleting JSON importer
SimplyAhmazing May 3, 2017
29ece3f
fixes references to placeable/pipette classes
SimplyAhmazing May 4, 2017
c57df0d
attempts to wrap globals into flask global obj
SimplyAhmazing May 4, 2017
7e353ed
fixes tests
SimplyAhmazing May 4, 2017
326d861
updates makefile
SimplyAhmazing May 4, 2017
eba3924
pylama fixes
SimplyAhmazing May 4, 2017
3ed3805
removes closure/queueing from aspirate/dispense
SimplyAhmazing May 4, 2017
e773edd
remove closure/queue from mix cmd and blowout cmd
SimplyAhmazing May 4, 2017
f2c8878
refactoring touch_tip
SimplyAhmazing May 4, 2017
7ed1ff7
refactors pick up tip
SimplyAhmazing May 4, 2017
801bede
refactor pipette home
SimplyAhmazing May 4, 2017
df750ae
removes calls to equeue
SimplyAhmazing May 4, 2017
2c775ca
refactors location of associating placeables
SimplyAhmazing May 4, 2017
9f194f7
fixes doc tests
SimplyAhmazing May 5, 2017
a260b01
Merge branch 'master' into 559-refactor-robot-to-not-be-a-singleton
SimplyAhmazing May 5, 2017
f1f3536
removes commented code
SimplyAhmazing May 5, 2017
e0c29b2
removes method for getting singleton
SimplyAhmazing May 5, 2017
61b822c
rejiggering references
SimplyAhmazing May 5, 2017
88462df
pylama fixes
SimplyAhmazing May 5, 2017
115073b
removes all references to global robot; removes commented lines
SimplyAhmazing May 5, 2017
11115df
merge 559-refactor-robot-to-not-be-a-singleton
SimplyAhmazing May 8, 2017
c8e0a61
debugging upload failures
SimplyAhmazing May 9, 2017
296a260
populate cmd queue; setup test protocol
SimplyAhmazing May 10, 2017
998e5b8
persist protocol source code for protocol run
SimplyAhmazing May 10, 2017
f1215ce
remove unused command helpers
SimplyAhmazing May 10, 2017
3dad30a
rejiggering command done notifications
SimplyAhmazing May 10, 2017
aab032d
refactoring protocol running/simulation
SimplyAhmazing May 11, 2017
5b0d7a3
fix colon typo
SimplyAhmazing May 11, 2017
4c631eb
remove old run commands ftn
SimplyAhmazing May 11, 2017
85b2f3e
simulate protocol before run, this will use RUN calibration data
SimplyAhmazing May 11, 2017
4bdd615
add helper to list flask routes
SimplyAhmazing May 11, 2017
d12af0e
tags routes to be refactored into the API
SimplyAhmazing May 16, 2017
b8e8c7c
fixes test_robot tests
SimplyAhmazing May 16, 2017
68e06b9
fix pipette tests
SimplyAhmazing May 17, 2017
b926e9c
fixing pipette tests by adjust cmd queue descriptions
SimplyAhmazing May 17, 2017
d442c13
save refactor
SimplyAhmazing May 18, 2017
7e00440
merge upstream master
SimplyAhmazing May 18, 2017
9fbedfa
fix more tests
SimplyAhmazing May 18, 2017
c2a2682
fix labware tests
SimplyAhmazing May 18, 2017
e81dae3
mute performance test; mute other tests
SimplyAhmazing May 19, 2017
f2cfb24
cleaning state helpers
SimplyAhmazing May 19, 2017
829797e
refactors helpers
SimplyAhmazing May 19, 2017
03a5039
refactor flask server to use api get_state
SimplyAhmazing May 19, 2017
a7beb0e
refactor calls to update step list
SimplyAhmazing May 19, 2017
91568f9
comment out failing robot serialization assert; remove unneeded serve…
SimplyAhmazing Jun 9, 2017
582931e
comment out test case for pausing protocol run; adjust state test
SimplyAhmazing Jun 13, 2017
30514a1
fixes api tests
andySigler Jun 15, 2017
0b4c2aa
fix merge conflicts
andySigler Jun 15, 2017
48c8f0b
removes redudant test causing failures
andySigler Jun 15, 2017
62b0f10
pylama
andySigler Jun 15, 2017
b7ed7cd
pylama fixes
SimplyAhmazing Jun 15, 2017
0b88964
Merge branch '561-remove-closures' of github.com:OpenTrons/opentrons-…
SimplyAhmazing Jun 15, 2017
f0b723a
pylama
andySigler Jun 15, 2017
fc6cd50
fix some doctests; do not overwrite persisted volume
andySigler Jun 16, 2017
2baa6b1
pylama fixes
SimplyAhmazing Jun 16, 2017
cb17a0a
merges upstream and resolves conflict
SimplyAhmazing Jun 16, 2017
70cc805
replay load_python with helpers.load_python; returning stack trace on…
andySigler Jun 16, 2017
e648a30
catch exception in load_python for display in UI
andySigler Jun 16, 2017
fa37202
pylama fixes
SimplyAhmazing Jun 16, 2017
597affb
fix tests that were inadvertantly sharing pipettes
andySigler Jun 16, 2017
f2fc6ff
fix server tests
andySigler Jun 16, 2017
012dbca
Merge branch '561-remove-closures' of https://github.com/opentrons/op…
andySigler Jun 16, 2017
ec8a0b8
fixes doctests
andySigler Jun 16, 2017
4464605
removes .run() and .simulate() from tests
andySigler Jun 16, 2017
aba1ef5
fixes tests
andySigler Jun 16, 2017
6e77dab
removes send to app/jupyter integration feature
SimplyAhmazing Jun 16, 2017
b26a9d5
Merge branch '561-remove-closures' of github.com:OpenTrons/opentrons-…
SimplyAhmazing Jun 16, 2017
9a41bc0
remove send to app tests
SimplyAhmazing Jun 16, 2017
ebd1bb4
removes frontend integ test for send-to-jupyter feature
SimplyAhmazing Jun 16, 2017
440c05b
fix helpers
SimplyAhmazing Jun 16, 2017
4dd0561
adds null driver; fixes run-detached
andySigler Jun 16, 2017
9ffe2c6
fixes merge conflicts
andySigler Jun 16, 2017
4f3c18b
default virtual smoothie is 'simulate'
andySigler Jun 16, 2017
14b6bd4
calls null driver during /run
andySigler Jun 16, 2017
3cc9be9
fix integration tests
SimplyAhmazing Jun 16, 2017
b602b2a
pylama fixes
SimplyAhmazing Jun 16, 2017
f17794f
fixes pipette doctests
andySigler Jun 16, 2017
39e61df
Fix error message when pipette max vol is exceeded; fix doc test retu…
SimplyAhmazing Jun 19, 2017
0de8760
Remove comments indicating methods are queuable
SimplyAhmazing Jun 19, 2017
f1d7bba
pylama fixes
SimplyAhmazing Jun 19, 2017
ae6a6fb
remove overwrite_volume arg from pipette
SimplyAhmazing Jun 19, 2017
133a574
Merge branch 'master' into 561-remove-closures
andySigler Jun 19, 2017
5f13581
remove unneccessary helper func
SimplyAhmazing Jun 21, 2017
632960e
remove comment
SimplyAhmazing Jun 21, 2017
49e4e07
Refactors is_number into helpers
SimplyAhmazing Jun 21, 2017
9bd3e33
removes commented code
SimplyAhmazing Jun 21, 2017
1354201
Fix touch_tip arg defaulting to -1
SimplyAhmazing Jun 21, 2017
d146256
remove unneeded class import/instantiation; remove comments
SimplyAhmazing Jun 21, 2017
3d3379a
Removes references to enqueue in robot docs
SimplyAhmazing Jun 21, 2017
a189c6d
Edit docs language around commands no longer being enqueable
SimplyAhmazing Jun 21, 2017
fdebb3d
_position_for_aspirate checks current_volume
andySigler Jun 22, 2017
933fd9f
remove enqueue from magbead module
SimplyAhmazing Jun 22, 2017
aa38710
fixes reset implementation
SimplyAhmazing Jun 27, 2017
36525a2
remove singleton module
SimplyAhmazing Jun 28, 2017
a147526
adds gcode testing line
SimplyAhmazing Jun 29, 2017
5d587ab
remove instrument.create_command
SimplyAhmazing Jul 10, 2017
66184c1
remove monkey patching robot unsafe methods and use decorator
SimplyAhmazing Jul 10, 2017
a9941fd
fix test case for not_app_run_safe decorator
SimplyAhmazing Jul 10, 2017
09eb6c4
remove commented code; remove print
SimplyAhmazing Jul 10, 2017
d1e1410
merges develop branch; resolves conflicts
SimplyAhmazing Jul 10, 2017
4063147
clean up docstring
SimplyAhmazing Jul 10, 2017
fcf9655
remove comments
SimplyAhmazing Jul 10, 2017
8c0f9c0
pylama
astaff Jul 11, 2017
b373d58
fixing appveyor
astaff Jul 11, 2017
abc0456
removed autocrlf
astaff Jul 11, 2017
1363abb
appveyor debug
astaff Jul 11, 2017
de63147
tweaking CI
astaff Jul 11, 2017
f552fea
short commit hash is now first 7 digits
astaff Jul 12, 2017
158a7f9
deplyoing into mac bucket for osx
astaff Jul 12, 2017
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
remove enqueue from magbead module
  • Loading branch information
SimplyAhmazing committed Jun 22, 2017
commit 933fd9f54e07c6eab25ac447944dbc52c3e90bb4
27 changes: 3 additions & 24 deletions api/opentrons/instruments/magbead.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,47 +36,31 @@ def __init__(self, robot, name=None, mosfet=0, container=None):
self.init_calibrations(key=persisted_key)
self.load_persisted_data()

def engage(self, enqueue=True):
def engage(self):
"""
Move the Magbead platform upwards,
bringing the magnetic field close to the wells

Parameters
----------

enqueue : bool
If set to `True` (default), the method will be appended
to the robots list of commands for executing during
:any:`run` or :any:`simulate`. If set to `False`, the
method will skip the command queue and execute immediately
"""
self.engaged = True
self.motor.engage()
_description = "Engaging Magbead at mosfet #{}".format(self.motor)
self.robot.add_command(_description)
return self

def disengage(self, enqueue=True):
def disengage(self):
"""
Move the Magbead platform downwards,
lowering the magnetic field away to the wells

Parameters
----------

enqueue : bool
If set to `True` (default), the method will be appended
to the robots list of commands for executing during
:any:`run` or :any:`simulate`. If set to `False`, the
method will skip the command queue and execute immediately
"""
self.engaged = False
self.motor.disengage()
_description = "Engaging Magbead at mosfet #{}".format(self.motor)
self.robot.add_command(_description)
return self

def delay(self, seconds=0, minutes=0, enqueue=True):
def delay(self, seconds=0, minutes=0):
"""
Pause the robot for a given number of seconds

Expand All @@ -85,11 +69,6 @@ def delay(self, seconds=0, minutes=0, enqueue=True):
seconds : int or float
The number of seconds to delay

enqueue : bool
If set to `True` (default), the method will be appended
to the robots list of commands for executing during
:any:`run` or :any:`simulate`. If set to `False`, the
method will skip the command queue and execute immediately
"""
minutes += int(seconds / 60)
seconds = int(seconds % 60)
Expand Down