2 position objective changer #83
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hongquanli
reviewed
Feb 2, 2025
software/control/gui_hcs.py
Outdated
| @@ -482,6 +492,14 @@ def setupHardware(self): | |||
| if SQUID_FILTERWHEEL_HOMING_ENABLED: | |||
| self.squid_filter_wheel.homing() | |||
|
|
|||
| if USE_XERYON: | |||
| self.objective_changer.homing() | |||
There was a problem hiding this comment.
Should be home instead of homing
hongquanli
reviewed
Feb 2, 2025
software/control/gui_hcs.py
Outdated
Comment on lines
498
to
501
| if DEFAULT_OBJECTIVE == XERYON_OBJECTIVE_SWITCHER_POS_1: | ||
| self.objective_changer.moveToPosition1() | ||
| elif DEFAULT_OBJECTIVE == XERYON_OBJECTIVE_SWITCHER_POS_2: | ||
| self.objective_changer.moveToPosition2() |
There was a problem hiding this comment.
Let's make XERYON_OBJECTIVE_SWITCHER_POS_x a list. E.g. XERYON_OBJECTIVE_SWITCHER_POS_1 = ['4x','10x'], XERYON_OBJECTIVE_SWITCHER_POS_2 = ['25x','40x','60x'].
hongquanli
reviewed
Feb 2, 2025
| self.position1 = -19 | ||
| self.position2 = 19 | ||
|
|
||
| self.current_position = 1 |
hongquanli
reviewed
Feb 2, 2025
Comment on lines
22
to
23
| def stopScan(self): | ||
| self.axisX.stopScan() |
There was a problem hiding this comment.
The objective changer does not need stopScan
hongquanli
reviewed
Feb 2, 2025
|
|
||
| def homing(self): | ||
| self.axisX.findIndex() | ||
| self.axisX.stopScan() |
There was a problem hiding this comment.
is stopScan needed here?
hongquanli
reviewed
Feb 3, 2025
| import time | ||
| import serial | ||
|
|
||
| from control.Xeryon import * |
There was a problem hiding this comment.
@Alpaca233 we should avoid import *
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Xeryon objective switcher implementation. Tested with hardware