-
Notifications
You must be signed in to change notification settings - Fork 42
OBIS laser #55
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
Closed
juliomateoslangerak
wants to merge
37
commits into
python-microscope:master
from
juliomateoslangerak:Obis_laser_clean_implementation
Closed
OBIS laser #55
juliomateoslangerak
wants to merge
37
commits into
python-microscope:master
from
juliomateoslangerak:Obis_laser_clean_implementation
Conversation
This file contains hidden or 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
Cannot manage to get camera attributes programmatically
Fixed some getters and setters of camera parameters
# Conflicts: # doc/SERVERS # doc/example.py # microscope/devices.py
Zeros outside of the array are trimmed
Adding a sleep of 0.2 sec solves the problem. Maybe there is another more elegant solution
Obis laser implementation
- settings isReadOnly was not called correctly when implemented as a lambda
# Conflicts: # microscope/lasers/deepstar.py # microscope/testsuite/devices.py # setup.py
# Conflicts: # microscope/devices.py
…placed that for a encode call
carandraug
pushed a commit
that referenced
this pull request
Nov 19, 2019
carandraug
added a commit
that referenced
this pull request
Nov 19, 2019
This implementation is more than one year old and no longer is valid for the current microscope code. This commit does the following changes: * replaces Device._logger with a module logger. See issue #110. * removes use of *args from the constructor. See issue #84. * set default values for baudrate and timeout time. * replace isAlive() method with is_alive method (see e687cd0) * implement is_alive() to check if device is replying at all instead of using get_is_on() which only checks if device is emitting light. * implement get_min_power_mw() and get_power_mw(), and remove _set_power() and _get_power() which defines behaviour when setting power values outside valie range (issue #51).
carandraug
added a commit
that referenced
this pull request
Nov 19, 2019
Collaborator
|
Thank you for the implementation. I got the implementation from this branch, made a commit with you as author, another commit with changes required for the current master branch, and merged it. You should test it still works as before, we can't. Closing the issue though. |
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.
@mickp, please check what we want to do with the additional timing for the response of the deepstar:
microscope-cockpit/cockpit#369