Skip to content

Allow move_indefinitely to move in the 'negative' direction #446

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
Cbantz wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Allow move_indefinitely to move in the 'negative' direction #446

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66082cf
Add 'direction' property for move_indefinitely with a negative velocity.
Cbantz Jul 15, 2025
65a3cce
Fixed Recursion Error
Cbantz Jul 15, 2025
2340ba6
Changed Direction Solution
Cbantz Jul 15, 2025
36295e4
Fix syntax error in direction check
Cbantz Jul 15, 2025
46f7191
Removed references to direction variable outside of move_indefinitely
Cbantz Jul 15, 2025
058c886
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 15, 2025
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
9 changes: 6 additions & 3 deletions src/instruments/newport/newportesp301.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ def velocity(self):

@velocity.setter
def velocity(self, velocity):
velocity = abs(velocity)
Copy link
Contributor

@scasagrande scasagrande Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why take abs here?

velocity = float(
assume_units(velocity, self._units / (u.s))
.to(self._units / u.s)
Expand Down Expand Up @@ -868,11 +869,13 @@ def move_to_hardware_limit(self):
"""
self._newport_cmd("MT", target=self.axis_id)

def move_indefinitely(self):
def move_indefinitely(self, direction: str = "+"):
"""
Move until told to stop
Move until told to stop in the direction ("+" or "-") passed.
Copy link
Contributor

@scasagrande scasagrande Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of magic strings as arguments. I would rather see an enum, or just forward/reverse booleans.

"""
self._newport_cmd("MV", target=self.axis_id)
if direction not in ("+", "-"):
raise ValueError("Direction must be '+' or '-'")
self._newport_cmd(f"MV{direction}", target=self.axis_id)

def abort_motion(self):
"""
Expand Down