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: adds support for pipette versions v1.3 #1474

Merged
merged 43 commits into from
Jun 4, 2018
Merged

API: adds support for pipette versions v1.3 #1474

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
43767d4
adds v2 pipettes to plunger configs
andySigler May 11, 2018
b772f05
tests pass
andySigler May 11, 2018
7df9757
Merge branch 'edge' into api-pipette-v2
andySigler May 11, 2018
8c6f25e
default version is v1
andySigler May 11, 2018
1671fb2
adds some comments
andySigler May 11, 2018
9c7397f
fixes merge conflicts
andySigler May 11, 2018
bf6acf0
brings back deleted file
andySigler May 11, 2018
3b8657d
Merge branch 'edge' into api-pipette-v2
andySigler May 11, 2018
026b43c
Merge branch 'edge' into api-pipette-v2
andySigler May 14, 2018
b49ec48
uses v2 pipette models in eeprom writing tool
andySigler May 14, 2018
6e9c9a4
Merge branch 'edge' into api-pipette-v2
andySigler May 14, 2018
d1a4766
Merge branch 'edge' into api-pipette-v2
andySigler May 14, 2018
40fc335
decrease p50_multi_v2 blowout distance by 0.5mm after testing
andySigler May 14, 2018
bef06f1
Merge branch 'edge' into api-pipette-v2
andySigler May 15, 2018
b07154b
Merge branch 'edge' into api-pipette-v2
andySigler May 15, 2018
e01e2c5
renames v2 to v13
andySigler May 15, 2018
0942a2e
Merge branch 'edge' into api-pipette-v2
andySigler May 15, 2018
ddf973e
adds v13 to pipette eeprom script
andySigler May 15, 2018
ec143be
Merge branch 'edge' into api-pipette-v2
andySigler May 17, 2018
1c6a483
fixes errors coming from merge with edge
andySigler May 17, 2018
f8e0dad
re-cache instruments after a simulate
andySigler May 17, 2018
cd4847c
Merge branch 'edge' into api-pipette-v2
andySigler May 17, 2018
8678c39
pass model strings, not configs
andySigler May 17, 2018
2cbbd4a
print model number after writing
andySigler May 17, 2018
34b5612
Merge branch 'edge' into api-pipette-v2
andySigler May 17, 2018
07302cc
Merge branch 'edge' into api-pipette-v2
andySigler May 17, 2018
ef7a418
simplifies logic for defaulting to pipettes while simulating
andySigler May 18, 2018
de865f2
if attached model is none, don't parse it
andySigler May 18, 2018
4da11b2
removes unused import from pipette eeprom writing script
andySigler May 18, 2018
d282110
fixes merge conflict
andySigler May 21, 2018
d1956c4
Merge branch 'edge' into api-pipette-v2
andySigler May 30, 2018
96429fb
fixes tests after merging in edge
andySigler May 30, 2018
c2c6d72
changes v13 to v1.3 to avoid confusion
andySigler May 31, 2018
7a7da6d
adds comments describing importance or robot.connect() after a simula…
andySigler May 31, 2018
91dcb37
adds test to compare model version travel distances
andySigler May 31, 2018
894ad58
add another barcode filter to remove unwanted newlines from barcode s…
andySigler May 31, 2018
599b94f
Merge branch 'edge' into api-pipette-v2
andySigler Jun 1, 2018
f57d930
includes config changes from piecewise merge; updates plunger positio…
andySigler Jun 1, 2018
72810bf
adds new pipette models to piecewise ul/mm mapping
andySigler Jun 1, 2018
c7e4eb4
raises error if no usable ul_per_mm; p1000 always returns a ul_per_mm
andySigler Jun 4, 2018
2ad6558
adjust plunger positions from HW tests, in order to meet max-volume e…
andySigler Jun 4, 2018
3119a58
adds ul_per_mm to all test using Pipette()
andySigler Jun 4, 2018
2d806c5
brings back old tests removed in previous commit
andySigler Jun 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
Prev Previous commit
Next Next commit
Merge branch 'edge' into api-pipette-v2
  • Loading branch information
@andySigler
andySigler committed May 15, 2018
commit b07154bdac11ce8da918364d3a6cfb780b2f1542

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.