Skip to content
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

Jump to bottom

Bugfix: Thorlabs CLD hardware service #152

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Bugfix: Thorlabs CLD hardware service #152

merged 3 commits into from
Feb 5, 2024

Conversation

ivalaginja
Copy link
Collaborator

@ivalaginja ivalaginja commented Jan 15, 2024 •
edited
Loading

I was testing the ThorlabsCLD101X service on hardware on THD2 today and ran into a couple of bugs that I fix in this PR:

  • extract the float from the received DataFrame array, needed for the hardware command
  • do the above in the simulated service as well
  • specify the dtype of the array being submitted to a DataStream after commanding the laser, like already done in the simulated service
  • remove check of current laser setting before sending new command

Tested on hardware and works.

Tested in sim and still works.

@ivalaginja ivalaginja added hardware Integrate new hardware bugfix Fixing of a bug collaborators Worked on by external collaborator. Might need some extra help on code integration. labels Jan 15, 2024
@ivalaginja ivalaginja self-assigned this Jan 15, 2024
@ivalaginja ivalaginja requested a review from ehpor January 15, 2024 13:46
ehpor
ehpor approved these changes Feb 5, 2024
View reviewed changes
Copy link
Collaborator

@ehpor ehpor left a comment

Choose a reason for hiding this comment

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

LGTM

@ehpor
Copy link
Collaborator

ehpor commented Feb 5, 2024

Force merging due to failed CI on Windows due to unrelated issue. This was tested on hardware by @ivalaginja.

@ehpor ehpor merged commit c4b2582 into develop Feb 5, 2024
5 of 6 checks passed
@ehpor ehpor deleted the feature/fix_thorlabds_diodes branch February 5, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehpor ehpor ehpor approved these changes

Assignees

@ivalaginja ivalaginja

Labels
bugfix Fixing of a bug collaborators Worked on by external collaborator. Might need some extra help on code integration. hardware Integrate new hardware
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ivalaginja @ehpor