Sine wave addition for Galvos#337
Merged
Merged
Conversation
Small addition for FTP-2000 stage.
Updating from develop. Co-Authored-By: Kevin Dean <42547789+AdvancedImagingUTSW@users.noreply.github.com>
For #180 - Goal is to provide two sine waves that are 90 degrees out of phase to drive galvos for a ring TIRF application. Ran into other errors that require further evaluation, but we have it working. Will need to make sure that the changes to the configuration file are agreed upon by everyone, and that the proper changes are added so that we don't mess up other operation modes... Co-Authored-By: Kevin Dean <42547789+AdvancedImagingUTSW@users.noreply.github.com>
Linter change.
Collaborator
Collaborator
|
It looks like there is an error in the tests. This should be fixed before merging. |
Collaborator
Stops the Ruff violence. None of the device startup functions were being found because they are within an exec/f-string statement. By moving the import of these models into a similar f-string, I should be able to commit the code. Trade one problem for another.
Collaborator
|
From the error in the tests, it looks like maybe the waveform key isn't specified for some of the galvos. Is that possible? You could swap that line to |
Collaborator
|
Re: cc3f8d8. You could also have put |
Collaborator
|
Whatever you think is the best approach for the imports I can adopt. |
Wow. Didn't realize there were two galvos specified. I feel a bit stupid after trying to diagnose that error for so long...
I struggle... Updated local, but not the one in config.
Collaborator
|
@annie-xd-wang, I know this one is a bit painful. But if you want me to go through it with you I can. Would love to get it closed out. |
annie-xd-wang
approved these changes
Feb 8, 2023
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
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.


Please note that the generic configuration file and the waveform_contstants file were both changed on accident. Please do not merge these into the main develop branch unless that is a change that we want.