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

MR1K1, MR1K2, SP1K1 State Movers With PMPS #126

Merged
merged 11 commits into from
Sep 25, 2024

Conversation

nrwslac
Copy link
Contributor

@nrwslac nrwslac commented Sep 20, 2024

Description

Implement state movers with PMPS for

  • MR1K1 - Coating 2d State Mover. - 50 micron Y-Axis OUT delta
  • MR1K2 - Coating 1d State Mover
  • SP1K1 - Grating Selection 1d State Mover
  • update lcls-twincat-motion to 4.1.1 needed changes for TcBSD PLC pmps file transfer.

Motivation and Context

How Has This Been Tested?

  • I deployed this branch on the PLC and rebuilt the IOC.
  • Command each device with each state via caout
  • Commanded each device to states via local branch with supporting pcdsdevice and typhos.

Where Has This Been Documented?

https://jira.slac.stanford.edu/browse/ECS-936
related device update: pcdshub/pcdsdevices#1290

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)

@nrwslac nrwslac changed the title State movers MR1K1, MR1K2, SP1K1 State Movers With PMPS Sep 24, 2024
Copy link
Member

@ZLLentz ZLLentz left a comment

Choose a reason for hiding this comment

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

Two tiny tiny documentation quibbles
I think the implementation is good and I double-checked the encoder counts

lcls-plc-rixs-optics/rixs_optics/POUs/PRG_MR1K1_BEND.TcPOU Outdated Show resolved Hide resolved
@@ -245,7 +261,36 @@ fM1K2_Flow_1_val := fM1K2_Flow_1.fReal;
fM1K2_Flow_2(iTermBits:=15, fTermMax:=5.0427, fTermMin:=0.050472);
fM1K2_Flow_2_val := fM1K2_Flow_2.fReal;
fM1K2_Press_1(iTermBits:=15, fTermMax:=4.0, fTermMin:=0);
fM1K2_Press_1_val := fM1K2_Press_1.fReal;]]></ST>
fM1K2_Press_1_val := fM1K2_Press_1.fReal;
Copy link
Member

Choose a reason for hiding this comment

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

Possibly a bugfix you did here that's missing from the PR description

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This used to be the end of the program implementation on line 248. I think this is just a the diff of the XML end tag getting moved.

Copy link
Member

Choose a reason for hiding this comment

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

You're right, I misread the diff!

@nrwslac nrwslac requested a review from ghalym September 25, 2024 00:57
Copy link
Member

@ZLLentz ZLLentz left a comment

Choose a reason for hiding this comment

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

LGTM

@nrwslac nrwslac merged commit f0de8e4 into pcdshub:master Sep 25, 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