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.

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

Merge of the repo with version running on target. #5

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

rcjwoods
Copy link
Contributor

@rcjwoods rcjwoods commented Oct 3, 2024

Updating from Target

Description

We needed to get this twinCAT project back into version control. The version in GitHub was missing devices, including the 6-xstal Van Hamos spectrometer (spec1 and spec2).

Motivation and Context

Matches GItHub version to what has been running on plc-mfx-motion.

How Has This Been Tested?

This hasn't exactly been tested. This version is a merger of the repo, and what has been running on Target. We will test when we have more time between experiments at MFX, and it is safe to do so. We plan to test all the devices controlled by plc-mfx-motion.

Where Has This Been Documented?

Screenshots (if appropriate):

Pre-merge checklist

  • Code works interactively
  • Code contains descriptive comments
  • Test suite passes locally
  • Libraries are set to fixed versions and not Always Newest
  • Code committed with pre-commit (alternatively pre-commit run --all-files)

@rcjwoods rcjwoods requested a review from c-tsoi October 15, 2024 17:45
Copy link

@c-tsoi c-tsoi left a comment

Choose a reason for hiding this comment

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

Conditionally approving, needs to be tested still.

@rcjwoods rcjwoods merged commit e41cb58 into pcdshub:master Oct 15, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants