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/mcls1 sim #242

Merged
merged 13 commits into from
Sep 9, 2024
Merged

Bugfix/mcls1 sim #242

merged 13 commits into from
Sep 9, 2024

Conversation

steigersg
Copy link
Contributor

@steigersg steigersg commented Aug 29, 2024 •
edited
Loading

Fixes #238.

Restores functionality to the ThorlabsMcls1Sim service. This includes:

  • Fixing mislabeled service type.
  • Adding light_source_data property to the Simulator service.
  • Adjusting some of the getters and setters in the ThorlabsMcls1Sim service itself.

Todo:

@steigersg steigersg added the bugfix Fixing of a bug label Aug 29, 2024
@steigersg steigersg requested review from ehpor and raphaelpclt August 29, 2024 15:49
@steigersg steigersg self-assigned this Aug 29, 2024
@steigersg steigersg added the refactor Refactor existing code. label Aug 29, 2024
@steigersg steigersg marked this pull request as ready for review September 4, 2024 21:15
steigersg and others added 13 commits September 9, 2024 18:22
@steigersg @ehpor
change name from thorlabs_mcls1 to thorlabs_mcls1_sim
5f714e7
@steigersg @ehpor
add light_source_data property to Simulator
914b17c
@steigersg @ehpor
create get_temperature function instead of a lambda function for cons…
11ca2e1 
…istency with other getters
@steigersg @ehpor
remove seemingly unnecessary passings of self (is causing TypeErrors)
b009468
@steigersg @ehpor
if light source data is not populated with a power, return 0
a64fe3d
@steigersg @ehpor
refactor simulated mcls service in line with non-simulated mcls service
391be01
@steigersg @ehpor
create get_temperature function instead of a lambda function for cons…
abd6389 
…istency with other getters
@steigersg @ehpor
remove seemingly unnecessary passings of self (is causing TypeErrors)
4c22f22
@steigersg @ehpor
if light source data is not populated with a power, return 0
039300e
@steigersg @ehpor
refactor simulated mcls service in line with non-simulated mcls service
bf4b02b
@steigersg @ehpor
remove unused update_status_func function
7e50488
@ehpor
Use self.sleep() rather than time.sleep().
101cef1
@ehpor
Remove duplicate function.
7c333f3
ehpor
ehpor approved these changes Sep 9, 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 and tested.

@ehpor ehpor enabled auto-merge September 9, 2024 22:23
@ehpor ehpor merged commit 91b4945 into develop Sep 9, 2024
6 checks passed
@ehpor ehpor deleted the bugfix/mcls1_sim branch September 9, 2024 22:30
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

@raphaelpclt raphaelpclt Awaiting requested review from raphaelpclt

Assignees

@steigersg steigersg

Labels
bugfix Fixing of a bug refactor Refactor existing code.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

thorlabs_mcls1_sim service is non functional
2 participants
@steigersg @ehpor