Skip to content

in_port changes #8

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

Open
smiddy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

in_port changes #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions tecancavro/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class XCaliburD(Syringe):
37: 16, 38: 14, 39: 12, 40: 10}

def __init__(self, com_link, num_ports=9, syringe_ul=1000, direction='CW',
microstep=False, waste_port=9, slope=14, init_force=0,
microstep=False, in_port=0, waste_port=9, slope=14, init_force=0,
debug=False, debug_log_path='.'):
"""
Object initialization function.
Expand All @@ -57,6 +57,7 @@ def __init__(self, com_link, num_ports=9, syringe_ul=1000, direction='CW',
[default] - 1000
`microstep` (bool) : whether or not to operate in microstep mode
[default] - False (factory default)
`in_port` (int) : input port (default 0)
`waste_port` (int) : waste port for `extractToWaste`-like
convenience functions
[default] - 9 (factory default for init out port)
Expand All @@ -80,6 +81,7 @@ def __init__(self, com_link, num_ports=9, syringe_ul=1000, direction='CW',
self.num_ports = num_ports
self.syringe_ul = syringe_ul
self.direction = direction
self.in_port = in_port
self.waste_port = waste_port
self.init_force = init_force
self.state = {
Expand Down Expand Up @@ -154,7 +156,7 @@ def init(self, init_force=None, direction=None, in_port=None,
init_force = init_force if init_force is not None else self.init_force
direction = direction if direction is not None else self.direction
out_port = out_port if out_port is not None else self.waste_port
in_port = in_port if in_port is not None else 0
in_port = in_port if in_port is not None else self.in_port

cmd_string = '{0}{1},{2},{3}'.format(
self.__class__.DIR_DICT[direction][1],
Expand Down